diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2018-03-27 16:53:52 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-04-03 13:52:58 -0400 |
commit | 4a8e06f7aad797e92413a3042d09d3b385fa1fda (patch) | |
tree | adedb00f18af98be2a7ec5b1aba5d13db14aec8a /drivers/gpu/drm/amd | |
parent | 326aa996a6681dca76477337b66f5e303aa8953e (diff) |
drm/amdgpu/sdma: fix mask in emit_pipeline_sync
Needs to be a 32 bit mask.
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 | ||||
-rw-r--r-- | 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) | |||
859 | amdgpu_ring_write(ring, addr & 0xfffffffc); | 859 | amdgpu_ring_write(ring, addr & 0xfffffffc); |
860 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); | 860 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); |
861 | amdgpu_ring_write(ring, seq); /* reference */ | 861 | amdgpu_ring_write(ring, seq); /* reference */ |
862 | amdgpu_ring_write(ring, 0xfffffff); /* mask */ | 862 | amdgpu_ring_write(ring, 0xffffffff); /* mask */ |
863 | amdgpu_ring_write(ring, (0xfff << 16) | 4); /* retry count, poll interval */ | 863 | amdgpu_ring_write(ring, (0xfff << 16) | 4); /* retry count, poll interval */ |
864 | } | 864 | } |
865 | 865 | ||
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) | |||
837 | amdgpu_ring_write(ring, addr & 0xfffffffc); | 837 | amdgpu_ring_write(ring, addr & 0xfffffffc); |
838 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); | 838 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); |
839 | amdgpu_ring_write(ring, seq); /* reference */ | 839 | amdgpu_ring_write(ring, seq); /* reference */ |
840 | amdgpu_ring_write(ring, 0xfffffff); /* mask */ | 840 | amdgpu_ring_write(ring, 0xffffffff); /* mask */ |
841 | amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) | | 841 | amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) | |
842 | SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */ | 842 | SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */ |
843 | } | 843 | } |
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) | |||
1105 | amdgpu_ring_write(ring, addr & 0xfffffffc); | 1105 | amdgpu_ring_write(ring, addr & 0xfffffffc); |
1106 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); | 1106 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); |
1107 | amdgpu_ring_write(ring, seq); /* reference */ | 1107 | amdgpu_ring_write(ring, seq); /* reference */ |
1108 | amdgpu_ring_write(ring, 0xfffffff); /* mask */ | 1108 | amdgpu_ring_write(ring, 0xffffffff); /* mask */ |
1109 | amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) | | 1109 | amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) | |
1110 | SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */ | 1110 | SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */ |
1111 | } | 1111 | } |
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) | |||
1121 | amdgpu_ring_write(ring, addr & 0xfffffffc); | 1121 | amdgpu_ring_write(ring, addr & 0xfffffffc); |
1122 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); | 1122 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); |
1123 | amdgpu_ring_write(ring, seq); /* reference */ | 1123 | amdgpu_ring_write(ring, seq); /* reference */ |
1124 | amdgpu_ring_write(ring, 0xfffffff); /* mask */ | 1124 | amdgpu_ring_write(ring, 0xffffffff); /* mask */ |
1125 | amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) | | 1125 | amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) | |
1126 | SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */ | 1126 | SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */ |
1127 | } | 1127 | } |