Skip to contentSkip to conversation

drm/amdgpu: fix bitwise vs logical negate

PATCH In review Dan Carpenter 2 participants 2 messages Jan 25, 2021

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

PATCH 1/1 drm/amdgpu: fix bitwise vs logical negate

There was a mixup between logical and bitwise negate so it just sets "data1" and "data2" to zero.

Fixes 3c9a7b7d6e75 ("drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3")
---
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -2
index 1961745e89c7..ab9be5ad5a5f 100644
@@ -531,12 +531,12 @@ mmhub_v2_3_update_medium_grain_light_sleep(struct amdgpu_device *adev,
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
 		data &= ~MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;
-		data1 &= !(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+		data1 &= ~(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
 			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
 			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
 			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
 			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
-		data2 &= !(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+		data2 &= ~(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
 			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
 			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
 			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
Signature · 1 line
2.29.2
#1 lore raw
Quoted 6 lines · Dan Carpenter

There was a mixup between logical and bitwise negate so it just sets "data1" and "data2" to zero.

Fixes 3c9a7b7d6e75 ("drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3")

Someone else sent the same fix last week. Applied that one.

Thanks!

Alex

Quoted 30 lines
---
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -3
index 1961745e89c7..ab9be5ad5a5f 100644
@@ -531,12 +531,12 @@ mmhub_v2_3_update_medium_grain_light_sleep(struct amdgpu_device *adev,
 
        if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
                data &= ~MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;
-               data1 &= !(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+               data1 &= ~(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
                        DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
                        DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
                        DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
                        DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
-               data2 &= !(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+               data2 &= ~(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
                        DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
                        DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
                        DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
--

2.29.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx