diff options
| author | Carter Cooper <ccooper@codeaurora.org> | 2015-12-11 11:37:53 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:19:26 -0700 |
| commit | 131ebe3509caba8c72e2020de2418423e37e367a (patch) | |
| tree | de6812329b950e3f50de3546363a16da058c5ab9 | |
| parent | 56c4af29d514d9c103d5a8d96ed8b0668f8b2245 (diff) | |
msm: kgsl: Use one define for max priority levels
Don't redefine the macro since that could result in inconsistent
data if one of them changes and the isn't updated.
CRs-Fixed: 971159
Change-Id: I57ab3113fbdd82c70cba1c79f4b996cea09a8739
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
| -rw-r--r-- | drivers/gpu/msm/adreno.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/msm/adreno_a4xx.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/msm/adreno_a5xx.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/msm/adreno.h b/drivers/gpu/msm/adreno.h index 904c4355b827..7a96347b863e 100644 --- a/drivers/gpu/msm/adreno.h +++ b/drivers/gpu/msm/adreno.h @@ -33,8 +33,6 @@ #define DEVICE_3D_NAME "kgsl-3d" #define DEVICE_3D0_NAME "kgsl-3d0" -#define ADRENO_PRIORITY_MAX_RB_LEVELS 4 - /* ADRENO_DEVICE - Given a kgsl_device return the adreno device struct */ #define ADRENO_DEVICE(device) \ container_of(device, struct adreno_device, dev) @@ -339,7 +337,7 @@ struct adreno_device { struct kgsl_memdesc pm4; size_t gpmu_cmds_size; unsigned int *gpmu_cmds; - struct adreno_ringbuffer ringbuffers[ADRENO_PRIORITY_MAX_RB_LEVELS]; + struct adreno_ringbuffer ringbuffers[KGSL_PRIORITY_MAX_RB_LEVELS]; int num_ringbuffers; struct adreno_ringbuffer *cur_rb; struct adreno_ringbuffer *next_rb; diff --git a/drivers/gpu/msm/adreno_a4xx.c b/drivers/gpu/msm/adreno_a4xx.c index eec3480e0c73..60603850298c 100644 --- a/drivers/gpu/msm/adreno_a4xx.c +++ b/drivers/gpu/msm/adreno_a4xx.c @@ -2233,7 +2233,7 @@ struct adreno_gpudev adreno_a4xx_gpudev = { .irq = &a4xx_irq, .irq_trace = trace_kgsl_a4xx_irq_status, .snapshot_data = &a4xx_snapshot_data, - .num_prio_levels = ADRENO_PRIORITY_MAX_RB_LEVELS, + .num_prio_levels = KGSL_PRIORITY_MAX_RB_LEVELS, .vbif_xin_halt_ctrl0_mask = A4XX_VBIF_XIN_HALT_CTRL0_MASK, .perfcounter_init = a4xx_perfcounter_init, diff --git a/drivers/gpu/msm/adreno_a5xx.c b/drivers/gpu/msm/adreno_a5xx.c index 73eb9353ad34..6a0f5c37516b 100644 --- a/drivers/gpu/msm/adreno_a5xx.c +++ b/drivers/gpu/msm/adreno_a5xx.c @@ -3909,7 +3909,7 @@ struct adreno_gpudev adreno_a5xx_gpudev = { .irq = &a5xx_irq, .snapshot_data = &a5xx_snapshot_data, .irq_trace = trace_kgsl_a5xx_irq_status, - .num_prio_levels = ADRENO_PRIORITY_MAX_RB_LEVELS, + .num_prio_levels = KGSL_PRIORITY_MAX_RB_LEVELS, .platform_setup = a5xx_platform_setup, .init = a5xx_init, .rb_init = a5xx_rb_init, |