Commit 6379bd44 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.17-2022-02-16' of... 

Merge tag 'amd-drm-fixes-5.17-2022-02-16' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.17-2022-02-16:

amdgpu:
- Stable pstate clock fixes for Dimgrey Cavefish and Beige Goby
- S0ix SDMA fix
- Yellow Carp GPU reset fix

radeon:
- Backlight fix for iMac 12,1

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220217035242.8084-1-alexander.deucher@amd.com
parents fb9c9671 364438fd

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

+8 −0
Original line number Diff line number Diff line
@@ -2057,6 +2057,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)

		return 0;



	return sdma_v4_0_hw_fini(adev);

}
@@ -2064,6 +2068,10 @@ 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)

		return 0;



	return sdma_v4_0_hw_init(adev);

}

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

+21 −5
Original line number Diff line number Diff line
@@ -1238,21 +1238,37 @@ static int sienna_cichlid_populate_umd_state_clk(struct smu_context *smu) 
				&dpm_context->dpm_tables.soc_table;

	struct smu_umd_pstate_table *pstate_table =

				&smu->pstate_table;

	struct amdgpu_device *adev = smu->adev;



	pstate_table->gfxclk_pstate.min = gfx_table->min;

	pstate_table->gfxclk_pstate.peak = gfx_table->max;

	if (gfx_table->max >= SIENNA_CICHLID_UMD_PSTATE_PROFILING_GFXCLK)

		pstate_table->gfxclk_pstate.standard = SIENNA_CICHLID_UMD_PSTATE_PROFILING_GFXCLK;



	pstate_table->uclk_pstate.min = mem_table->min;

	pstate_table->uclk_pstate.peak = mem_table->max;

	if (mem_table->max >= SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK)

		pstate_table->uclk_pstate.standard = SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK;



	pstate_table->socclk_pstate.min = soc_table->min;

	pstate_table->socclk_pstate.peak = soc_table->max;

	if (soc_table->max >= SIENNA_CICHLID_UMD_PSTATE_PROFILING_SOCCLK)



	switch (adev->asic_type) {

	case CHIP_SIENNA_CICHLID:

	case CHIP_NAVY_FLOUNDER:

		pstate_table->gfxclk_pstate.standard = SIENNA_CICHLID_UMD_PSTATE_PROFILING_GFXCLK;

		pstate_table->uclk_pstate.standard = SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK;

		pstate_table->socclk_pstate.standard = SIENNA_CICHLID_UMD_PSTATE_PROFILING_SOCCLK;

		break;

	case CHIP_DIMGREY_CAVEFISH:

		pstate_table->gfxclk_pstate.standard = DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_GFXCLK;

		pstate_table->uclk_pstate.standard = DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_MEMCLK;

		pstate_table->socclk_pstate.standard = DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_SOCCLK;

		break;

	case CHIP_BEIGE_GOBY:

		pstate_table->gfxclk_pstate.standard = BEIGE_GOBY_UMD_PSTATE_PROFILING_GFXCLK;

		pstate_table->uclk_pstate.standard = BEIGE_GOBY_UMD_PSTATE_PROFILING_MEMCLK;

		pstate_table->socclk_pstate.standard = BEIGE_GOBY_UMD_PSTATE_PROFILING_SOCCLK;

		break;

	default:

		break;

	}



	return 0;

}

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.h

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ typedef enum { 
#define SIENNA_CICHLID_UMD_PSTATE_PROFILING_SOCCLK    960

#define SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK    1000



#define DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_GFXCLK 1950

#define DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_SOCCLK 960

#define DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_MEMCLK 676



#define BEIGE_GOBY_UMD_PSTATE_PROFILING_GFXCLK 2200

#define BEIGE_GOBY_UMD_PSTATE_PROFILING_SOCCLK 960

#define BEIGE_GOBY_UMD_PSTATE_PROFILING_MEMCLK 1000



extern void sienna_cichlid_set_ppt_funcs(struct smu_context *smu);



#endif

drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c

+2 −7
Original line number Diff line number Diff line
@@ -282,14 +282,9 @@ static int yellow_carp_post_smu_init(struct smu_context *smu) 


static int yellow_carp_mode_reset(struct smu_context *smu, int type)

{

	int ret = 0, index = 0;



	index = smu_cmn_to_asic_specific_index(smu, CMN2ASIC_MAPPING_MSG,

				SMU_MSG_GfxDeviceDriverReset);

	if (index < 0)

		return index == -EACCES ? 0 : index;

	int ret = 0;



	ret = smu_cmn_send_smc_msg_with_param(smu, (uint16_t)index, type, NULL);

	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_GfxDeviceDriverReset, type, NULL);

	if (ret)

		dev_err(smu->adev->dev, "Failed to mode reset!\n");

drivers/gpu/drm/radeon/atombios_encoders.c

+2 −1
Original line number Diff line number Diff line
@@ -198,7 +198,8 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, 
	 * so don't register a backlight device

	 */

	if ((rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) &&

	    (rdev->pdev->device == 0x6741))

	    (rdev->pdev->device == 0x6741) &&

	    !dmi_match(DMI_PRODUCT_NAME, "iMac12,1"))

		return;



	if (!radeon_encoder->enc_priv)