aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-09-15 15:40:06 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-09-16 15:52:53 -0400
commit0f444c24dd00ba562483d5825f9757e0f933d813 (patch)
treec8f41d422f25d597d11d3cbf036d79115325dd06 /drivers/gpu
parent668f52c3039049cd293851599581c5eca745ec4e (diff)
drm/amdgpu/gfx6: add ring_emit_cntxcntl
Missing for gfx6. Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index 3cf4e9eeea1c..d33d3213cb6f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -2686,6 +2686,13 @@ static void gfx_v6_0_ring_emit_gds_switch(struct amdgpu_ring *ring,
2686{ 2686{
2687} 2687}
2688 2688
2689static void gfx_v6_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags)
2690{
2691 amdgpu_ring_write(ring, PACKET3(PACKET3_CONTEXT_CONTROL, 1));
2692 amdgpu_ring_write(ring, 0x80000000);
2693 amdgpu_ring_write(ring, 0);
2694}
2695
2689static const struct amdgpu_gfx_funcs gfx_v6_0_gfx_funcs = { 2696static const struct amdgpu_gfx_funcs gfx_v6_0_gfx_funcs = {
2690 .get_gpu_clock_counter = &gfx_v6_0_get_gpu_clock_counter, 2697 .get_gpu_clock_counter = &gfx_v6_0_get_gpu_clock_counter,
2691 .select_se_sh = &gfx_v6_0_select_se_sh, 2698 .select_se_sh = &gfx_v6_0_select_se_sh,
@@ -3114,6 +3121,7 @@ static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = {
3114 .test_ring = gfx_v6_0_ring_test_ring, 3121 .test_ring = gfx_v6_0_ring_test_ring,
3115 .test_ib = gfx_v6_0_ring_test_ib, 3122 .test_ib = gfx_v6_0_ring_test_ib,
3116 .insert_nop = amdgpu_ring_insert_nop, 3123 .insert_nop = amdgpu_ring_insert_nop,
3124 .emit_cntxcntl = gfx_v6_ring_emit_cntxcntl,
3117}; 3125};
3118 3126
3119static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_compute = { 3127static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_compute = {