Commit 4684f5ce authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.2-2023-02-08' of... 

Merge tag 'amd-drm-fixes-6.2-2023-02-08' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.2-2023-02-08:

amdgpu:
- Flickering fixes for DCN 2.1, 3.1.2/3
- Re-enable S/G display on DCN 3.1.4
- Properly fix S/G display with AGP aperture enabled
- Fix cursor offset with 180 rotation
- SMU13 fixes
- Use TGID for GPUVM traces
- Fix oops on in fence error path
- Don't run IB tests on hw rings when sw rings are in use

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230209045321.565132-1-alexander.deucher@amd.com
parents 04119ab1 c6ac406c

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

+7 −1
Original line number Diff line number Diff line
@@ -618,7 +618,13 @@ void amdgpu_fence_driver_sw_fini(struct amdgpu_device *adev) 
		if (!ring || !ring->fence_drv.initialized)

			continue;



		if (!ring->no_scheduler)

		/*

		 * Notice we check for sched.ops since there's some

		 * override on the meaning of sched.ready by amdgpu.

		 * The natural check would be sched.ready, which is

		 * set as drm_sched_init() finishes...

		 */

		if (ring->sched.ops)

			drm_sched_fini(&ring->sched);



		for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j)

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ struct amdgpu_ring { 
#define amdgpu_ring_parse_cs(r, p, job, ib) ((r)->funcs->parse_cs((p), (job), (ib)))

#define amdgpu_ring_patch_cs_in_place(r, p, job, ib) ((r)->funcs->patch_cs_in_place((p), (job), (ib)))

#define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r))

#define amdgpu_ring_test_ib(r, t) (r)->funcs->test_ib((r), (t))

#define amdgpu_ring_test_ib(r, t) ((r)->funcs->test_ib ? (r)->funcs->test_ib((r), (t)) : 0)

#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))

#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))

#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params *params, 
			trace_amdgpu_vm_update_ptes(params, frag_start, upd_end,

						    min(nptes, 32u), dst, incr,

						    upd_flags,

						    vm->task_info.pid,

						    vm->task_info.tgid,

						    vm->immediate.fence_context);

			amdgpu_vm_pte_update_flags(params, to_amdgpu_bo_vm(pt),

						   cursor.level, pe_start, dst,

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+0 −1
Original line number Diff line number Diff line
@@ -6877,7 +6877,6 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { 
	.emit_gds_switch = gfx_v9_0_ring_emit_gds_switch,

	.emit_hdp_flush = gfx_v9_0_ring_emit_hdp_flush,

	.test_ring = gfx_v9_0_ring_test_ring,

	.test_ib = gfx_v9_0_ring_test_ib,

	.insert_nop = amdgpu_ring_insert_nop,

	.pad_ib = amdgpu_ring_generic_pad_ib,

	.emit_switch_buffer = gfx_v9_ring_emit_sb,

drivers/gpu/drm/amd/amdgpu/soc21.c

+3 −1
Original line number Diff line number Diff line
@@ -641,7 +641,9 @@ static int soc21_common_early_init(void *handle) 
			AMD_CG_SUPPORT_GFX_CGLS |

			AMD_CG_SUPPORT_REPEATER_FGCG |

			AMD_CG_SUPPORT_GFX_MGCG |

			AMD_CG_SUPPORT_HDP_SD;

			AMD_CG_SUPPORT_HDP_SD |

			AMD_CG_SUPPORT_ATHUB_MGCG |

			AMD_CG_SUPPORT_ATHUB_LS;

		adev->pg_flags = AMD_PG_SUPPORT_VCN |

			AMD_PG_SUPPORT_VCN_DPG |

			AMD_PG_SUPPORT_JPEG;