Re: [PATCH] drm/amdgpu/sdma: fix mask in emit_pipeline_sync

[Christian König <ckoenig.leichtzumerken@xxxxxxxxx>]

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@xxxxxxx>
> > Cc: stable@xxxxxxxxxxxxxxx
> Nice catch!
> Acked-by: Huang Rui <ray.huang@xxxxxxx>

Indeed good catch!

Patch is Reviewed-by: Christian König <christian.koenig@xxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxx
> > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx