Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1614490

[PATCH v2 8/9] drm/rockchip: gem: Don't alloc/free gem buf before drm dev registered

Show all headers | View raw

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---

Changes in v2: None

 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..2bf8024 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 -ENODEV;
+
 	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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] drm: rockchip: Fix rockchip drm unbind crash error Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
  [PATCH v2 9/9] drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
  [PATCH v2 3/9] drm: bridge: analogix: Destroy connector when unbinding Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
  [PATCH v2 2/9] drm: bridge: analogix: Unregister dp aux when unbinding Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
  [PATCH v2 7/9] drm/rockchip: Force disable all crtc when unload Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
    Re: [PATCH v2 7/9] drm/rockchip: Force disable all crtc when unload Daniel Vetter <daniel@ffwll.ch> - 2017-04-03 10:00 +0200
      Re: [PATCH v2 7/9] drm/rockchip: Force disable all crtc when unload jeffy <jeffy.chen@rock-chips.com> - 2017-04-05 12:30 +0200
  [PATCH v2 8/9] drm/rockchip: gem: Don't alloc/free gem buf before drm dev registered Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
    Re: [PATCH v2 8/9] drm/rockchip: gem: Don't alloc/free gem buf  before drm dev registered Daniel Vetter <daniel@ffwll.ch> - 2017-04-03 09:50 +0200
      Re: [PATCH v2 8/9] drm/rockchip: gem: Don't alloc/free gem buf before  drm dev registered jeffy <jeffy.chen@rock-chips.com> - 2017-04-05 03:30 +0200
  [PATCH v2 1/9] drm: bridge: analogix: Detach panel when unbinding analogix dp Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
  [PATCH v2 4/9] drm/rockchip: cdn-dp: Don't try to release firmware when not loaded Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
  [PATCH v2 6/9] drm/rockchip: Reoder unload sequence Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 13:40 +0200
    Re: [PATCH v2 6/9] drm/rockchip: Reoder unload sequence Sean Paul <seanpaul@chromium.org> - 2017-04-04 21:50 +0200
      Re: [PATCH v2 6/9] drm/rockchip: Reoder unload sequence jeffy <jeffy.chen@rock-chips.com> - 2017-04-05 12:30 +0200

csiph-web