Commit f3a6b02c authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: Rework SQE version check 



This check is really about which SQE firmware, rather than which GPU.
Rework to match minimum version based on firmware name, so it doesn't
need to be updated when adding additional GPUs using the same fw.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20210807163019.379003-2-robdclark@gmail.com


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 083cc3a4

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

+4 −4
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, 
{

	struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;

	struct msm_gpu *gpu = &adreno_gpu->base;

	const char *sqe_name = adreno_gpu->info->fw[ADRENO_FW_SQE];

	u32 *buf = msm_gem_get_vaddr(obj);

	bool ret = false;
@@ -778,8 +779,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, 
	 *

	 * a660 targets have all the critical security fixes from the start

	 */

	if (adreno_is_a618(adreno_gpu) || adreno_is_a630(adreno_gpu) ||

	    adreno_is_a640_family(adreno_gpu)) {

	if (!strcmp(sqe_name, "a630_sqe.fw")) {

		/*

		 * If the lowest nibble is 0xa that is an indication that this

		 * microcode has been patched. The actual version is in dword
@@ -800,7 +800,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, 
		DRM_DEV_ERROR(&gpu->pdev->dev,

			"a630 SQE ucode is too old. Have version %x need at least %x\n",

			buf[0] & 0xfff, 0x190);

	} else if (adreno_is_a650(adreno_gpu)) {

	} else if (!strcmp(sqe_name, "a650_sqe.fw")) {

		if ((buf[0] & 0xfff) >= 0x095) {

			ret = true;

			goto out;
@@ -809,7 +809,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, 
		DRM_DEV_ERROR(&gpu->pdev->dev,

			"a650 SQE ucode is too old. Have version %x need at least %x\n",

			buf[0] & 0xfff, 0x095);

	} else if (adreno_is_a660_family(adreno_gpu)) {

	} else if (!strcmp(sqe_name, "a660_sqe.fw")) {

		ret = true;

	} else {

		DRM_DEV_ERROR(&gpu->pdev->dev,