From: jeffy.chen@rock-chips.com (Jeffy Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 8/9] drm/rockchip: gem: Don't alloc/free gem buf before drm dev registered
Date: Sat, 1 Apr 2017 18:44:01 +0800 [thread overview]
Message-ID: <1491043442-20626-9-git-send-email-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <1491043442-20626-1-git-send-email-jeffy.chen@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index df9e570..19679b2 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -184,6 +184,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj,
struct drm_device *drm = obj->dev;
struct rockchip_drm_private *private = drm->dev_private;
+ if (!drm->registered)
+ return;
+
if (private->domain)
return rockchip_gem_alloc_iommu(rk_obj, alloc_kmap);
else
@@ -208,6 +211,11 @@ static void rockchip_gem_free_dma(struct rockchip_gem_object *rk_obj)
static void rockchip_gem_free_buf(struct rockchip_gem_object *rk_obj)
{
+ struct drm_device *drm = rk_obj->base.dev;
+
+ if (!drm->registered)
+ return;
+
if (rk_obj->pages)
rockchip_gem_free_iommu(rk_obj);
else
--
2.1.4
next prev parent reply other threads:[~2017-04-01 10:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-01 10:43 [PATCH 0/9] drm: rockchip: Fix rockchip drm unbind crash error Jeffy Chen
2017-04-01 10:43 ` [PATCH 4/9] drm/rockchip: cdn-dp: Don't try to release firmware when not loaded Jeffy Chen
2017-04-01 10:43 ` [PATCH 5/9] drm/rockchip: vop: Enable pm domain when resetting vop Jeffy Chen
2017-04-01 10:43 ` [PATCH 6/9] drm/rockchip: Reoder unload sequence Jeffy Chen
2017-04-01 10:44 ` [PATCH 7/9] drm/rockchip: Force disable all crtc when unload Jeffy Chen
2017-04-01 10:44 ` Jeffy Chen [this message]
2017-04-03 7:22 ` [PATCH 8/9] drm/rockchip: gem: Don't alloc/free gem buf before drm dev registered kbuild test robot
2017-04-01 10:44 ` [PATCH 9/9] drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding Jeffy Chen
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=1491043442-20626-9-git-send-email-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).