2020-02-24 06:03:02

by Tian Tao

[permalink] [raw]

Subject: [PATCH v2] 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]>

---
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

2020-02-25 07:23:19

by Thomas Zimmermann

[permalink] [raw]

Subject: Re: [PATCH v2] drm/hisilicon: Fixed pcie resource conflict between drm and firmware

---

Hi

Am 24.02.20 um 07:01 schrieb Tian Tao:
> 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]>
>
> ---
> v2: use the general API to remove the conflict resource instead of rolling
> our own.

Nit: the patch's version info is usually a part of the commit messages.
It goes between the description and the Signed-off-by line.

Acked-by: Thomas Zimmermann <[email protected]>

> ---
> ---
> 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");
>

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

---

Attachments:

signature.asc (499.00 B)
OpenPGP digital signature