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 <tiantao6@hisilicon.com>

---
v2:     use the general API to remove the conflict resource instead of rolling
        our own.
---
---
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index 4a8a4cf..7518980 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -327,6 +327,11 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
        struct drm_device *dev;
        int ret;

+       ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
+                                                       "hibmcdrmfb");
+       if (ret)
+               return ret;
+
        dev = drm_dev_alloc(&hibmc_driver, &pdev->dev);
        if (IS_ERR(dev)) {
                DRM_ERROR("failed to allocate drm_device\n");
--
2.7.4