Skip to contentSkip to conversation

drm/msm/a690: Switch to a660_gmu.bin

PATCH In review Rob Clark 2 participants 6 messages Aug 11, 2023

Subsystems (4)
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 drm/msm/a690: Switch to a660_gmu.bin

From: Rob Clark <[email protected]>

There isn't actually a a690_gmu.bin. But it appears that the normal a660_gmu.bin works fine. Normally all the devices within a sub- generation (or "family") will use the same fw, and a690 is in the a660 family.

---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -1
index 1ed270dae148..756a9cfe1cbf 100644
@@ -478,7 +478,7 @@ static const struct adreno_info gpulist[] = {
 		.family = ADRENO_6XX_GEN4,
 		.fw = {
 			[ADRENO_FW_SQE] = "a660_sqe.fw",
-			[ADRENO_FW_GMU] = "a690_gmu.bin",
+			[ADRENO_FW_GMU] = "a660_gmu.bin",
 		},
 		.gmem = SZ_4M,
 		.inactive_period = DRM_MSM_INACTIVE_PERIOD,
Signature · 1 line
2.41.0
author
#1 lore raw
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

There isn't actually a a690_gmu.bin. But it appears that the normal a660_gmu.bin works fine. Normally all the devices within a sub- generation (or "family") will use the same fw, and a690 is in the a660 family.

possibly this could be considered as:

Fixes 5e7665b5e484 ("drm/msm/adreno: Add Adreno A690 support")
Quoted 21 lines
---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -2
index 1ed270dae148..756a9cfe1cbf 100644
@@ -478,7 +478,7 @@ static const struct adreno_info gpulist[] = {
                .family = ADRENO_6XX_GEN4,
                .fw = {
                        [ADRENO_FW_SQE] = "a660_sqe.fw",
-                       [ADRENO_FW_GMU] = "a690_gmu.bin",
+                       [ADRENO_FW_GMU] = "a660_gmu.bin",
                },
                .gmem = SZ_4M,
                .inactive_period = DRM_MSM_INACTIVE_PERIOD,
--

2.41.0

Reviewed-by
#2 lore raw
Quoted 10 lines · Rob Clark
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

There isn't actually a a690_gmu.bin. But it appears that the normal a660_gmu.bin works fine. Normally all the devices within a sub- generation (or "family") will use the same fw, and a690 is in the a660 family.

Quoted 3 lines

possibly this could be considered as:

Fixes 5e7665b5e484 ("drm/msm/adreno: Add Adreno A690 support")

For a lack of a better response, "meh"

Other than that:

Perhaps we could take this further and do something like

if (failed to load gmu fw)
try loading "gmu.bin"

Konrad

Quoted 22 lines
Quoted 22 lines
---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -2
index 1ed270dae148..756a9cfe1cbf 100644
@@ -478,7 +478,7 @@ static const struct adreno_info gpulist[] = {
                .family = ADRENO_6XX_GEN4,
                .fw = {
                        [ADRENO_FW_SQE] = "a660_sqe.fw",
-                       [ADRENO_FW_GMU] = "a690_gmu.bin",
+                       [ADRENO_FW_GMU] = "a660_gmu.bin",
                },
                .gmem = SZ_4M,
                .inactive_period = DRM_MSM_INACTIVE_PERIOD,
--

2.41.0

author
#3 lore raw
Quoted 12 lines · Konrad Dybcio
Quoted 10 lines · Rob Clark
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

There isn't actually a a690_gmu.bin. But it appears that the normal a660_gmu.bin works fine. Normally all the devices within a sub- generation (or "family") will use the same fw, and a690 is in the a660 family.

Quoted 4 lines
Quoted 3 lines

possibly this could be considered as:

Fixes 5e7665b5e484 ("drm/msm/adreno: Add Adreno A690 support")

For a lack of a better response, "meh"

It would help route the change back to 6.4.y so we can stop explaining to folks that they should create a symlink ;-)

Quoted 8 lines

Other than that:

Perhaps we could take this further and do something like

if (failed to load gmu fw)
try loading "gmu.bin"

that (loading random fw) sounds like a bad idea.. plus gmu.bin doesn't exist

BR,
-R

Quoted 24 lines

Konrad

Quoted 22 lines
Quoted 22 lines
---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -2
index 1ed270dae148..756a9cfe1cbf 100644
@@ -478,7 +478,7 @@ static const struct adreno_info gpulist[] = {
                .family = ADRENO_6XX_GEN4,
                .fw = {
                        [ADRENO_FW_SQE] = "a660_sqe.fw",
-                       [ADRENO_FW_GMU] = "a690_gmu.bin",
+                       [ADRENO_FW_GMU] = "a660_gmu.bin",
                },
                .gmem = SZ_4M,
                .inactive_period = DRM_MSM_INACTIVE_PERIOD,
--

2.41.0

#4 lore raw
Quoted 13 lines · Rob Clark
Quoted 12 lines · Konrad Dybcio
Quoted 10 lines · Rob Clark
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

There isn't actually a a690_gmu.bin. But it appears that the normal a660_gmu.bin works fine. Normally all the devices within a sub- generation (or "family") will use the same fw, and a690 is in the a660 family.

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines

possibly this could be considered as:

Fixes 5e7665b5e484 ("drm/msm/adreno: Add Adreno A690 support")

For a lack of a better response, "meh"

It would help route the change back to 6.4.y so we can stop explaining to folks that they should create a symlink ;-)

Ok fair!

Quoted 11 lines
Quoted 9 lines

Other than that:

Perhaps we could take this further and do something like

if (failed to load gmu fw)
try loading "gmu.bin"

that (loading random fw) sounds like a bad idea.. plus gmu.bin doesn't exist

I guess we still should hear from Qualcomm on this one, but I do believe that "aXYZ_gmu.bin" is really "gmu firmware, tagged at aXYZ release". They're even versioned and adreno-gpulist.h downstream contains the minimum version for each SKU.

Konrad

author
#5 lore raw
Quoted 31 lines · Konrad Dybcio
Quoted 13 lines · Rob Clark
Quoted 12 lines · Konrad Dybcio
Quoted 10 lines · Rob Clark
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

There isn't actually a a690_gmu.bin. But it appears that the normal a660_gmu.bin works fine. Normally all the devices within a sub- generation (or "family") will use the same fw, and a690 is in the a660 family.

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines

possibly this could be considered as:

Fixes 5e7665b5e484 ("drm/msm/adreno: Add Adreno A690 support")

For a lack of a better response, "meh"

It would help route the change back to 6.4.y so we can stop explaining to folks that they should create a symlink ;-)

Ok fair!

Quoted 7 lines
Quoted 7 lines

Other than that:

Perhaps we could take this further and do something like

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

if (failed to load gmu fw)
try loading "gmu.bin"

that (loading random fw) sounds like a bad idea.. plus gmu.bin doesn't exist

I guess we still should hear from Qualcomm on this one, but I do believe that "aXYZ_gmu.bin" is really "gmu firmware, tagged at aXYZ release". They're even versioned and adreno-gpulist.h downstream contains the minimum version for each SKU.

We definitely can't use a660_gmu.bin as is on a630 family devices, for example. Maybe that is just down to sw <-> fw interface changes but it means linux-firmware would still need to keep separate a630_gmu.bin and a660_gmu.bin, otherwise new l-f with old kernel would explode.

That doesn't mean they are unrelated.. I think they probably just branch the fw for each family.

BR,
-R

Quoted 1 line

Konrad