Commit c3480301 authored by Tian Tao's avatar Tian Tao Committed by Xinliang Liu

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: default avatarTian Tao <tiantao6@hisilicon.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarXinliang Liu <xinliang.liu@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1582524112-5628-1-git-send-email-tiantao6@hisilicon.com
parent 29b7216b
...@@ -327,6 +327,11 @@ static int hibmc_pci_probe(struct pci_dev *pdev, ...@@ -327,6 +327,11 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
struct drm_device *dev; struct drm_device *dev;
int ret; int ret;
ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
"hibmcdrmfb");
if (ret)
return ret;
dev = drm_dev_alloc(&hibmc_driver, &pdev->dev); dev = drm_dev_alloc(&hibmc_driver, &pdev->dev);
if (IS_ERR(dev)) { if (IS_ERR(dev)) {
DRM_ERROR("failed to allocate drm_device\n"); DRM_ERROR("failed to allocate drm_device\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment