4 files changed, 7 insertions, 5 deletions

diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 204b10e33f16..8f29323611dd 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -325,6 +325,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
                      struct drm_tegra_submit *args, struct drm_device *drm,
                      struct drm_file *file)
 {
+        struct host1x_client *client = &context->client->base;
         unsigned int num_cmdbufs = args->num_cmdbufs;
         unsigned int num_relocs = args->num_relocs;
         struct drm_tegra_cmdbuf __user *user_cmdbufs;
@@ -356,8 +357,8 @@ int tegra_drm_submit(struct tegra_drm_context *context,
                 return -ENOMEM;
 
         job->num_relocs = args->num_relocs;
-        job->client = (u32)args->context;
-        job->class = context->client->base.class;
+        job->client = client;
+        job->class = client->class;
         job->serialize = true;
 
         /*
diff --git a/drivers/gpu/host1x/cdma.c b/drivers/gpu/host1x/cdma.c
index 69bb77372ed9..91df51e631b2 100644
--- a/drivers/gpu/host1x/cdma.c
+++ b/drivers/gpu/host1x/cdma.c
@@ -247,7 +247,7 @@ static void cdma_start_timer_locked(struct host1x_cdma *cdma,
 static void stop_cdma_timer_locked(struct host1x_cdma *cdma)
 {
         cancel_delayed_work(&cdma->timeout.wq);
-        cdma->timeout.client = 0;
+        cdma->timeout.client = NULL;
 }
 
 /*
diff --git a/drivers/gpu/host1x/cdma.h b/drivers/gpu/host1x/cdma.h
index 446ee1a84969..e97e17b82370 100644
--- a/drivers/gpu/host1x/cdma.h
+++ b/drivers/gpu/host1x/cdma.h
@@ -58,7 +58,7 @@ struct buffer_timeout {
         u32 syncpt_val;                 /* syncpt value when completed */
         ktime_t start_ktime;            /* starting time */
         /* context timeout information */
-        int client;
+        struct host1x_client *client;
 };
 
 enum cdma_event {
diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index f66bece1e1b7..0632010f47fb 100644
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -202,7 +202,8 @@ struct host1x_job {
         /* Channel where job is submitted to */
         struct host1x_channel *channel;
 
-        u32 client;
+        /* client where the job originated */
+        struct host1x_client *client;
 
         /* Gathers and their memory */
         struct host1x_job_gather *gathers;