Skip to contentSkip to conversation

drm/msm/adreno: fix cast in adreno_get_param()

PATCH In review Dan Carpenter 3 participants 3 messages Mar 7, 2022 – Mar 8, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm/adreno: fix cast in adreno_get_param()

These casts need to happen before the shift. The only time it would matter would be if "rev.core" is >= 128. In that case the sign bit would be extended and we do not want that.

Fixes afab9d91d872 ("drm/msm/adreno: Expose speedbin to userspace")
---
 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +4 -4
index 15c8997b7251..f7b3f6d266a9 100644
@@ -244,10 +244,10 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx,
 		*value = !adreno_is_a650_family(adreno_gpu) ? 0x100000 : 0;
 		return 0;
 	case MSM_PARAM_CHIP_ID:
-		*value = (uint64_t) adreno_gpu->rev.patchid |
-				(uint64_t) (adreno_gpu->rev.minor << 8) |
-				(uint64_t) (adreno_gpu->rev.major << 16) |
-				(uint64_t) (adreno_gpu->rev.core << 24);
+		*value =  (uint64_t)adreno_gpu->rev.patchid |
+			 ((uint64_t)adreno_gpu->rev.minor << 8) |
+			 ((uint64_t)adreno_gpu->rev.major << 16) |
+			 ((uint64_t)adreno_gpu->rev.core  << 24);
 		if (!adreno_gpu->info->revn)
 			*value |= ((uint64_t) adreno_gpu->speedbin) << 32;
 		return 0;
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines · Dan Carpenter

These casts need to happen before the shift. The only time it would matter would be if "rev.core" is >= 128. In that case the sign bit would be extended and we do not want that.

Fixes afab9d91d872 ("drm/msm/adreno: Expose speedbin to userspace")
---
  drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +0 -1
index 15c8997b7251..f7b3f6d266a9 100644
@@ -244,10 +244,10 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx,
  		*value = !adreno_is_a650_family(adreno_gpu) ? 0x100000 : 0;
  		return 0;
  	case MSM_PARAM_CHIP_ID:
-		*value = (uint64_t) adreno_gpu->rev.patchid |

drivers/gpu/drm/msm/adreno/adreno_gpu.c int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx, · line 253

Quoted 10 lines
drivers/gpu/drm/msm/adreno/adreno_gpu.c +4 -3
-				(uint64_t) (adreno_gpu->rev.minor << 8) |
-				(uint64_t) (adreno_gpu->rev.major << 16) |
-				(uint64_t) (adreno_gpu->rev.core << 24);
+		*value =  (uint64_t)adreno_gpu->rev.patchid |
+			 ((uint64_t)adreno_gpu->rev.minor << 8) |
+			 ((uint64_t)adreno_gpu->rev.major << 16) |
+			 ((uint64_t)adreno_gpu->rev.core  << 24);
  		if (!adreno_gpu->info->revn)
  			*value |= ((uint64_t) adreno_gpu->speedbin) << 32;
  		return 0;

-Akhil