All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu/sdma: fix mask in emit_pipeline_sync
@ 2018-03-27 21:33 Alex Deucher
  2018-03-28  3:24   ` Huang Rui
  0 siblings, 1 reply; 5+ messages in thread
From: Alex Deucher @ 2018-03-27 21:33 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher, stable

Needs to be a 32 bit mask.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index f48ea0dad875..a7576255cc30 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -859,7 +859,7 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
 	amdgpu_ring_write(ring, addr & 0xfffffffc);
 	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
 	amdgpu_ring_write(ring, seq); /* reference */
-	amdgpu_ring_write(ring, 0xfffffff); /* mask */
+	amdgpu_ring_write(ring, 0xffffffff); /* mask */
 	amdgpu_ring_write(ring, (0xfff << 16) | 4); /* retry count, poll interval */
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 6452101c7aab..c7190c39c4f5 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -837,7 +837,7 @@ static void sdma_v2_4_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
 	amdgpu_ring_write(ring, addr & 0xfffffffc);
 	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
 	amdgpu_ring_write(ring, seq); /* reference */
-	amdgpu_ring_write(ring, 0xfffffff); /* mask */
+	amdgpu_ring_write(ring, 0xffffffff); /* mask */
 	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
 			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index ecaef084dab1..be20a387d961 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -1105,7 +1105,7 @@ static void sdma_v3_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
 	amdgpu_ring_write(ring, addr & 0xfffffffc);
 	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
 	amdgpu_ring_write(ring, seq); /* reference */
-	amdgpu_ring_write(ring, 0xfffffff); /* mask */
+	amdgpu_ring_write(ring, 0xffffffff); /* mask */
 	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
 			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 2a8184082cd1..399f876f9cad 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1121,7 +1121,7 @@ static void sdma_v4_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
 	amdgpu_ring_write(ring, addr & 0xfffffffc);
 	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
 	amdgpu_ring_write(ring, seq); /* reference */
-	amdgpu_ring_write(ring, 0xfffffff); /* mask */
+	amdgpu_ring_write(ring, 0xffffffff); /* mask */
 	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
 			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
 }
-- 
2.13.6

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu/sdma: fix mask in emit_pipeline_sync
@ 2018-03-28  3:24   ` Huang Rui
  0 siblings, 0 replies; 5+ messages in thread
From: Huang Rui @ 2018-03-28  3:24 UTC (permalink / raw)
  To: Alex Deucher; +Cc: amd-gfx, Alex Deucher, stable

On Tue, Mar 27, 2018 at 04:33:55PM -0500, Alex Deucher wrote:
> Needs to be a 32 bit mask.
> 
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org

Nice catch!
Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 2 +-
>  drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
>  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
>  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> index f48ea0dad875..a7576255cc30 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> @@ -859,7 +859,7 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, (0xfff << 16) | 4); /* retry count, poll interval */
>  }
>  
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index 6452101c7aab..c7190c39c4f5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -837,7 +837,7 @@ static void sdma_v2_4_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>  			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>  }
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index ecaef084dab1..be20a387d961 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -1105,7 +1105,7 @@ static void sdma_v3_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>  			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>  }
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index 2a8184082cd1..399f876f9cad 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -1121,7 +1121,7 @@ static void sdma_v4_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>  			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>  }
> -- 
> 2.13.6
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu/sdma: fix mask in emit_pipeline_sync
@ 2018-03-28  3:24   ` Huang Rui
  0 siblings, 0 replies; 5+ messages in thread
From: Huang Rui @ 2018-03-28  3:24 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Alex Deucher, stable-u79uwXL29TY76Z2rM5mHXA,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

On Tue, Mar 27, 2018 at 04:33:55PM -0500, Alex Deucher wrote:
> Needs to be a 32 bit mask.
> 
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org

Nice catch!
Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 2 +-
>  drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
>  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
>  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> index f48ea0dad875..a7576255cc30 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> @@ -859,7 +859,7 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, (0xfff << 16) | 4); /* retry count, poll interval */
>  }
>  
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index 6452101c7aab..c7190c39c4f5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -837,7 +837,7 @@ static void sdma_v2_4_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>  			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>  }
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index ecaef084dab1..be20a387d961 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -1105,7 +1105,7 @@ static void sdma_v3_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>  			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>  }
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index 2a8184082cd1..399f876f9cad 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -1121,7 +1121,7 @@ static void sdma_v4_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>  	amdgpu_ring_write(ring, addr & 0xfffffffc);
>  	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>  	amdgpu_ring_write(ring, seq); /* reference */
> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>  	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>  			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>  }
> -- 
> 2.13.6
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu/sdma: fix mask in emit_pipeline_sync
  2018-03-28  3:24   ` Huang Rui
@ 2018-03-28  7:49     ` Christian König
  -1 siblings, 0 replies; 5+ messages in thread
From: Christian König @ 2018-03-28  7:49 UTC (permalink / raw)
  To: Huang Rui, Alex Deucher; +Cc: Alex Deucher, stable, amd-gfx

Am 28.03.2018 um 05:24 schrieb Huang Rui:
> On Tue, Mar 27, 2018 at 04:33:55PM -0500, Alex Deucher wrote:
>> Needs to be a 32 bit mask.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>> Cc: stable@vger.kernel.org
> Nice catch!
> Acked-by: Huang Rui <ray.huang@amd.com>

Indeed good catch!

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

>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 2 +-
>>   drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
>>   drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
>>   drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
>>   4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>> index f48ea0dad875..a7576255cc30 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>> @@ -859,7 +859,7 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, (0xfff << 16) | 4); /* retry count, poll interval */
>>   }
>>   
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> index 6452101c7aab..c7190c39c4f5 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> @@ -837,7 +837,7 @@ static void sdma_v2_4_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>>   			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>>   }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> index ecaef084dab1..be20a387d961 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> @@ -1105,7 +1105,7 @@ static void sdma_v3_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>>   			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>>   }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> index 2a8184082cd1..399f876f9cad 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> @@ -1121,7 +1121,7 @@ static void sdma_v4_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>>   			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>>   }
>> -- 
>> 2.13.6
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu/sdma: fix mask in emit_pipeline_sync
@ 2018-03-28  7:49     ` Christian König
  0 siblings, 0 replies; 5+ messages in thread
From: Christian König @ 2018-03-28  7:49 UTC (permalink / raw)
  To: Huang Rui, Alex Deucher
  Cc: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
	stable-u79uwXL29TY76Z2rM5mHXA

Am 28.03.2018 um 05:24 schrieb Huang Rui:
> On Tue, Mar 27, 2018 at 04:33:55PM -0500, Alex Deucher wrote:
>> Needs to be a 32 bit mask.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>> Cc: stable@vger.kernel.org
> Nice catch!
> Acked-by: Huang Rui <ray.huang@amd.com>

Indeed good catch!

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

>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 2 +-
>>   drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
>>   drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
>>   drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
>>   4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>> index f48ea0dad875..a7576255cc30 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>> @@ -859,7 +859,7 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, (0xfff << 16) | 4); /* retry count, poll interval */
>>   }
>>   
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> index 6452101c7aab..c7190c39c4f5 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> @@ -837,7 +837,7 @@ static void sdma_v2_4_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>>   			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>>   }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> index ecaef084dab1..be20a387d961 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> @@ -1105,7 +1105,7 @@ static void sdma_v3_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>>   			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>>   }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> index 2a8184082cd1..399f876f9cad 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> @@ -1121,7 +1121,7 @@ static void sdma_v4_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
>>   	amdgpu_ring_write(ring, addr & 0xfffffffc);
>>   	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
>>   	amdgpu_ring_write(ring, seq); /* reference */
>> -	amdgpu_ring_write(ring, 0xfffffff); /* mask */
>> +	amdgpu_ring_write(ring, 0xffffffff); /* mask */
>>   	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
>>   			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
>>   }
>> -- 
>> 2.13.6
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-28  7:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-27 21:33 [PATCH] drm/amdgpu/sdma: fix mask in emit_pipeline_sync Alex Deucher
2018-03-28  3:24 ` Huang Rui
2018-03-28  3:24   ` Huang Rui
2018-03-28  7:49   ` Christian König
2018-03-28  7:49     ` Christian König

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.