openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm: drop resource_id parameter from drm_fb_helper_remove_conflicting_pci_framebuffers 

Not needed any more for remove_conflicting_pci_framebuffers calls.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190822090645.25410-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-08-22 11:06:44 +02:00
parent 0a84596932
commit 35616a4aa9
8 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
View File

@ -1031,7 +1031,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
} }
/* Get rid of things like offb */ /* 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) if (ret)
return ret; return ret;

2
drivers/gpu/drm/bochs/bochs_drv.c
View File

@ -114,7 +114,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,
return -ENOMEM; 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) if (ret)
return ret; return ret;

2
drivers/gpu/drm/cirrus/cirrus.c
View File

@ -532,7 +532,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,
struct cirrus_device *cirrus; struct cirrus_device *cirrus;
int ret; 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) if (ret)
return ret; return ret;

2
drivers/gpu/drm/mgag200/mgag200_drv.c
View File

@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 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); return drm_get_pci_dev(pdev, ent, &driver);
} }

2
drivers/gpu/drm/qxl/qxl_drv.c
View File

@ -83,7 +83,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ret) if (ret)
goto free_dev; 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) if (ret)
goto disable_pci; goto disable_pci;

2
drivers/gpu/drm/radeon/radeon_drv.c
View File

@ -329,7 +329,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
return -EPROBE_DEFER; return -EPROBE_DEFER;
/* Get rid of things like offb */ /* 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) if (ret)
return ret; return ret;

1
drivers/gpu/drm/virtio/virtgpu_drv.c
View File

@ -56,7 +56,6 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vd
dev->pdev = pdev; dev->pdev = pdev;
if (vga) if (vga)
drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
0,
"virtiodrmfb"); "virtiodrmfb");
/* /*

4
include/drm/drm_fb_helper.h
View File

@ -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 * drm_fb_helper_remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices
* @pdev: PCI device * @pdev: PCI device
* @resource_id: index of PCI BAR configuring framebuffer memory
* @name: requesting driver name * @name: requesting driver name
* *
* This function removes framebuffer devices (eg. initialized by firmware) * 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 * The function assumes that PCI device with shadowed ROM drives a primary
* display and so kicks out vga16fb. * display and so kicks out vga16fb.
*/ */
static inline int static inline int
drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
int resource_id,
const char *name) const char *name)
{ {
int ret = 0; int ret = 0;