Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 633b9164 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: clean up ASIC_IS_DCE41() macro 



only fusion asics are dce4.1

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 32171d22

drivers/gpu/drm/radeon/radeon.h

+2 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,8 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); 
#define ASIC_IS_DCE3(rdev) ((rdev->family >= CHIP_RV620))

#define ASIC_IS_DCE32(rdev) ((rdev->family >= CHIP_RV730))

#define ASIC_IS_DCE4(rdev) ((rdev->family >= CHIP_CEDAR))

#define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM))

#define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \

			     (rdev->flags & RADEON_IS_IGP))



/*

 * BIOS helpers.

drivers/gpu/drm/radeon/radeon_encoders.c

+3 −3
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
		switch (mode) {

		case DRM_MODE_DPMS_ON:

		default:

			if (ASIC_IS_DCE41(rdev) && (rdev->flags & RADEON_IS_IGP))

			if (ASIC_IS_DCE41(rdev))

				action = EXTERNAL_ENCODER_ACTION_V3_ENABLE_OUTPUT;

			else

				action = ATOM_ENABLE;
@@ -1337,7 +1337,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
		case DRM_MODE_DPMS_STANDBY:

		case DRM_MODE_DPMS_SUSPEND:

		case DRM_MODE_DPMS_OFF:

			if (ASIC_IS_DCE41(rdev) && (rdev->flags & RADEON_IS_IGP))

			if (ASIC_IS_DCE41(rdev))

				action = EXTERNAL_ENCODER_ACTION_V3_DISABLE_OUTPUT;

			else

				action = ATOM_DISABLE;
@@ -1663,7 +1663,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
	}



	if (ext_encoder) {

		if (ASIC_IS_DCE41(rdev) && (rdev->flags & RADEON_IS_IGP)) {

		if (ASIC_IS_DCE41(rdev)) {

			atombios_external_encoder_setup(encoder, ext_encoder,

							EXTERNAL_ENCODER_ACTION_V3_ENCODER_INIT);

			atombios_external_encoder_setup(encoder, ext_encoder,