linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] drm/amdgpu/gmc7: remove dead code
@ 2016-08-21 18:06 Heinrich Schuchardt
  2016-08-21 18:29 ` Joe Perches
  2016-08-22  7:49 ` Christian König
  0 siblings, 2 replies; 5+ messages in thread
From: Heinrich Schuchardt @ 2016-08-21 18:06 UTC (permalink / raw)
  To: Alex Deucher, Christian König
  Cc: David Airlie, Chunming Zhou, Ken Wang, Tom St Denis, dri-devel,
	linux-kernel, Heinrich Schuchardt

In an if block for (running == 0) running cannot be non-zero.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 0b0f086..1239463 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -203,11 +203,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev)
 	running = REG_GET_FIELD(RREG32(mmMC_SEQ_SUP_CNTL), MC_SEQ_SUP_CNTL, RUN);
 
 	if (running == 0) {
-		if (running) {
-			blackout = RREG32(mmMC_SHARED_BLACKOUT_CNTL);
-			WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout | 1);
-		}
-
 		/* reset the engine and set to writable */
 		WREG32(mmMC_SEQ_SUP_CNTL, 0x00000008);
 		WREG32(mmMC_SEQ_SUP_CNTL, 0x00000010);
@@ -239,9 +234,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev)
 				break;
 			udelay(1);
 		}
-
-		if (running)
-			WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout);
 	}
 
 	return 0;
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] drm/amdgpu/gmc7: remove dead code
  2016-08-21 18:06 [PATCH 1/1] drm/amdgpu/gmc7: remove dead code Heinrich Schuchardt
@ 2016-08-21 18:29 ` Joe Perches
  2016-08-21 18:45   ` Heinrich Schuchardt
  2016-08-22  7:49 ` Christian König
  1 sibling, 1 reply; 5+ messages in thread
From: Joe Perches @ 2016-08-21 18:29 UTC (permalink / raw)
  To: Heinrich Schuchardt, Alex Deucher, Christian König
  Cc: David Airlie, Chunming Zhou, Ken Wang, Tom St Denis, dri-devel,
	linux-kernel

On Sun, 2016-08-21 at 20:06 +0200, Heinrich Schuchardt wrote:
> In an if block for (running == 0) running cannot be non-zero.

This code could also be better unindented by one level
(all of the block would fit 80 columns) by changing:

	if (running == 0) {
		[code...]
	}

	return 0;

to:

	if (running)
		return 0;

	[code...]

	return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
[]
> @@ -203,11 +203,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev)
>  	running = REG_GET_FIELD(RREG32(mmMC_SEQ_SUP_CNTL), MC_SEQ_SUP_CNTL, RUN);
>  
>  	if (running == 0) {
> -		if (running) {
> -			blackout = RREG32(mmMC_SHARED_BLACKOUT_CNTL);
> -			WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout | 1);
> -		}
> -
>  		/* reset the engine and set to writable */
>  		WREG32(mmMC_SEQ_SUP_CNTL, 0x00000008);
>  		WREG32(mmMC_SEQ_SUP_CNTL, 0x00000010);
> @@ -239,9 +234,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev)
>  				break;
>  			udelay(1);
>  		}
> -
> -		if (running)
> -			WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout);
>  	}
>  
>  	return 0;

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] drm/amdgpu/gmc7: remove dead code
  2016-08-21 18:29 ` Joe Perches
@ 2016-08-21 18:45   ` Heinrich Schuchardt
  2016-08-21 18:49     ` Joe Perches
  0 siblings, 1 reply; 5+ messages in thread
From: Heinrich Schuchardt @ 2016-08-21 18:45 UTC (permalink / raw)
  To: Joe Perches, Alex Deucher, Christian König
  Cc: David Airlie, Chunming Zhou, Ken Wang, Tom St Denis, dri-devel,
	linux-kernel

On 08/21/2016 08:29 PM, Joe Perches wrote:
> On Sun, 2016-08-21 at 20:06 +0200, Heinrich Schuchardt wrote:
>> In an if block for (running == 0) running cannot be non-zero.
> 
> This code could also be better unindented by one level
> (all of the block would fit 80 columns) by changing:
> 
> 	if (running == 0) {
> 		[code...]
> 	}
> 
> 	return 0;
> 
> to:
> 
> 	if (running)
> 		return 0;
> 
> 	[code...]
> 
> 	return 0;

Should I revise my patch?
Or should this be an additional patch?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] drm/amdgpu/gmc7: remove dead code
  2016-08-21 18:45   ` Heinrich Schuchardt
@ 2016-08-21 18:49     ` Joe Perches
  0 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2016-08-21 18:49 UTC (permalink / raw)
  To: Heinrich Schuchardt, Alex Deucher, Christian König
  Cc: David Airlie, Chunming Zhou, Ken Wang, Tom St Denis, dri-devel,
	linux-kernel

On Sun, 2016-08-21 at 20:45 +0200, Heinrich Schuchardt wrote:
> On 08/21/2016 08:29 PM, Joe Perches wrote:
> > On Sun, 2016-08-21 at 20:06 +0200, Heinrich Schuchardt wrote:
> > > In an if block for (running == 0) running cannot be non-zero.
> > This code could also be better unindented by one level
> > (all of the block would fit 80 columns) by changing:
> > 
> > 	if (running == 0) {
> > 		[code...]
> > 	}
> > 
> > 	return 0;
> > 
> > to:
> > 
> > 	if (running)
> > 		return 0;
> > 
> > 	[code...]
> > 
> > 	return 0;
> Should I revise my patch?
> Or should this be an additional patch?

If you want to do it, an additional patch is probably best.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] drm/amdgpu/gmc7: remove dead code
  2016-08-21 18:06 [PATCH 1/1] drm/amdgpu/gmc7: remove dead code Heinrich Schuchardt
  2016-08-21 18:29 ` Joe Perches
@ 2016-08-22  7:49 ` Christian König
  1 sibling, 0 replies; 5+ messages in thread
From: Christian König @ 2016-08-22  7:49 UTC (permalink / raw)
  To: Heinrich Schuchardt, Alex Deucher, Christian König
  Cc: Tom St Denis, linux-kernel, dri-devel, Ken Wang

Am 21.08.2016 um 20:06 schrieb Heinrich Schuchardt:
> In an if block for (running == 0) running cannot be non-zero.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

The following patches are all Reviewed-by: Christian König 
<christian.koenig@amd.com>:

[PATCH 1/1] drm/amdgpu/gmc7: remove dead code
[PATCH 1/1] drm/amdgpu/gmc8: remove dead code
[PATCH 1/1] drm/amd/powerplay: avoid NULL pointer dereference
[PATCH 1/1] drm/amd/powerplay: avoid NULL dereference, cz_hwmgr.c
[PATCH 1/1] drm/radeon/cik: remove dead code
[PATCH 1/1] drm/radeon: remove dead code, si_mc_load_microcode

Thanks for the help,
Christian.

PS: Please send such minor cleanups as one set of patches next time, 
cause that makes reviewing them much easier.

> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 --------
>   1 file changed, 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index 0b0f086..1239463 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -203,11 +203,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev)
>   	running = REG_GET_FIELD(RREG32(mmMC_SEQ_SUP_CNTL), MC_SEQ_SUP_CNTL, RUN);
>   
>   	if (running == 0) {
> -		if (running) {
> -			blackout = RREG32(mmMC_SHARED_BLACKOUT_CNTL);
> -			WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout | 1);
> -		}
> -
>   		/* reset the engine and set to writable */
>   		WREG32(mmMC_SEQ_SUP_CNTL, 0x00000008);
>   		WREG32(mmMC_SEQ_SUP_CNTL, 0x00000010);
> @@ -239,9 +234,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev)
>   				break;
>   			udelay(1);
>   		}
> -
> -		if (running)
> -			WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout);
>   	}
>   
>   	return 0;

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-08-22  7:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-21 18:06 [PATCH 1/1] drm/amdgpu/gmc7: remove dead code Heinrich Schuchardt
2016-08-21 18:29 ` Joe Perches
2016-08-21 18:45   ` Heinrich Schuchardt
2016-08-21 18:49     ` Joe Perches
2016-08-22  7:49 ` Christian König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).