Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d6f0827 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm: Remove uneeded platform dev members 



Commit eeb75474 ("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: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 774e39ee

drivers/gpu/drm/msm/adreno/a3xx_gpu.c

+0 −2
Original line number Diff line number Diff line
@@ -486,8 +486,6 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) 
	adreno_gpu = &a3xx_gpu->base;

	gpu = &adreno_gpu->base;



	a3xx_gpu->pdev = pdev;



	gpu->perfcntrs = perfcntrs;

	gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs);

drivers/gpu/drm/msm/adreno/a3xx_gpu.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


struct a3xx_gpu {

	struct adreno_gpu base;

	struct platform_device *pdev;



	/* if OCMEM is used for GMEM: */

	uint32_t ocmem_base;

drivers/gpu/drm/msm/adreno/a4xx_gpu.c

+0 −2
Original line number Diff line number Diff line
@@ -568,8 +568,6 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) 
	adreno_gpu = &a4xx_gpu->base;

	gpu = &adreno_gpu->base;



	a4xx_gpu->pdev = pdev;



	gpu->perfcntrs = NULL;

	gpu->num_perfcntrs = 0;

drivers/gpu/drm/msm/adreno/a4xx_gpu.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


struct a4xx_gpu {

	struct adreno_gpu base;

	struct platform_device *pdev;



	/* if OCMEM is used for GMEM: */

	uint32_t ocmem_base;

drivers/gpu/drm/msm/adreno/a5xx_gpu.c

+1 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu) 
	static bool loaded;

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(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;



	/*
@@ -1015,7 +1015,6 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev) 
	adreno_gpu = &a5xx_gpu->base;

	gpu = &adreno_gpu->base;



	a5xx_gpu->pdev = pdev;

	adreno_gpu->registers = a5xx_registers;

	adreno_gpu->reg_offsets = a5xx_register_offsets;