[PATCH] drm/amdgpu/si/dpm: fix swapped ck enable

[PATCH] drm/amdgpu/si/dpm: fix swapped ck enable

[Alex Deucher]

Fixes a regression in:
drm/amd/amdgpu: Tidy up SI SMC code

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=97801

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/si_smc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/si_smc.c b/drivers/gpu/drm/amd/amdgpu/si_smc.c
index 2cc628c..47bbb40 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_smc.c
@@ -143,9 +143,9 @@ void si_smc_clock(struct amdgpu_device *adev, bool enable)
 	u32 tmp = RREG32_SMC(SMC_SYSCON_CLOCK_CNTL_0);
 
 	if (enable)
-		tmp |= CK_DISABLE;
-	else
 		tmp &= ~CK_DISABLE;
+	else
+		tmp |= CK_DISABLE;
 
 	WREG32_SMC(SMC_SYSCON_CLOCK_CNTL_0, tmp);
 }
-- 
2.5.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu/si/dpm: fix swapped ck enable

[Christian König]

Am 14.09.2016 um 15:47 schrieb Alex Deucher:
> Fixes a regression in:
> drm/amd/amdgpu: Tidy up SI SMC code
>
> bug:
> https://bugs.freedesktop.org/show_bug.cgi?id=97801
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>.

> ---
>   drivers/gpu/drm/amd/amdgpu/si_smc.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/si_smc.c b/drivers/gpu/drm/amd/amdgpu/si_smc.c
> index 2cc628c..47bbb40 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si_smc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si_smc.c
> @@ -143,9 +143,9 @@ void si_smc_clock(struct amdgpu_device *adev, bool enable)
>   	u32 tmp = RREG32_SMC(SMC_SYSCON_CLOCK_CNTL_0);
>   
>   	if (enable)
> -		tmp |= CK_DISABLE;
> -	else
>   		tmp &= ~CK_DISABLE;
> +	else
> +		tmp |= CK_DISABLE;
>   
>   	WREG32_SMC(SMC_SYSCON_CLOCK_CNTL_0, tmp);
>   }


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu/si/dpm: fix swapped ck enable

[StDenis, Tom]

[-- Attachment #1.1: Type: text/plain, Size: 1663 bytes --]

Yup, that looks better.  My apologies.  Guess that's the downside of having assertions for enable and disable in the same driver.


Reviewed-by: Tom St Denis <tom.stdenis-5C7GfCeVMHo@public.gmane.org>


________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Alex Deucher <alexdeucher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Sent: Wednesday, September 14, 2016 09:47
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Deucher, Alexander
Subject: [PATCH] drm/amdgpu/si/dpm: fix swapped ck enable

Fixes a regression in:
drm/amd/amdgpu: Tidy up SI SMC code

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=97801

Signed-off-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/amdgpu/si_smc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/si_smc.c b/drivers/gpu/drm/amd/amdgpu/si_smc.c
index 2cc628c..47bbb40 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_smc.c
@@ -143,9 +143,9 @@ void si_smc_clock(struct amdgpu_device *adev, bool enable)
         u32 tmp = RREG32_SMC(SMC_SYSCON_CLOCK_CNTL_0);

         if (enable)
-               tmp |= CK_DISABLE;
-       else
                 tmp &= ~CK_DISABLE;
+       else
+               tmp |= CK_DISABLE;

         WREG32_SMC(SMC_SYSCON_CLOCK_CNTL_0, tmp);
 }
--
2.5.5

_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[-- Attachment #1.2: Type: text/html, Size: 3206 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx