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

Commit 878411ae authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/gpu: Remove hardcoded interrupt name 



Every GPU core only has one interrupt so there isn't any
value in looking up the interrupt by name. Remove the name (which
is legacy anyway) and use platform_get_irq() instead.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent c878a628

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

+0 −1
Original line number Diff line number Diff line
@@ -765,7 +765,6 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	adreno_gpu->rev = config->rev;



	adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";

	adreno_gpu_config.irqname = "kgsl_3d0_irq";



	adreno_gpu_config.va_start = SZ_16M;

	adreno_gpu_config.va_end = 0xffffffff;

drivers/gpu/drm/msm/msm_gpu.c

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	}



	/* Get Interrupt: */

	gpu->irq = platform_get_irq_byname(pdev, config->irqname);

	gpu->irq = platform_get_irq(pdev, 0);

	if (gpu->irq < 0) {

		ret = gpu->irq;

		DRM_DEV_ERROR(drm->dev, "failed to get irq: %d\n", ret);

drivers/gpu/drm/msm/msm_gpu.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct msm_gpu_state; 


struct msm_gpu_config {

	const char *ioname;

	const char *irqname;

	uint64_t va_start;

	uint64_t va_end;

	unsigned int nr_rings;