fixup drm/host1x

drivers/gpu/drm/tegra/gr3d.c

@@ -161,10 +161,16 @@ static int gr3d_is_addr_reg(struct device *dev, u32 class, u32 offset)
 	return 0;
 }
 
+static int gr3d_is_valid_class(u32 class)
+{
+	return (class == HOST1X_CLASS_GR3D);
+}
+
 static const struct tegra_drm_client_ops gr3d_ops = {
 	.open_channel = gr3d_open_channel,
 	.close_channel = gr3d_close_channel,
 	.is_addr_reg = gr3d_is_addr_reg,
+	.is_valid_class = gr3d_is_valid_class,
 	.submit = tegra_drm_submit,
 };
 

drivers/gpu/drm/tegra/uapi/submit.c

@@ -303,7 +303,7 @@ static int submit_create_job(struct drm_device *drm, struct host1x_job **pjob,
 			}
 
 			host1x_job_add_wait(job, cmd->wait_syncpt.id,
-					    cmd->wait_syncpt.threshold);
+					    cmd->wait_syncpt.threshold, class);
 		} else {
 			err = -EINVAL;
 			goto free_job;

drivers/gpu/host1x/hw/channel_hw.c

@@ -66,7 +66,7 @@ static void submit_gathers(struct host1x_job *job)
 				 host1x_class_host_wait_syncpt(cmd->wait.id,
 					cmd->wait.threshold));
 			host1x_cdma_push(
-				cdma, host1x_opcode_setclass(job->class, 0, 0),
+				cdma, host1x_opcode_setclass(cmd->class, 0, 0),
 				HOST1X_OPCODE_NOP);
 		} else {
 			struct host1x_job_gather *g = &cmd->gather;

drivers/gpu/host1x/job.c

@@ -111,10 +111,11 @@ void host1x_job_add_gather(struct host1x_job *job, struct host1x_bo *bo,
 }
 EXPORT_SYMBOL(host1x_job_add_gather);
 
-void host1x_job_add_wait(struct host1x_job *job, u32 id, u32 thresh)
+void host1x_job_add_wait(struct host1x_job *job, u32 id, u32 thresh, u32 class)
 {
 	struct host1x_job_cmd *cmd = &job->cmds[job->num_cmds];
 
+	cmd->class = class;
 	cmd->is_wait = true;
 	cmd->wait.id = id;
 	cmd->wait.threshold = thresh;

drivers/gpu/host1x/job.h

@@ -25,6 +25,7 @@ struct host1x_job_wait {
 
 struct host1x_job_cmd {
 	bool is_wait;
+	unsigned int class;
 
 	union {
 		struct host1x_job_gather gather;

include/linux/host1x.h

@@ -279,7 +279,7 @@ struct host1x_job *host1x_job_alloc(struct host1x_channel *ch,
 				    u32 num_cmdbufs, u32 num_relocs);
 void host1x_job_add_gather(struct host1x_job *job, struct host1x_bo *bo,
 			   unsigned int words, unsigned int offset);
-void host1x_job_add_wait(struct host1x_job *job, u32 id, u32 thresh);
+void host1x_job_add_wait(struct host1x_job *job, u32 id, u32 thresh, u32 class);
 struct host1x_job *host1x_job_get(struct host1x_job *job);
 void host1x_job_put(struct host1x_job *job);
 int host1x_job_pin(struct host1x_job *job, struct device *dev);