evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: kgsl: Use one define for max priority levels

Browse source 
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>
This commit is contained in:
Carter Cooper 2015-12-11 11:37:53 -07:00 • committed by David Keitel
parent 56c4af29d5
commit 131ebe3509
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/msm/adreno.h
View file

@ -33,8 +33,6 @@
#define DEVICE_3D_NAME "kgsl-3d" #define DEVICE_3D_NAME "kgsl-3d"
#define DEVICE_3D0_NAME "kgsl-3d0" #define DEVICE_3D0_NAME "kgsl-3d0"
#define ADRENO_PRIORITY_MAX_RB_LEVELS 4
/* ADRENO_DEVICE - Given a kgsl_device return the adreno device struct */ /* ADRENO_DEVICE - Given a kgsl_device return the adreno device struct */
#define ADRENO_DEVICE(device) \ #define ADRENO_DEVICE(device) \
container_of(device, struct adreno_device, dev) container_of(device, struct adreno_device, dev)
@ -339,7 +337,7 @@ struct adreno_device {
struct kgsl_memdesc pm4; struct kgsl_memdesc pm4;
size_t gpmu_cmds_size; size_t gpmu_cmds_size;
unsigned int *gpmu_cmds; 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; int num_ringbuffers;
struct adreno_ringbuffer *cur_rb; struct adreno_ringbuffer *cur_rb;
struct adreno_ringbuffer *next_rb; struct adreno_ringbuffer *next_rb;

2
drivers/gpu/msm/adreno_a4xx.c
View file

@ -2233,7 +2233,7 @@ struct adreno_gpudev adreno_a4xx_gpudev = {
.irq = &a4xx_irq, .irq = &a4xx_irq,
.irq_trace = trace_kgsl_a4xx_irq_status, .irq_trace = trace_kgsl_a4xx_irq_status,
.snapshot_data = &a4xx_snapshot_data, .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, .vbif_xin_halt_ctrl0_mask = A4XX_VBIF_XIN_HALT_CTRL0_MASK,
.perfcounter_init = a4xx_perfcounter_init, .perfcounter_init = a4xx_perfcounter_init,

2
drivers/gpu/msm/adreno_a5xx.c
View file

@ -3909,7 +3909,7 @@ struct adreno_gpudev adreno_a5xx_gpudev = {
.irq = &a5xx_irq, .irq = &a5xx_irq,
.snapshot_data = &a5xx_snapshot_data, .snapshot_data = &a5xx_snapshot_data,
.irq_trace = trace_kgsl_a5xx_irq_status, .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, .platform_setup = a5xx_platform_setup,
.init = a5xx_init, .init = a5xx_init,
.rb_init = a5xx_rb_init, .rb_init = a5xx_rb_init,