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

Commit 4ac277cd authored Nov 28, 2016 by Jordan Crouse Committed by Rob Clark Nov 28, 2016

drm/msm: Disable interrupts during init



Disable the interrupt during the init sequence to avoid having
interrupts fired for errors and other things that we are not
ready to handle while initializing.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

parent 89d777a5

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -145,12 +145,16 @@ struct msm_gpu adreno_load_gpu(struct drm_device dev)
	mutex_lock(&dev->struct_mutex);		mutex_lock(&dev->struct_mutex);
	gpu->funcs->pm_resume(gpu);		gpu->funcs->pm_resume(gpu);
	mutex_unlock(&dev->struct_mutex);		mutex_unlock(&dev->struct_mutex);

			disable_irq(gpu->irq);

	ret = gpu->funcs->hw_init(gpu);		ret = gpu->funcs->hw_init(gpu);
	if (ret) {		if (ret) {
	dev_err(dev->dev, "gpu hw init failed: %d\n", ret);		dev_err(dev->dev, "gpu hw init failed: %d\n", ret);
	gpu->funcs->destroy(gpu);		gpu->funcs->destroy(gpu);
	gpu = NULL;		gpu = NULL;
	} else {		} else {
			enable_irq(gpu->irq);
	/* give inactive pm a chance to kick in: */		/* give inactive pm a chance to kick in: */
	msm_gpu_retire(gpu);		msm_gpu_retire(gpu);
	}		}

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -129,11 +129,14 @@ void adreno_recover(struct msm_gpu *gpu)
	adreno_gpu->memptrs->wptr = 0;		adreno_gpu->memptrs->wptr = 0;

	gpu->funcs->pm_resume(gpu);		gpu->funcs->pm_resume(gpu);

			disable_irq(gpu->irq);
	ret = gpu->funcs->hw_init(gpu);		ret = gpu->funcs->hw_init(gpu);
	if (ret) {		if (ret) {
	dev_err(dev->dev, "gpu hw init failed: %d\n", ret);		dev_err(dev->dev, "gpu hw init failed: %d\n", ret);
	/* hmm, oh well? */		/* hmm, oh well? */
	}		}
			enable_irq(gpu->irq);
	}		}

	void adreno_submit(struct msm_gpu gpu, struct msm_gem_submit submit,		void adreno_submit(struct msm_gpu gpu, struct msm_gem_submit submit,