Skip to content

Commit c348030

Browse files
Tian Taoxin3liang
authored andcommitted
drm/hisilicon: Fixed pcie resource conflict between drm and firmware
use the drm_fb_helper_remove_conflicting_pci_framebuffer to remove the framebuffer initialized by fireware/bootloader to avoid resource conflict. Signed-off-by: Tian Tao <[email protected]> Acked-by: Thomas Zimmermann <[email protected]> Signed-off-by: Xinliang Liu <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 29b7216 commit c348030

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,11 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
327327
struct drm_device *dev;
328328
int ret;
329329

330+
ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
331+
"hibmcdrmfb");
332+
if (ret)
333+
return ret;
334+
330335
dev = drm_dev_alloc(&hibmc_driver, &pdev->dev);
331336
if (IS_ERR(dev)) {
332337
DRM_ERROR("failed to allocate drm_device\n");

0 commit comments

Comments
 (0)