<div dir="ltr"><div dir="ltr">Thanks for the patch.<br>Applied to drm-misc-next.<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, 24 Feb 2020 at 14:02, Tian Tao <<a href="mailto:tiantao6@hisilicon.com">tiantao6@hisilicon.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">use the drm_fb_helper_remove_conflicting_pci_framebuffer to remove<br>
the framebuffer initialized by fireware/bootloader to avoid resource<br>
conflict.<br>
<br>
Signed-off-by: Tian Tao <<a href="mailto:tiantao6@hisilicon.com" target="_blank">tiantao6@hisilicon.com</a>><br>
<br>
---<br>
v2:     use the general API to remove the conflict resource instead of rolling<br>
        our own.<br>
---<br>
---<br>
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +++++<br>
 1 file changed, 5 insertions(+)<br>
<br>
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c<br>
index 4a8a4cf..7518980 100644<br>
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c<br>
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c<br>
@@ -327,6 +327,11 @@ static int hibmc_pci_probe(struct pci_dev *pdev,<br>
        struct drm_device *dev;<br>
        int ret;<br>
<br>
+       ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,<br>
+                                                       "hibmcdrmfb");<br>
+       if (ret)<br>
+               return ret;<br>
+<br>
        dev = drm_dev_alloc(&hibmc_driver, &pdev->dev);<br>
        if (IS_ERR(dev)) {<br>
                DRM_ERROR("failed to allocate drm_device\n");<br>
-- <br>
2.7.4<br>
<br>
</blockquote></div></div>