From: Tian Tao <tiantao6@hisilicon.com>
To: <airlied@linux.ie>, <daniel@ffwll.ch>, <tzimmermann@suse.de>,
<kraxel@redhat.com>, <alexander.deucher@amd.com>,
<tglx@linutronix.de>, <dri-devel@lists.freedesktop.org>,
<xinliang.liu@linaro.org>, <linux-kernel@vger.kernel.org>
Cc: Tian Tao <tiantao6@hisilicon.com>
Subject: [PATCH drm/hisilicon 2/2] drm/hisilicon: Use the new api devm_drm_msi_install
Date: Tue, 15 Dec 2020 19:48:53 +0800 [thread overview]
Message-ID: <1608032933-50187-3-git-send-email-tiantao6@hisilicon.com> (raw)
In-Reply-To: <1608032933-50187-1-git-send-email-tiantao6@hisilicon.com>
Use devm_drm_msi_install to enable pci msi so that
pci_disable_msi is not called when hibmc is removed.
Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
---
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index 7e91ef1..21f8225 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -251,7 +251,6 @@ static int hibmc_hw_init(struct hibmc_drm_private *priv)
static int hibmc_unload(struct drm_device *dev)
{
drm_atomic_helper_shutdown(dev);
- pci_disable_msi(dev->pdev);
return 0;
}
@@ -282,7 +281,7 @@ static int hibmc_load(struct drm_device *dev)
goto err;
}
- ret = pci_enable_msi(dev->pdev);
+ ret = devm_drm_msi_install(dev);
if (ret) {
drm_warn(dev, "enabling MSI failed: %d\n", ret);
} else {
--
2.7.4
prev parent reply other threads:[~2020-12-15 11:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 11:48 [PATCH drm/hisilicon 0/2] Add the new api to enable msi Tian Tao
2020-12-15 11:48 ` [PATCH drm/hisilicon 1/2] drm/irq: Add the new api to enable pci msi Tian Tao
2020-12-15 11:57 ` Daniel Vetter
2020-12-15 11:48 ` Tian Tao [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=1608032933-50187-3-git-send-email-tiantao6@hisilicon.com \
--to=tiantao6@hisilicon.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tzimmermann@suse.de \
--cc=xinliang.liu@linaro.org \
/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
all inboxes | Powered by JetHome®