Message ID | 20210113113107.12005-1-tzimmermann@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/hisilicon/hibmc: Remove hibmc_ttm.c | expand |
ping for review Am 13.01.21 um 12:31 schrieb Thomas Zimmermann: > The file is not in use. It got re-added by a rebased patch. Removing > it. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Fixes: 4d4dad21cc7b ("drm/hibmc: Remove references to struct drm_device.pdev") > Reported-by: Tian Tao <tiantao6@hisilicon.com> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Xinliang Liu <xinliang.liu@linaro.org> > Cc: Tian Tao <tiantao6@hisilicon.com> > Cc: John Stultz <john.stultz@linaro.org> > Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> > Cc: Chen Feng <puck.chen@hisilicon.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Gong junjie <gongjunjie2@huawei.com> > --- > drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 --------------------- > 1 file changed, 61 deletions(-) > delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > deleted file mode 100644 > index 77f075075db2..000000000000 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > +++ /dev/null > @@ -1,61 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0-or-later > -/* Hisilicon Hibmc SoC drm driver > - * > - * Based on the bochs drm driver. > - * > - * Copyright (c) 2016 Huawei Limited. > - * > - * Author: > - * Rongrong Zou <zourongrong@huawei.com> > - * Rongrong Zou <zourongrong@gmail.com> > - * Jianhua Li <lijianhua@huawei.com> > - */ > - > -#include <linux/pci.h> > - > -#include <drm/drm_atomic_helper.h> > -#include <drm/drm_gem.h> > -#include <drm/drm_gem_framebuffer_helper.h> > -#include <drm/drm_gem_vram_helper.h> > -#include <drm/drm_print.h> > - > -#include "hibmc_drm_drv.h" > - > -int hibmc_mm_init(struct hibmc_drm_private *hibmc) > -{ > - struct drm_vram_mm *vmm; > - int ret; > - struct drm_device *dev = hibmc->dev; > - struct pci_dev *pdev = to_pci_dev(dev->dev); > - > - vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0), > - hibmc->fb_size); > - if (IS_ERR(vmm)) { > - ret = PTR_ERR(vmm); > - drm_err(dev, "Error initializing VRAM MM; %d\n", ret); > - return ret; > - } > - > - return 0; > -} > - > -void hibmc_mm_fini(struct hibmc_drm_private *hibmc) > -{ > - if (!hibmc->dev->vram_mm) > - return; > - > - drm_vram_helper_release_mm(hibmc->dev); > -} > - > -int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, > - struct drm_mode_create_dumb *args) > -{ > - return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args); > -} > - > -const struct drm_mode_config_funcs hibmc_mode_funcs = { > - .mode_valid = drm_vram_helper_mode_valid, > - .atomic_check = drm_atomic_helper_check, > - .atomic_commit = drm_atomic_helper_commit, > - .fb_create = drm_gem_fb_create, > -}; >
在 2021/1/15 16:42, Thomas Zimmermann 写道: > ping for review > > Am 13.01.21 um 12:31 schrieb Thomas Zimmermann: >> The file is not in use. It got re-added by a rebased patch. Removing >> it. >> Reviewed-by Tian Tao <tiantao6@hisilicon.com> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> Fixes: 4d4dad21cc7b ("drm/hibmc: Remove references to struct >> drm_device.pdev") >> Reported-by: Tian Tao <tiantao6@hisilicon.com> >> Cc: Sam Ravnborg <sam@ravnborg.org> >> Cc: Xinliang Liu <xinliang.liu@linaro.org> >> Cc: Tian Tao <tiantao6@hisilicon.com> >> Cc: John Stultz <john.stultz@linaro.org> >> Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> >> Cc: Chen Feng <puck.chen@hisilicon.com> >> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> >> Cc: Gong junjie <gongjunjie2@huawei.com> >> --- >> drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 --------------------- >> 1 file changed, 61 deletions(-) >> delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >> >> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >> b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >> deleted file mode 100644 >> index 77f075075db2..000000000000 >> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >> +++ /dev/null >> @@ -1,61 +0,0 @@ >> -// SPDX-License-Identifier: GPL-2.0-or-later >> -/* Hisilicon Hibmc SoC drm driver >> - * >> - * Based on the bochs drm driver. >> - * >> - * Copyright (c) 2016 Huawei Limited. >> - * >> - * Author: >> - * Rongrong Zou <zourongrong@huawei.com> >> - * Rongrong Zou <zourongrong@gmail.com> >> - * Jianhua Li <lijianhua@huawei.com> >> - */ >> - >> -#include <linux/pci.h> >> - >> -#include <drm/drm_atomic_helper.h> >> -#include <drm/drm_gem.h> >> -#include <drm/drm_gem_framebuffer_helper.h> >> -#include <drm/drm_gem_vram_helper.h> >> -#include <drm/drm_print.h> >> - >> -#include "hibmc_drm_drv.h" >> - >> -int hibmc_mm_init(struct hibmc_drm_private *hibmc) >> -{ >> - struct drm_vram_mm *vmm; >> - int ret; >> - struct drm_device *dev = hibmc->dev; >> - struct pci_dev *pdev = to_pci_dev(dev->dev); >> - >> - vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0), >> - hibmc->fb_size); >> - if (IS_ERR(vmm)) { >> - ret = PTR_ERR(vmm); >> - drm_err(dev, "Error initializing VRAM MM; %d\n", ret); >> - return ret; >> - } >> - >> - return 0; >> -} >> - >> -void hibmc_mm_fini(struct hibmc_drm_private *hibmc) >> -{ >> - if (!hibmc->dev->vram_mm) >> - return; >> - >> - drm_vram_helper_release_mm(hibmc->dev); >> -} >> - >> -int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, >> - struct drm_mode_create_dumb *args) >> -{ >> - return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args); >> -} >> - >> -const struct drm_mode_config_funcs hibmc_mode_funcs = { >> - .mode_valid = drm_vram_helper_mode_valid, >> - .atomic_check = drm_atomic_helper_check, >> - .atomic_commit = drm_atomic_helper_commit, >> - .fb_create = drm_gem_fb_create, >> -}; >> >
Hi Am 15.01.21 um 09:50 schrieb tiantao (H): > > 在 2021/1/15 16:42, Thomas Zimmermann 写道: >> ping for review >> >> Am 13.01.21 um 12:31 schrieb Thomas Zimmermann: >>> The file is not in use. It got re-added by a rebased patch. Removing >>> it. >>> > Reviewed-by Tian Tao <tiantao6@hisilicon.com> Thanks a lot. Pushed to -misc-next. Best regards Thomas >>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >>> Fixes: 4d4dad21cc7b ("drm/hibmc: Remove references to struct >>> drm_device.pdev") >>> Reported-by: Tian Tao <tiantao6@hisilicon.com> >>> Cc: Sam Ravnborg <sam@ravnborg.org> >>> Cc: Xinliang Liu <xinliang.liu@linaro.org> >>> Cc: Tian Tao <tiantao6@hisilicon.com> >>> Cc: John Stultz <john.stultz@linaro.org> >>> Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> >>> Cc: Chen Feng <puck.chen@hisilicon.com> >>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> >>> Cc: Gong junjie <gongjunjie2@huawei.com> >>> --- >>> drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 --------------------- >>> 1 file changed, 61 deletions(-) >>> delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >>> >>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >>> b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >>> deleted file mode 100644 >>> index 77f075075db2..000000000000 >>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c >>> +++ /dev/null >>> @@ -1,61 +0,0 @@ >>> -// SPDX-License-Identifier: GPL-2.0-or-later >>> -/* Hisilicon Hibmc SoC drm driver >>> - * >>> - * Based on the bochs drm driver. >>> - * >>> - * Copyright (c) 2016 Huawei Limited. >>> - * >>> - * Author: >>> - * Rongrong Zou <zourongrong@huawei.com> >>> - * Rongrong Zou <zourongrong@gmail.com> >>> - * Jianhua Li <lijianhua@huawei.com> >>> - */ >>> - >>> -#include <linux/pci.h> >>> - >>> -#include <drm/drm_atomic_helper.h> >>> -#include <drm/drm_gem.h> >>> -#include <drm/drm_gem_framebuffer_helper.h> >>> -#include <drm/drm_gem_vram_helper.h> >>> -#include <drm/drm_print.h> >>> - >>> -#include "hibmc_drm_drv.h" >>> - >>> -int hibmc_mm_init(struct hibmc_drm_private *hibmc) >>> -{ >>> - struct drm_vram_mm *vmm; >>> - int ret; >>> - struct drm_device *dev = hibmc->dev; >>> - struct pci_dev *pdev = to_pci_dev(dev->dev); >>> - >>> - vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0), >>> - hibmc->fb_size); >>> - if (IS_ERR(vmm)) { >>> - ret = PTR_ERR(vmm); >>> - drm_err(dev, "Error initializing VRAM MM; %d\n", ret); >>> - return ret; >>> - } >>> - >>> - return 0; >>> -} >>> - >>> -void hibmc_mm_fini(struct hibmc_drm_private *hibmc) >>> -{ >>> - if (!hibmc->dev->vram_mm) >>> - return; >>> - >>> - drm_vram_helper_release_mm(hibmc->dev); >>> -} >>> - >>> -int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, >>> - struct drm_mode_create_dumb *args) >>> -{ >>> - return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args); >>> -} >>> - >>> -const struct drm_mode_config_funcs hibmc_mode_funcs = { >>> - .mode_valid = drm_vram_helper_mode_valid, >>> - .atomic_check = drm_atomic_helper_check, >>> - .atomic_commit = drm_atomic_helper_commit, >>> - .fb_create = drm_gem_fb_create, >>> -}; >>> >> >
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c deleted file mode 100644 index 77f075075db2..000000000000 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* Hisilicon Hibmc SoC drm driver - * - * Based on the bochs drm driver. - * - * Copyright (c) 2016 Huawei Limited. - * - * Author: - * Rongrong Zou <zourongrong@huawei.com> - * Rongrong Zou <zourongrong@gmail.com> - * Jianhua Li <lijianhua@huawei.com> - */ - -#include <linux/pci.h> - -#include <drm/drm_atomic_helper.h> -#include <drm/drm_gem.h> -#include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_gem_vram_helper.h> -#include <drm/drm_print.h> - -#include "hibmc_drm_drv.h" - -int hibmc_mm_init(struct hibmc_drm_private *hibmc) -{ - struct drm_vram_mm *vmm; - int ret; - struct drm_device *dev = hibmc->dev; - struct pci_dev *pdev = to_pci_dev(dev->dev); - - vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0), - hibmc->fb_size); - if (IS_ERR(vmm)) { - ret = PTR_ERR(vmm); - drm_err(dev, "Error initializing VRAM MM; %d\n", ret); - return ret; - } - - return 0; -} - -void hibmc_mm_fini(struct hibmc_drm_private *hibmc) -{ - if (!hibmc->dev->vram_mm) - return; - - drm_vram_helper_release_mm(hibmc->dev); -} - -int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, - struct drm_mode_create_dumb *args) -{ - return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args); -} - -const struct drm_mode_config_funcs hibmc_mode_funcs = { - .mode_valid = drm_vram_helper_mode_valid, - .atomic_check = drm_atomic_helper_check, - .atomic_commit = drm_atomic_helper_commit, - .fb_create = drm_gem_fb_create, -};
The file is not in use. It got re-added by a rebased patch. Removing it. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes: 4d4dad21cc7b ("drm/hibmc: Remove references to struct drm_device.pdev") Reported-by: Tian Tao <tiantao6@hisilicon.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Xinliang Liu <xinliang.liu@linaro.org> Cc: Tian Tao <tiantao6@hisilicon.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Chen Feng <puck.chen@hisilicon.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Gong junjie <gongjunjie2@huawei.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 --------------------- 1 file changed, 61 deletions(-) delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c