leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/msm: Remove uneeded platform dev members

Browse Source 
Commit eeb754746b ("drm/msm/gpu: use pm-runtime") adds a pointer
for the GPU platform device to the msm_gpu struct so we can
happily remove the same pointers from the individual GPU
structs.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Jordan Crouse 2017-07-27 10:42:33 -06:00 committed by Rob Clark
parent 774e39ee35
commit 8d6f08272b
6 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/msm/adreno/a3xx_gpu.c
View File

@ -486,8 +486,6 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)
adreno_gpu = &a3xx_gpu->base; adreno_gpu = &a3xx_gpu->base;
gpu = &adreno_gpu->base; gpu = &adreno_gpu->base;
a3xx_gpu->pdev = pdev;
gpu->perfcntrs = perfcntrs; gpu->perfcntrs = perfcntrs;
gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs); gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs);

1
drivers/gpu/drm/msm/adreno/a3xx_gpu.h
View File

@ -28,7 +28,6 @@
struct a3xx_gpu { struct a3xx_gpu {
struct adreno_gpu base; struct adreno_gpu base;
struct platform_device *pdev;
/* if OCMEM is used for GMEM: */ /* if OCMEM is used for GMEM: */
uint32_t ocmem_base; uint32_t ocmem_base;

2
drivers/gpu/drm/msm/adreno/a4xx_gpu.c
View File

@ -568,8 +568,6 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev)
adreno_gpu = &a4xx_gpu->base; adreno_gpu = &a4xx_gpu->base;
gpu = &adreno_gpu->base; gpu = &adreno_gpu->base;
a4xx_gpu->pdev = pdev;
gpu->perfcntrs = NULL; gpu->perfcntrs = NULL;
gpu->num_perfcntrs = 0; gpu->num_perfcntrs = 0;

1
drivers/gpu/drm/msm/adreno/a4xx_gpu.h
View File

@ -23,7 +23,6 @@
struct a4xx_gpu { struct a4xx_gpu {
struct adreno_gpu base; struct adreno_gpu base;
struct platform_device *pdev;
/* if OCMEM is used for GMEM: */ /* if OCMEM is used for GMEM: */
uint32_t ocmem_base; uint32_t ocmem_base;

3
drivers/gpu/drm/msm/adreno/a5xx_gpu.c
View File

@ -373,7 +373,7 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu)
static bool loaded; static bool loaded;
struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu); struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu);
struct platform_device *pdev = a5xx_gpu->pdev; struct platform_device *pdev = gpu->pdev;
int ret; int ret;
/* /*
@ -1015,7 +1015,6 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)
adreno_gpu = &a5xx_gpu->base; adreno_gpu = &a5xx_gpu->base;
gpu = &adreno_gpu->base; gpu = &adreno_gpu->base;
a5xx_gpu->pdev = pdev;
adreno_gpu->registers = a5xx_registers; adreno_gpu->registers = a5xx_registers;
adreno_gpu->reg_offsets = a5xx_register_offsets; adreno_gpu->reg_offsets = a5xx_register_offsets;

1
drivers/gpu/drm/msm/adreno/a5xx_gpu.h
View File

@ -23,7 +23,6 @@
struct a5xx_gpu { struct a5xx_gpu {
struct adreno_gpu base; struct adreno_gpu base;
struct platform_device *pdev;
struct drm_gem_object *pm4_bo; struct drm_gem_object *pm4_bo;
uint64_t pm4_iova; uint64_t pm4_iova;