diff options
author | Chanho Park <chanho61.park@samsung.com> | 2014-08-22 17:41:21 +0900 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2014-10-15 20:05:18 +0900 |
commit | ec1e139fdbe68661a8f2e4205bf1d903a3ced3b2 (patch) | |
tree | 9994b05d4b75134bf0e5d6aa221624e39c81788e | |
parent | 0a68d58d2b1b555d20d20857f841f72a4b611087 (diff) | |
download | linux-3.10-ec1e139fdbe68661a8f2e4205bf1d903a3ced3b2.tar.gz linux-3.10-ec1e139fdbe68661a8f2e4205bf1d903a3ced3b2.tar.bz2 linux-3.10-ec1e139fdbe68661a8f2e4205bf1d903a3ced3b2.zip |
gpu/drm: fix compile error since backported
Change-Id: I5c9a62578057b164898c8f7880d0566e813dba65
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
-rw-r--r-- | drivers/gpu/drm/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_gem.c | 50 |
2 files changed, 1 insertions, 51 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index b13abbe3705..c39712bd6ac 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -13,7 +13,7 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ drm_crtc.o drm_modes.o drm_edid.o \ drm_info.o drm_debugfs.o drm_encoder_slave.o \ drm_trace_points.o drm_global.o drm_prime.o drm_backlight.o \ - drm_rect.o drm_vma_manager.o + drm_vma_manager.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 01c3613fefa..d6122ae6bf8 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -265,56 +265,6 @@ drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj) drm_gem_object_unreference_unlocked(obj); } -static void drm_gem_object_ref_bug(struct kref *list_kref) -{ - BUG(); -} - -/** - * Called after the last handle to the object has been closed - * - * Removes any name for the object. Note that this must be - * called before drm_gem_object_free or we'll be touching - * freed memory - */ -static void drm_gem_object_handle_free(struct drm_gem_object *obj) -{ - struct drm_device *dev = obj->dev; - - /* Remove any name for this object */ - if (obj->name) { - idr_remove(&dev->object_name_idr, obj->name); - obj->name = 0; - /* - * The object name held a reference to this object, drop - * that now. - * - * This cannot be the last reference, since the handle holds one too. - */ - kref_put(&obj->refcount, drm_gem_object_ref_bug); - } -} - -static void -drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj) -{ - if (WARN_ON(obj->handle_count == 0)) - return; - - /* - * Must bump handle count first as this may be the last - * ref, in which case the object would disappear before we - * checked for a name - */ - - mutex_lock(&obj->dev->object_name_lock); - if (--obj->handle_count == 0) - drm_gem_object_handle_free(obj); - mutex_unlock(&obj->dev->object_name_lock); - - drm_gem_object_unreference_unlocked(obj); -} - /** * Removes the mapping from handle to filp for this object. */ |