Commit b4b241ad authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.1-2022-12-07' of... 

Merge tag 'amd-drm-fixes-6.1-2022-12-07' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.1-2022-12-07:

amdgpu:
- S0ix fix
- DCN 3.2 array out of bounds fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221207222751.9558-1-alexander.deucher@amd.com
parents 76dcd734 aeffc8fb

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

+15 −9
Original line number Diff line number Diff line
@@ -907,13 +907,13 @@ static void sdma_v4_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 se 




/**

 * sdma_v4_0_gfx_stop - stop the gfx async dma engines

 * sdma_v4_0_gfx_enable - enable the gfx async dma engines

 *

 * @adev: amdgpu_device pointer

 *

 * Stop the gfx async dma ring buffers (VEGA10).

 * @enable: enable SDMA RB/IB

 * control the gfx async dma ring buffers (VEGA10).

 */

static void sdma_v4_0_gfx_stop(struct amdgpu_device *adev)

static void sdma_v4_0_gfx_enable(struct amdgpu_device *adev, bool enable)

{

	u32 rb_cntl, ib_cntl;

	int i;
@@ -922,10 +922,10 @@ static void sdma_v4_0_gfx_stop(struct amdgpu_device *adev) 


	for (i = 0; i < adev->sdma.num_instances; i++) {

		rb_cntl = RREG32_SDMA(i, mmSDMA0_GFX_RB_CNTL);

		rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, 0);

		rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, enable ? 1 : 0);

		WREG32_SDMA(i, mmSDMA0_GFX_RB_CNTL, rb_cntl);

		ib_cntl = RREG32_SDMA(i, mmSDMA0_GFX_IB_CNTL);

		ib_cntl = REG_SET_FIELD(ib_cntl, SDMA0_GFX_IB_CNTL, IB_ENABLE, 0);

		ib_cntl = REG_SET_FIELD(ib_cntl, SDMA0_GFX_IB_CNTL, IB_ENABLE, enable ? 1 : 0);

		WREG32_SDMA(i, mmSDMA0_GFX_IB_CNTL, ib_cntl);

	}

}
@@ -1044,7 +1044,7 @@ static void sdma_v4_0_enable(struct amdgpu_device *adev, bool enable) 
	int i;



	if (!enable) {

		sdma_v4_0_gfx_stop(adev);

		sdma_v4_0_gfx_enable(adev, enable);

		sdma_v4_0_rlc_stop(adev);

		if (adev->sdma.has_page_queue)

			sdma_v4_0_page_stop(adev);
@@ -1960,8 +1960,10 @@ static int sdma_v4_0_suspend(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* SMU saves SDMA state for us */

	if (adev->in_s0ix)

	if (adev->in_s0ix) {

		sdma_v4_0_gfx_enable(adev, false);

		return 0;

	}



	return sdma_v4_0_hw_fini(adev);

}
@@ -1971,8 +1973,12 @@ static int sdma_v4_0_resume(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* SMU restores SDMA state for us */

	if (adev->in_s0ix)

	if (adev->in_s0ix) {

		sdma_v4_0_enable(adev, true);

		sdma_v4_0_gfx_enable(adev, true);

		amdgpu_ttm_set_buffer_funcs_status(adev, true);

		return 0;

	}



	return sdma_v4_0_hw_init(adev);

}

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ struct vba_vars_st { 
	double UrgBurstFactorLumaPre[DC__NUM_DPP__MAX];

	double UrgBurstFactorChromaPre[DC__NUM_DPP__MAX];

	bool NotUrgentLatencyHidingPre[DC__NUM_DPP__MAX];

	bool LinkCapacitySupport[DC__NUM_DPP__MAX];

	bool LinkCapacitySupport[DC__VOLTAGE_STATES];

	bool VREADY_AT_OR_AFTER_VSYNC[DC__NUM_DPP__MAX];

	unsigned int MIN_DST_Y_NEXT_START[DC__NUM_DPP__MAX];

	unsigned int VFrontPorch[DC__NUM_DPP__MAX];