[5/6] drm/msm: Change MSM_DRM_SUBMITQUEUE_CLOSE

Commit Message

Jordan Crouse Oct. 3, 2017, 3:27 p.m. UTC

Instead of passing a mostly unused struct to MSM_DRM_SUBMITQEUUE_CLOSE
we only need to pass the u32 value of the queue ID.

Signed-off-by: Jordan Crouse <[e-mail]>
---
 drivers/gpu/drm/msm/msm_drv.c | 4 ++--
 drivers/gpu/drm/msm/msm_gpu.h | 1 -
 include/uapi/drm/msm_drm.h    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index e1db580..482e1a9 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -829,9 +829,9 @@  static int msm_ioctl_submitqueue_new(struct drm_device *dev, void *data,
 static int msm_ioctl_submitqueue_close(struct drm_device *dev, void *data,
 		struct drm_file *file)
 {
-	struct drm_msm_submitqueue *args = data;
+	u32 *args = data;
 
-	return msm_submitqueue_remove(file->driver_priv, args->id);
+	return msm_submitqueue_remove(file->driver_priv, *args);
 }
 
 static const struct drm_ioctl_desc msm_ioctls[] = {
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index 914cd2f..0e2aec1 100644
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -172,7 +172,6 @@  struct msm_gpu_submitqueue {
 	int faults;
 	struct list_head node;
 	struct kref ref;
-
 	struct msm_fence_context *fctx;
 };
 
diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
index 711ea30..3183ef7 100644
--- a/include/uapi/drm/msm_drm.h
+++ b/include/uapi/drm/msm_drm.h
@@ -297,7 +297,7 @@  struct drm_msm_submitqueue {
 #define DRM_IOCTL_MSM_WAIT_FENCE       DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_WAIT_FENCE, struct drm_msm_wait_fence)
 #define DRM_IOCTL_MSM_GEM_MADVISE      DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_MADVISE, struct drm_msm_gem_madvise)
 #define DRM_IOCTL_MSM_SUBMITQUEUE_NEW    DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_NEW, struct drm_msm_submitqueue)
-#define DRM_IOCTL_MSM_SUBMITQUEUE_CLOSE  DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_CLOSE, struct drm_msm_submitqueue)
+#define DRM_IOCTL_MSM_SUBMITQUEUE_CLOSE  DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_CLOSE, __u32)
 
 #if defined(__cplusplus)
 }