From: Jin-young Jeon Date: Fri, 22 Jan 2016 03:01:22 +0000 (+0900) Subject: Tizen: drm/sprd: change pid information on gem_info. X-Git-Tag: accepted/tizen/mobile/20160125.224821^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6389a96be03703b039d8720e71b0e58094fa9c76;p=profile%2Fmobile%2Fplatform%2Fkernel%2Flinux-3.10-sc7730.git Tizen: drm/sprd: change pid information on gem_info. Change-Id: If04b48e0fb9f24f0d2939d5ab7b1f6a62418e188 Signed-off-by: Jin-young Jeon --- diff --git a/drivers/gpu/drm/sprd/sprd_drm_drv.c b/drivers/gpu/drm/sprd/sprd_drm_drv.c index 4f75743..6846b40 100644 --- a/drivers/gpu/drm/sprd/sprd_drm_drv.c +++ b/drivers/gpu/drm/sprd/sprd_drm_drv.c @@ -49,9 +49,6 @@ static int sprd_drm_gem_one_info(int id, void *ptr, void *data) { struct drm_gem_object *obj = (struct drm_gem_object *)ptr; struct sprd_drm_gem_info_data *gem_info_data = data; - struct pid *pid = gem_info_data->filp->pid; - struct drm_sprd_file_private *file_priv = - gem_info_data->filp->driver_priv; struct sprd_drm_gem_obj *sprd_gem; struct sprd_drm_gem_buf *buf; @@ -68,8 +65,8 @@ static int sprd_drm_gem_one_info(int id, void *ptr, void *data) seq_printf(gem_info_data->m, "%5d\t%5d\t%4d\t%4d\t\t%4d\t0x%08lx\t0x%x\t%4d\t%4d\t\t" "%4d\t\t0x%p\t%6d\n", - pid_nr(pid), - file_priv->tgid, + (unsigned long)sprd_gem->pid, + (unsigned long)sprd_gem->tgid, id, atomic_read(&obj->refcount.refcount) - 1, obj->handle_count, @@ -309,7 +306,6 @@ static int sprd_drm_open(struct drm_device *dev, struct drm_file *file) if (!file_priv) return -ENOMEM; - file_priv->tgid = task_tgid_nr(current); file->driver_priv = file_priv; return sprd_drm_subdrv_open(dev, file); diff --git a/drivers/gpu/drm/sprd/sprd_drm_drv.h b/drivers/gpu/drm/sprd/sprd_drm_drv.h index dcd0fa0..e0dbd4a 100644 --- a/drivers/gpu/drm/sprd/sprd_drm_drv.h +++ b/drivers/gpu/drm/sprd/sprd_drm_drv.h @@ -45,7 +45,6 @@ struct sprd_drm_ipp_private { struct drm_sprd_file_private { struct sprd_drm_ipp_private *ipp_priv; - pid_t tgid; }; /* diff --git a/drivers/gpu/drm/sprd/sprd_drm_gem.c b/drivers/gpu/drm/sprd/sprd_drm_gem.c index fc8b833..f92a3f1 100755 --- a/drivers/gpu/drm/sprd/sprd_drm_gem.c +++ b/drivers/gpu/drm/sprd/sprd_drm_gem.c @@ -334,6 +334,9 @@ struct sprd_drm_gem_obj *sprd_drm_gem_init(struct drm_device *dev, return NULL; } + sprd_gem_obj->pid = task_pid_nr(current); + sprd_gem_obj->tgid = task_tgid_nr(current); + DRM_DEBUG_KMS("created file object = 0x%x\n", (unsigned int)obj->filp); return sprd_gem_obj; diff --git a/drivers/gpu/drm/sprd/sprd_drm_gem.h b/drivers/gpu/drm/sprd/sprd_drm_gem.h index 9e0de42..7e787cc 100644 --- a/drivers/gpu/drm/sprd/sprd_drm_gem.h +++ b/drivers/gpu/drm/sprd/sprd_drm_gem.h @@ -88,8 +88,9 @@ struct sprd_drm_gem_obj { struct sprd_drm_gem_buf *buffer; unsigned long size; unsigned int flags; - - int lockpid; + int lockpid; + pid_t pid; + pid_t tgid; struct drm_sprd_gem_object_wait_list_entry wait_entries[DRM_SPRD_HANDLE_WAIT_ENTRIES];