From: Xinliang Liu <xinliang.liu@linaro.org>
To: Tian Tao <tiantao6@hisilicon.com>
Cc: airlied@linux.ie, puck.chen@hisilicon.com,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
linuxarm@huawei.com, kraxel@redhat.com, tzimmermann@suse.de,
alexander.deucher@amd.com, tglx@linutronix.de
Subject: Re: [PATCH v2] drm/hisilicon: Fixed pcie resource conflict between drm and firmware
Date: Thu, 27 Feb 2020 12:39:42 +0800 [thread overview]
Message-ID: <CAKoKPbw9MNsJqAOhFMqDcafk8kJLA7Fm8pcrakEjyTBvak8Bvw@mail.gmail.com> (raw)
In-Reply-To: <1582524112-5628-1-git-send-email-tiantao6@hisilicon.com>
[-- Attachment #1.1: Type: text/plain, Size: 1298 bytes --]
Thanks for the patch.
Applied to drm-misc-next.
On Mon, 24 Feb 2020 at 14:02, Tian Tao <tiantao6@hisilicon.com> wrote:
> 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
>
>
[-- Attachment #1.2: Type: text/html, Size: 1881 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2020-02-27 8:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 6:01 [PATCH v2] drm/hisilicon: Fixed pcie resource conflict between drm and firmware Tian Tao
2020-02-25 7:21 ` Thomas Zimmermann
2020-02-27 4:39 ` Xinliang Liu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKoKPbw9MNsJqAOhFMqDcafk8kJLA7Fm8pcrakEjyTBvak8Bvw@mail.gmail.com \
--to=xinliang.liu@linaro.org \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=puck.chen@hisilicon.com \
--cc=tglx@linutronix.de \
--cc=tiantao6@hisilicon.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).