Commit 2c087a33 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/adreno: Load the firmware before bringing up the hardware 



Failure to load firmware is the primary reason to fail adreno_load_gpu().
Try to load it first before going into the hardware initialization code and
unwinding it. This is important for a6xx because the GMU gets loaded from
the runtime power code and it is more costly to fail in that path because
of missing firmware.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 8e54eea5

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

+22 −1
Original line number Original line Diff line number Diff line
@@ -155,6 +155,7 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) 
	struct msm_drm_private *priv = dev->dev_private;

	struct msm_drm_private *priv = dev->dev_private;

	struct platform_device *pdev = priv->gpu_pdev;

	struct platform_device *pdev = priv->gpu_pdev;

	struct msm_gpu *gpu = NULL;

	struct msm_gpu *gpu = NULL;

	struct adreno_gpu *adreno_gpu;

	int ret;

	int ret;





	if (pdev)

	if (pdev)
@@ -165,7 +166,27 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) 
		return NULL;

		return NULL;

	}

	}





	pm_runtime_get_sync(&pdev->dev);

	adreno_gpu = to_adreno_gpu(gpu);



	/*

	 * The number one reason for HW init to fail is if the firmware isn't

	 * loaded yet. Try that first and don't bother continuing on

	 * otherwise

	 */



	ret = adreno_load_fw(adreno_gpu);

	if (ret)

		return NULL;



	/* Make sure pm runtime is active and reset any previous errors */

	pm_runtime_set_active(&pdev->dev);



	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {

		dev_err(dev->dev, "Couldn't power up the GPU: %d\n", ret);

		return NULL;

	}



	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);

	ret = msm_gpu_hw_init(gpu);

	ret = msm_gpu_hw_init(gpu);

	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ out: 
	return fw;

	return fw;

}

}





static int adreno_load_fw(struct adreno_gpu *adreno_gpu)

int adreno_load_fw(struct adreno_gpu *adreno_gpu)

{

{

	int i;

	int i;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -228,7 +228,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
		struct adreno_gpu *gpu, const struct adreno_gpu_funcs *funcs,

		struct adreno_gpu *gpu, const struct adreno_gpu_funcs *funcs,

		int nr_rings);

		int nr_rings);

void adreno_gpu_cleanup(struct adreno_gpu *gpu);

void adreno_gpu_cleanup(struct adreno_gpu *gpu);



int adreno_load_fw(struct adreno_gpu *adreno_gpu);





void adreno_gpu_state_destroy(struct msm_gpu_state *state);

void adreno_gpu_state_destroy(struct msm_gpu_state *state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE