From: Alex Deucher Date: Thu, 15 Sep 2016 19:42:09 +0000 (-0400) Subject: drm/amdgpu/gfx6: drop gds_switch callback X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=95e588a01424cb4d6f38bc02f84c8dfe05e0e55f;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu/gfx6: drop gds_switch callback GDS works differently on GFX6, plus the callback was empty. Reviewed-by: Edward O'Callaghan Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c index d33d3213cb6f..e7293f64d953 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c @@ -2678,14 +2678,6 @@ static uint64_t gfx_v6_0_get_gpu_clock_counter(struct amdgpu_device *adev) return clock; } -static void gfx_v6_0_ring_emit_gds_switch(struct amdgpu_ring *ring, - uint32_t vmid, - uint32_t gds_base, uint32_t gds_size, - uint32_t gws_base, uint32_t gws_size, - uint32_t oa_base, uint32_t oa_size) -{ -} - static void gfx_v6_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) { amdgpu_ring_write(ring, PACKET3(PACKET3_CONTEXT_CONTROL, 1)); @@ -3115,7 +3107,6 @@ static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = { .emit_fence = gfx_v6_0_ring_emit_fence, .emit_pipeline_sync = gfx_v6_0_ring_emit_pipeline_sync, .emit_vm_flush = gfx_v6_0_ring_emit_vm_flush, - .emit_gds_switch = gfx_v6_0_ring_emit_gds_switch, .emit_hdp_flush = gfx_v6_0_ring_emit_hdp_flush, .emit_hdp_invalidate = gfx_v6_0_ring_emit_hdp_invalidate, .test_ring = gfx_v6_0_ring_test_ring, @@ -3133,7 +3124,6 @@ static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_compute = { .emit_fence = gfx_v6_0_ring_emit_fence, .emit_pipeline_sync = gfx_v6_0_ring_emit_pipeline_sync, .emit_vm_flush = gfx_v6_0_ring_emit_vm_flush, - .emit_gds_switch = gfx_v6_0_ring_emit_gds_switch, .emit_hdp_flush = gfx_v6_0_ring_emit_hdp_flush, .emit_hdp_invalidate = gfx_v6_0_ring_emit_hdp_invalidate, .test_ring = gfx_v6_0_ring_test_ring,