Commit d740a933 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: consolidate duplicate encode is digital function 



Only need one copy.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f68fdbe4

drivers/gpu/drm/radeon/atombios_encoders.c

+0 −23
Original line number Diff line number Diff line
@@ -291,29 +291,6 @@ static void radeon_atom_backlight_exit(struct radeon_encoder *encoder) 
bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,

				struct drm_display_mode *mode);





static inline bool radeon_encoder_is_digital(struct drm_encoder *encoder)

{

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	switch (radeon_encoder->encoder_id) {

	case ENCODER_OBJECT_ID_INTERNAL_LVDS:

	case ENCODER_OBJECT_ID_INTERNAL_TMDS1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:

	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:

	case ENCODER_OBJECT_ID_INTERNAL_DVO1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:

	case ENCODER_OBJECT_ID_INTERNAL_DDI:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:

		return true;

	default:

		return false;

	}

}



static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,

				   const struct drm_display_mode *mode,

				   struct drm_display_mode *adjusted_mode)

drivers/gpu/drm/radeon/r600_audio.c

+1 −24
Original line number Diff line number Diff line
@@ -29,29 +29,6 @@ 
#include "radeon_asic.h"

#include "atom.h"



/*

 * check if enc_priv stores radeon_encoder_atom_dig

 */

static bool radeon_dig_encoder(struct drm_encoder *encoder)

{

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	switch (radeon_encoder->encoder_id) {

	case ENCODER_OBJECT_ID_INTERNAL_LVDS:

	case ENCODER_OBJECT_ID_INTERNAL_TMDS1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:

	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:

	case ENCODER_OBJECT_ID_INTERNAL_DVO1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:

	case ENCODER_OBJECT_ID_INTERNAL_DDI:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

		return true;

	}

	return false;

}



/*

 * check if the chipset is supported

 */
@@ -134,7 +111,7 @@ void r600_audio_update_hdmi(struct work_struct *work) 
	}



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		if (!radeon_dig_encoder(encoder))

		if (!radeon_encoder_is_digital(encoder))

			continue;

		if (changed || r600_hdmi_buffer_status_changed(encoder))

			r600_hdmi_update_audio_settings(encoder);

drivers/gpu/drm/radeon/radeon_encoders.c

+21 −0
Original line number Diff line number Diff line
@@ -382,3 +382,24 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder, 
	}

}



bool radeon_encoder_is_digital(struct drm_encoder *encoder)

{

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	switch (radeon_encoder->encoder_id) {

	case ENCODER_OBJECT_ID_INTERNAL_LVDS:

	case ENCODER_OBJECT_ID_INTERNAL_TMDS1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:

	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:

	case ENCODER_OBJECT_ID_INTERNAL_DVO1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:

	case ENCODER_OBJECT_ID_INTERNAL_DDI:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:

		return true;

	default:

		return false;

	}

}

drivers/gpu/drm/radeon/radeon_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ extern void atombios_digital_setup(struct drm_encoder *encoder, int action); 
extern int atombios_get_encoder_mode(struct drm_encoder *encoder);

extern bool atombios_set_edp_panel_power(struct drm_connector *connector, int action);

extern void radeon_encoder_set_active_device(struct drm_encoder *encoder);

extern bool radeon_encoder_is_digital(struct drm_encoder *encoder);



extern void radeon_crtc_load_lut(struct drm_crtc *crtc);

extern int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,