Commit 54f78a76 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: add apu flags (v2) 



Add some APU flags to simplify handling of different APU
variants.  It's easier to understand the special cases
if we use names flags rather than checking device ids and
silicon revisions.

v2: rebase on latest code

Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cbd2d08c

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

+1 −0
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ struct amdgpu_device { 
	uint32_t			rev_id;

	uint32_t			external_rev_id;

	unsigned long			flags;

	unsigned long			apu_flags;

	int				usec_timeout;

	const struct amdgpu_asic_funcs	*asic_funcs;

	bool				shutdown;

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

+2 −2
Original line number Diff line number Diff line
@@ -1567,9 +1567,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
		chip_name = "vega12";

		break;

	case CHIP_RAVEN:

		if (adev->rev_id >= 8)

		if (adev->apu_flags & AMD_APU_IS_RAVEN2)

			chip_name = "raven2";

		else if (adev->pdev->device == 0x15d8)

		else if (adev->apu_flags & AMD_APU_IS_PICASSO)

			chip_name = "picasso";

		else

			chip_name = "raven";

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

+2 −1
Original line number Diff line number Diff line
@@ -523,7 +523,8 @@ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev, 
			break;

		case CHIP_RAVEN:

			/* enable S/G on PCO and RV2 */

			if (adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)

			if ((adev->apu_flags & AMD_APU_IS_RAVEN2) ||

			    (adev->apu_flags & AMD_APU_IS_PICASSO))

				domain |= AMDGPU_GEM_DOMAIN_GTT;

			break;

		default:

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

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, 
	}



	if (adev->asic_type == CHIP_RAVEN) {

		if (adev->rev_id < 8) {

		if (!(adev->apu_flags & AMD_APU_IS_RAVEN2)) {

			if (current_level != AMD_DPM_FORCED_LEVEL_MANUAL && level == AMD_DPM_FORCED_LEVEL_MANUAL)

				amdgpu_gfx_off_ctrl(adev, false);

			else if (current_level == AMD_DPM_FORCED_LEVEL_MANUAL && level != AMD_DPM_FORCED_LEVEL_MANUAL)

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

+2 −2
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 


	switch (adev->asic_type) {

	case CHIP_RAVEN:

		if (adev->rev_id >= 8)

		if (adev->apu_flags & AMD_APU_IS_RAVEN2)

			fw_name = FIRMWARE_RAVEN2;

		else if (adev->pdev->device == 0x15d8)

		else if (adev->apu_flags & AMD_APU_IS_PICASSO)

			fw_name = FIRMWARE_PICASSO;

		else

			fw_name = FIRMWARE_RAVEN;