drm, fbdev: complete remove_conflicting_pci_framebuffers cleanup.
Subsystems (10)
Gerd Hoffmann
maintainercover drm, fbdev: complete remove_conflicting_pci_framebuffers cleanup.
Gerd Hoffmann (3):
fbdev: drop res_id parameter from remove_conflicting_pci_framebuffers
drm: drop resource_id parameter from
drm_fb_helper_remove_conflicting_pci_framebuffers
drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers
include/drm/drm_fb_helper.h | 6 ++-- include/linux/fb.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/bochs/bochs_drv.c | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 41 ++----------------------- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - drivers/video/fbdev/core/fbmem.c | 17 +++------- 11 files changed, 16 insertions(+), 63 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/3 fbdev: drop res_id parameter from remove_conflicting_pci_framebuffers
Since commit b0e999c95581 ("fbdev: list all pci memory bars as conflicting apertures") the parameter was used for some sanity checks only, to make sure we detect any issues with the new approach to just list all memory bars as apertures.
No issues turned up so far, so continue to cleanup: Drop the res_id parameter, drop the sanity checks. Also downgrade the logging from "info" level to "debug" level and update documentation.
--- include/drm/drm_fb_helper.h | 2 +- include/linux/fb.h | 2 +- drivers/video/fbdev/core/fbmem.c | 17 +++++------------ 3 files changed, 7 insertions(+), 14 deletions(-)
include/drm/drm_fb_helper.h +1 -1
@@ -560,7 +560,7 @@ drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,* otherwise the vga fbdev driver falls over. */ #if IS_REACHABLE (CONFIG_FB ) - ret =remove_conflicting_pci_framebuffers (pdev, resource_id, name); + ret =remove_conflicting_pci_framebuffers (pdev, name);#endif if (ret =0 ) ret =vga_remove_vgacon (pdev);
include/linux/fb.h +1 -1
@@ -607,7 +607,7 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,extern int register_framebuffer (struct fb_info *fb_info);extern void unregister_framebuffer (struct fb_info *fb_info);extern void unlink_framebuffer (struct fb_info *fb_info); -extern int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,int res_id, +extern int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,const char *name);extern int remove_conflicting_framebuffers (struct apertures_struct *a,const char *name,bool primary);
drivers/video/fbdev/core/fbmem.c +5 -12
@@ -1758,21 +1758,19 @@ EXPORT_SYMBOL(remove_conflicting_framebuffers);/** * remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices * @pdev: PCI device -* @res_id: index of PCI BAR configuring framebuffer memory * @name: requesting driver name * * This function removes framebuffer devices (eg. initialized by firmware) -* using memory range configured for @pdev's BAR @res_id. +* using memory range configured for any of @pdev's memory bars. * * The function assumes that PCI device with shadowed ROM drives a primary * display and so kicks out vga16fb. */ -int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,int res_id,const char *name) +int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,const char *name) {struct apertures_struct *ap;bool primary = false;int err, idx, bar; -bool res_id_found = false;for (idx =0 , bar =0 ; bar <PCI_ROM_RESOURCE ; bar++) {if (!(pci_resource_flags (pdev, bar) &IORESOURCE_MEM ))
@@ -1789,16 +1787,11 @@ int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, constcontinue ; ap->ranges[idx].base =pci_resource_start (pdev, bar); ap->ranges[idx].size =pci_resource_len (pdev, bar); -pci_info (pdev,"%s: bar %d: 0x%lx -> 0x%lx\n" , __func__, bar, - (unsigned long )pci_resource_start (pdev, bar), - (unsigned long )pci_resource_end (pdev, bar)); +pci_dbg (pdev,"%s: bar %d: 0x%lx -> 0x%lx\n" , __func__, bar, + (unsigned long )pci_resource_start (pdev, bar), + (unsigned long )pci_resource_end (pdev, bar)); idx++; -if (res_id = bar) - res_id_found = true; } -if (!res_id_found) -pci_warn (pdev,"%s: passed res_id (%d) is not a memory bar\n" , - __func__, res_id);#ifdef CONFIG_X86 primary = pdev->resource[PCI_ROM_RESOURCE].flags &
Signature · 1 line
2.18.1
Re: [PATCH 1/3] fbdev: drop res_id parameter from remove_conflicting_pci_framebuffers
Quoted 10 lines · Gerd Hoffmann
Since commit
b0e999c95581("fbdev: list all pci memory bars as conflicting apertures") the parameter was used for some sanity checks only, to make sure we detect any issues with the new approach to just list all memory bars as apertures.No issues turned up so far, so continue to cleanup: Drop the
res_idparameter, drop the sanity checks. Also downgrade the logging from "info" level to "debug" level and update documentation.Signed-off-by Gerd Hoffmann <[email protected]>
Quoted 83 lines
--- include/drm/drm_fb_helper.h | 2 +- include/linux/fb.h | 2 +- drivers/video/fbdev/core/fbmem.c | 17 +++++------------ 3 files changed, 7 insertions(+), 14 deletions(-)include/drm/drm_fb_helper.h +1
-1@@ -560,7 +560,7 @@ drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,* otherwise the vga fbdev driver falls over. */ #if IS_REACHABLE (CONFIG_FB ) - ret =remove_conflicting_pci_framebuffers (pdev, resource_id, name); + ret =remove_conflicting_pci_framebuffers (pdev, name);#endif if (ret ==0 ) ret =vga_remove_vgacon (pdev);include/linux/fb.h +1
-1@@ -607,7 +607,7 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,extern int register_framebuffer (struct fb_info *fb_info);extern void unregister_framebuffer (struct fb_info *fb_info);extern void unlink_framebuffer (struct fb_info *fb_info); -extern int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,int res_id, +extern int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,const char *name);extern int remove_conflicting_framebuffers (struct apertures_struct *a,const char *name,bool primary);drivers/video/fbdev/core/fbmem.c +5
-12@@ -1758,21 +1758,19 @@ EXPORT_SYMBOL(remove_conflicting_framebuffers);/** * remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices * @pdev: PCI device -* @res_id: index of PCI BAR configuring framebuffer memory * @name: requesting driver name * * This function removes framebuffer devices (eg. initialized by firmware) -* using memory range configured for @pdev's BAR @res_id. +* using memory range configured for any of @pdev's memory bars. * * The function assumes that PCI device with shadowed ROM drives a primary * display and so kicks out vga16fb. */ -int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,int res_id,const char *name) +int remove_conflicting_pci_framebuffers (struct pci_dev *pdev,const char *name) {struct apertures_struct *ap;bool primary = false;int err, idx, bar; -bool res_id_found = false;for (idx =0 , bar =0 ; bar <PCI_ROM_RESOURCE ; bar++) {if (!(pci_resource_flags (pdev, bar) &IORESOURCE_MEM ))@@ -1789,16 +1787,11 @@ int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, constcontinue ; ap->ranges[idx].base =pci_resource_start (pdev, bar); ap->ranges[idx].size =pci_resource_len (pdev, bar); -pci_info (pdev,"%s: bar %d: 0x%lx -> 0x%lx\n" , __func__, bar, - (unsigned long )pci_resource_start (pdev, bar), - (unsigned long )pci_resource_end (pdev, bar)); +pci_dbg (pdev,"%s: bar %d: 0x%lx -> 0x%lx\n" , __func__, bar, + (unsigned long )pci_resource_start (pdev, bar), + (unsigned long )pci_resource_end (pdev, bar)); idx++; -if (res_id == bar) - res_id_found = true; } -if (!res_id_found) -pci_warn (pdev,"%s: passed res_id (%d) is not a memory bar\n" , - __func__, res_id);#ifdef CONFIG_X86 primary = pdev->resource[PCI_ROM_RESOURCE].flags &Signature · 1 line
2.18.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Gerd Hoffmann
maintainerPATCH 2/3 drm: drop resource_id parameter from drm_fb_helper_remove_conflicting_pci_framebuffers
In reply to Gerd HoffmannNot needed any more for remove_conflicting_pci_framebuffers calls.
--- include/drm/drm_fb_helper.h | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/bochs/bochs_drv.c | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - 8 files changed, 7 insertions(+), 10 deletions(-)
include/drm/drm_fb_helper.h +1 -3
@@ -539,18 +539,16 @@ drm_fb_helper_remove_conflicting_framebuffers(struct apertures_struct *a,/** * drm_fb_helper_remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices * @pdev: PCI device -* @resource_id: index of PCI BAR configuring framebuffer memory * @name: requesting driver name * * This function removes framebuffer devices (eg. initialized by firmware) -* using memory range configured for @pdev's BAR @resource_id. +* using memory range configured for any of @pdev's memory bars. * * The function assumes that PCI device with shadowed ROM drives a primary * display and so kicks out vga16fb. */ static inline int drm_fb_helper_remove_conflicting_pci_framebuffers (struct pci_dev *pdev, -int resource_id,const char *name) {int ret =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -1031,7 +1031,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, }/* Get rid of things like offb */ - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"amdgpudrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"amdgpudrmfb" );if (ret)return ret;
drivers/gpu/drm/bochs/bochs_drv.c +1 -1
@@ -114,7 +114,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,return -ENOMEM ; } - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"bochsdrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"bochsdrmfb" );if (ret)return ret;
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -532,7 +532,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,struct cirrus_device *cirrus;int ret; - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"cirrusdrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"cirrusdrmfb" );if (ret)return ret;
drivers/gpu/drm/mgag200/mgag200_drv.c +1 -1
@@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist);static int mga_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { -drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"mgag200drmfb" ); +drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"mgag200drmfb" );return drm_get_pci_dev (pdev, ent, &driver); }
drivers/gpu/drm/qxl/qxl_drv.c +1 -1
@@ -83,7 +83,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto free_dev; - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"qxl" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"qxl" );if (ret) goto disable_pci;
drivers/gpu/drm/radeon/radeon_drv.c +1 -1
@@ -329,7 +329,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,return -EPROBE_DEFER ;/* Get rid of things like offb */ - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"radeondrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"radeondrmfb" );if (ret)return ret;
drivers/gpu/drm/virtio/virtgpu_drv.c +0 -1
@@ -56,7 +56,6 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vd dev->pdev = pdev;if (vga)drm_fb_helper_remove_conflicting_pci_framebuffers (pdev, -0 ,"virtiodrmfb" );/*
Signature · 1 line
2.18.1
Re: [PATCH 2/3] drm: drop resource_id parameter from drm_fb_helper_remove_conflicting_pci_framebuffers
Quoted 3 lines · Gerd Hoffmann
Not needed any more for
remove_conflicting_pci_framebufferscalls.Signed-off-by Gerd Hoffmann <[email protected]>
Quoted 128 lines
--- include/drm/drm_fb_helper.h | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/bochs/bochs_drv.c | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - 8 files changed, 7 insertions(+), 10 deletions(-)include/drm/drm_fb_helper.h +1
-3@@ -539,18 +539,16 @@ drm_fb_helper_remove_conflicting_framebuffers(struct apertures_struct *a,/** * drm_fb_helper_remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices * @pdev: PCI device -* @resource_id: index of PCI BAR configuring framebuffer memory * @name: requesting driver name * * This function removes framebuffer devices (eg. initialized by firmware) -* using memory range configured for @pdev's BAR @resource_id. +* using memory range configured for any of @pdev's memory bars. * * The function assumes that PCI device with shadowed ROM drives a primary * display and so kicks out vga16fb. */ static inline int drm_fb_helper_remove_conflicting_pci_framebuffers (struct pci_dev *pdev, -int resource_id,const char *name) {int ret =0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-1@@ -1031,7 +1031,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, }/* Get rid of things like offb */ - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"amdgpudrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"amdgpudrmfb" );if (ret)return ret;drivers/gpu/drm/bochs/bochs_drv.c +1
-1@@ -114,7 +114,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,return -ENOMEM ; } - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"bochsdrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"bochsdrmfb" );if (ret)return ret;drivers/gpu/drm/cirrus/cirrus.c +1
-1@@ -532,7 +532,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,struct cirrus_device *cirrus;int ret; - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"cirrusdrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"cirrusdrmfb" );if (ret)return ret;drivers/gpu/drm/mgag200/mgag200_drv.c +1
-1@@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist);static int mga_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { -drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"mgag200drmfb" ); +drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"mgag200drmfb" );return drm_get_pci_dev (pdev, ent, &driver); }drivers/gpu/drm/qxl/qxl_drv.c +1
-1@@ -83,7 +83,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto free_dev; - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"qxl" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"qxl" );if (ret) goto disable_pci;drivers/gpu/drm/radeon/radeon_drv.c +1
-1@@ -329,7 +329,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,return -EPROBE_DEFER ;/* Get rid of things like offb */ - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"radeondrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"radeondrmfb" );if (ret)return ret;drivers/gpu/drm/virtio/virtgpu_drv.c +0
-1@@ -56,7 +56,6 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vd dev->pdev = pdev;if (vga)drm_fb_helper_remove_conflicting_pci_framebuffers (pdev, -0 ,"virtiodrmfb" );/* Signature · 1 line
2.18.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Gerd Hoffmann
maintainerPATCH 2/3 drm: drop resource_id parameter from drm_fb_helper_remove_conflicting_pci_framebuffers
In reply to Gerd HoffmannNot needed any more for remove_conflicting_pci_framebuffers calls.
--- include/drm/drm_fb_helper.h | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/bochs/bochs_drv.c | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - 8 files changed, 7 insertions(+), 10 deletions(-)
include/drm/drm_fb_helper.h +1 -3
@@ -539,18 +539,16 @@ drm_fb_helper_remove_conflicting_framebuffers(struct apertures_struct *a,/** * drm_fb_helper_remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices * @pdev: PCI device -* @resource_id: index of PCI BAR configuring framebuffer memory * @name: requesting driver name * * This function removes framebuffer devices (eg. initialized by firmware) -* using memory range configured for @pdev's BAR @resource_id. +* using memory range configured for any of @pdev's memory bars. * * The function assumes that PCI device with shadowed ROM drives a primary * display and so kicks out vga16fb. */ static inline int drm_fb_helper_remove_conflicting_pci_framebuffers (struct pci_dev *pdev, -int resource_id,const char *name) {int ret =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -1031,7 +1031,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, }/* Get rid of things like offb */ - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"amdgpudrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"amdgpudrmfb" );if (ret)return ret;
drivers/gpu/drm/bochs/bochs_drv.c +1 -1
@@ -114,7 +114,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,return -ENOMEM ; } - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"bochsdrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"bochsdrmfb" );if (ret)return ret;
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -532,7 +532,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,struct cirrus_device *cirrus;int ret; - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"cirrusdrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"cirrusdrmfb" );if (ret)return ret;
drivers/gpu/drm/mgag200/mgag200_drv.c +1 -1
@@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist);static int mga_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { -drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"mgag200drmfb" ); +drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"mgag200drmfb" );return drm_get_pci_dev (pdev, ent, &driver); }
drivers/gpu/drm/qxl/qxl_drv.c +1 -1
@@ -83,7 +83,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto free_dev; - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"qxl" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"qxl" );if (ret) goto disable_pci;
drivers/gpu/drm/radeon/radeon_drv.c +1 -1
@@ -329,7 +329,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,return -EPROBE_DEFER ;/* Get rid of things like offb */ - ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"radeondrmfb" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"radeondrmfb" );if (ret)return ret;
drivers/gpu/drm/virtio/virtgpu_drv.c +0 -1
@@ -56,7 +56,6 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vd dev->pdev = pdev;if (vga)drm_fb_helper_remove_conflicting_pci_framebuffers (pdev, -0 ,"virtiodrmfb" );/*
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 3/3 drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers
In reply to Gerd HoffmannNo need for a home-grown version, the generic helper should work just fine. It also handles vgacon removal these days, see commit 1c74ca7a1a9a ("drm/fb-helper: call vga_remove_vgacon automatically."), so that can be removed too.
--- drivers/gpu/drm/i915/i915_drv.c | 41 ++------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -39
@@ -766,31 +766,6 @@ static int i915_load_modeset_init(struct drm_device *dev)return ret; } -static int i915_kick_out_firmware_fb (struct drm_i915_private *dev_priv) -{ -struct apertures_struct *ap; -struct pci_dev *pdev = dev_priv->drm.pdev; -struct i915_ggtt *ggtt = &dev_priv->ggtt; -bool primary; -int ret; - - ap =alloc_apertures (1 ); -if (!ap) -return -ENOMEM ; - - ap->ranges[0 ].base = ggtt->gmadr.start; - ap->ranges[0 ].size = ggtt->mappable_end; - - primary = - pdev->resource[PCI_ROM_RESOURCE ].flags &IORESOURCE_ROM_SHADOW ; - - ret =drm_fb_helper_remove_conflicting_framebuffers (ap,"inteldrmfb" , primary); - -kfree (ap); - -return ret; -} -static void intel_init_dpio (struct drm_i915_private *dev_priv) {/*
@@ -1570,21 +1545,9 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)if (ret) goto err_perf; -/* -* WARNING: Apparently we must kick fbdev drivers before vgacon, -* otherwise the vga fbdev driver falls over. -*/ - ret =i915_kick_out_firmware_fb (dev_priv); -if (ret) { -DRM_ERROR ("failed to remove conflicting framebuffer drivers\n" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"inteldrmfb" ); +if (ret) goto err_ggtt; - } - - ret =vga_remove_vgacon (pdev); -if (ret) { -DRM_ERROR ("failed to remove conflicting VGA console\n" ); - goto err_ggtt; - } ret =i915_ggtt_init_hw (dev_priv);if (ret)
Signature · 6 lines
2.18.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers
Quoted 6 lines · Gerd Hoffmann
No need for a home-grown version, the generic helper should work just fine. It also handles vgacon removal these days, see commit
1c74ca7a1a9a("drm/fb-helper: callvga_remove_vgaconautomatically."), so that can be removed too.Signed-off-by Gerd Hoffmann <[email protected]>
I think I'd still wait until 5.4-rc1 with merging this one, just to give another full release and people to test it before we pull the trigger. Overabundance of caution and all that.
Thanks a lot for doing this!
-Daniel
Quoted 67 lines
--- drivers/gpu/drm/i915/i915_drv.c | 41 ++------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-39@@ -766,31 +766,6 @@ static int i915_load_modeset_init(struct drm_device *dev)return ret; } -static int i915_kick_out_firmware_fb (struct drm_i915_private *dev_priv) -{ -struct apertures_struct *ap; -struct pci_dev *pdev = dev_priv->drm.pdev; -struct i915_ggtt *ggtt = &dev_priv->ggtt; -bool primary; -int ret; - - ap =alloc_apertures (1 ); -if (!ap) -return -ENOMEM ; - - ap->ranges[0 ].base = ggtt->gmadr.start; - ap->ranges[0 ].size = ggtt->mappable_end; - - primary = - pdev->resource[PCI_ROM_RESOURCE ].flags &IORESOURCE_ROM_SHADOW ; - - ret =drm_fb_helper_remove_conflicting_framebuffers (ap,"inteldrmfb" , primary); - -kfree (ap); - -return ret; -} -static void intel_init_dpio (struct drm_i915_private *dev_priv) {/* @@ -1570,21 +1545,9 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)if (ret) goto err_perf; -/* -* WARNING: Apparently we must kick fbdev drivers before vgacon, -* otherwise the vga fbdev driver falls over. -*/ - ret =i915_kick_out_firmware_fb (dev_priv); -if (ret) { -DRM_ERROR ("failed to remove conflicting framebuffer drivers\n" ); + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"inteldrmfb" ); +if (ret) goto err_ggtt; - } - - ret =vga_remove_vgacon (pdev); -if (ret) { -DRM_ERROR ("failed to remove conflicting VGA console\n" ); - goto err_ggtt; - } ret =i915_ggtt_init_hw (dev_priv);if (ret)Signature · 1 line
2.18.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerRe: [PATCH 3/3] drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers
Quoted 6 lines · Daniel Vetter
Quoted 5 lines · Gerd Hoffmann
No need for a home-grown version, the generic helper should work just fine. It also handles vgacon removal these days, see commit
1c74ca7a1a9a("drm/fb-helper: callvga_remove_vgaconautomatically."), so that can be removed too.
Quoted 7 lines
Quoted 1 line
Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Daniel Vetter <[email protected]>I think I'd still wait until 5.4-rc1 with merging this one, just to give another full release and people to test it before we pull the trigger. Overabundance of caution and all that.
Whole series or just the i915 patch?
cheers,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/3] drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers
Quoted 9 lines · Gerd Hoffmann
Quoted 8 lines · Daniel Vetter
Quoted 6 lines · Gerd Hoffmann
No need for a home-grown version, the generic helper should work just fine. It also handles vgacon removal these days, see commit
1c74ca7a1a9a("drm/fb-helper: callvga_remove_vgaconautomatically."), so that can be removed too.Signed-off-by Gerd Hoffmann <[email protected]>
Quoted 7 lines
Quoted 5 lines
Reviewed-by Daniel Vetter <[email protected]>I think I'd still wait until 5.4-rc1 with merging this one, just to give another full release and people to test it before we pull the trigger. Overabundance of caution and all that.
Whole series or just the i915 patch?
Ok I just checked and this all landed in 5.1 already, I thought it was more recent. I think that's good enough, push it all without more waiting.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/3] drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers
Quoted 7 lines · Daniel Vetter
Quoted 2 lines · Gerd Hoffmann
Whole series or just the i915 patch?
Ok I just checked and this all landed in 5.1 already, I thought it was more recent. I think that's good enough, push it all without more waiting.
Pushed to drm-misc-next.
cheers,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Jani Nikula
maintainerRe: [PATCH 3/3] drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers
Quoted 10 lines · Gerd Hoffmann
Quoted 7 lines · Daniel Vetter
Quoted 2 lines · Gerd Hoffmann
Whole series or just the i915 patch?
Ok I just checked and this all landed in 5.1 already, I thought it was more recent. I think that's good enough, push it all without more waiting.
Pushed to drm-misc-next.
After-the-fact nitpick: i915 maintainers were Cc'd on the original patch, but not on the subsequent discussion on merging, or where to merge. intel-gfx@ mailing list wasn't Cc'd at all, which means this didn't get any pre-merge CI coverage we expect on every patch. I found about this having been merged through a merge conflict.
If you don't see the ack from the maintainers, please ask.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel