From 47cb48f1e2d9c34f22f9fcf443ef67a32cd54a73 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Tue, 27 Jun 2017 14:25:25 -0700 Subject: gpu: nvgpu: Move gops.mc's non-fp members Move non-function pointer members out of the mc substruct of gpu_ops. Ideally gpu_ops will have only function ponters, better matching its intended purpose and improving readability. gops.mc.intr_mask_restore is now mc_intr_mask_restore Jira NVGPU-74 Change-Id: Iddf5e761012086e993c375d59e1bbdfb1e64db0c Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1509602 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gk20a/gk20a.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index dee74fdd..c7ade5f6 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -887,7 +887,6 @@ struct gpu_ops { void (*reset)(struct gk20a *g, u32 units); u32 (*boot_0)(struct gk20a *g, u32 *arch, u32 *impl, u32 *rev); bool (*is_intr1_pending)(struct gk20a *g, enum nvgpu_unit unit, u32 mc_intr_1); - u32 intr_mask_restore[4]; } mc; struct { void (*show_dump)(struct gk20a *g, @@ -1204,6 +1203,7 @@ struct gk20a { int client_refcount; /* open channels and ctrl nodes */ struct gpu_ops ops; + u32 mc_intr_mask_restore[4]; int irqs_enabled; int irq_stall; /* can be same as irq_nonstall in case of PCI */ -- cgit v1.2.2