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

Commit 0783986a authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/hdmi: store info about all AFMT blocks 



Introduce special struct radeon_afmt for this purpose.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1b9c3dd0

drivers/gpu/drm/radeon/r600_reg.h

+6 −0
Original line number Diff line number Diff line
@@ -156,4 +156,10 @@ 
#define R600_AUDIO_PIN_WIDGET_CNTL        0x73d4

#define R600_AUDIO_STATUS_BITS            0x73d8



#define DCE2_HDMI_OFFSET0		(0x7400 - 0x7400)

#define DCE2_HDMI_OFFSET1		(0x7700 - 0x7400)

/* DCE3.2 second instance starts at 0x7800 */

#define DCE3_HDMI_OFFSET0		(0x7400 - 0x7400)

#define DCE3_HDMI_OFFSET1		(0x7800 - 0x7400)



#endif

drivers/gpu/drm/radeon/r600d.h

+0 −6
Original line number Diff line number Diff line
@@ -1057,12 +1057,6 @@ 
#       define AFMT_AZ_FORMAT_WTRIG_ACK      (1 << 29)

#       define AFMT_AZ_AUDIO_ENABLE_CHG_ACK  (1 << 30)



#define DCE2_HDMI_OFFSET0		(0x7400 - 0x7400)

#define DCE2_HDMI_OFFSET1		(0x7700 - 0x7400)

/* DCE3.2 second instance starts at 0x7800 */

#define DCE3_HDMI_OFFSET0		(0x7400 - 0x7400)

#define DCE3_HDMI_OFFSET1		(0x7800 - 0x7400)



/*

 * PM4

 */

drivers/gpu/drm/radeon/radeon_asic.h

+0 −1
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ int r600_audio_rate(struct radeon_device *rdev); 
uint8_t r600_audio_status_bits(struct radeon_device *rdev);

uint8_t r600_audio_category_code(struct radeon_device *rdev);

void r600_audio_fini(struct radeon_device *rdev);

void r600_hdmi_init(struct drm_encoder *encoder);

int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);

void r600_hdmi_update_audio_settings(struct drm_encoder *encoder);

/* r600 blit */

drivers/gpu/drm/radeon/radeon_display.c

+91 −0
Original line number Diff line number Diff line
@@ -1225,6 +1225,93 @@ void radeon_update_display_priority(struct radeon_device *rdev) 


}



/*

 * Allocate hdmi structs and determine register offsets

 */

static void radeon_afmt_init(struct radeon_device *rdev)

{

	int i;



	for (i = 0; i < RADEON_MAX_AFMT_BLOCKS; i++)

		rdev->mode_info.afmt[i] = NULL;



	if (ASIC_IS_DCE6(rdev)) {

		/* todo */

	} else if (ASIC_IS_DCE4(rdev)) {

		/* DCE4/5 has 6 audio blocks tied to DIG encoders */

		/* DCE4.1 has 2 audio blocks tied to DIG encoders */

		rdev->mode_info.afmt[0] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

		if (rdev->mode_info.afmt[0]) {

			rdev->mode_info.afmt[0]->offset = EVERGREEN_CRTC0_REGISTER_OFFSET;

			rdev->mode_info.afmt[0]->id = 0;

		}

		rdev->mode_info.afmt[1] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

		if (rdev->mode_info.afmt[1]) {

			rdev->mode_info.afmt[1]->offset = EVERGREEN_CRTC1_REGISTER_OFFSET;

			rdev->mode_info.afmt[1]->id = 1;

		}

		if (!ASIC_IS_DCE41(rdev)) {

			rdev->mode_info.afmt[2] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

			if (rdev->mode_info.afmt[2]) {

				rdev->mode_info.afmt[2]->offset = EVERGREEN_CRTC2_REGISTER_OFFSET;

				rdev->mode_info.afmt[2]->id = 2;

			}

			rdev->mode_info.afmt[3] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

			if (rdev->mode_info.afmt[3]) {

				rdev->mode_info.afmt[3]->offset = EVERGREEN_CRTC3_REGISTER_OFFSET;

				rdev->mode_info.afmt[3]->id = 3;

			}

			rdev->mode_info.afmt[4] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

			if (rdev->mode_info.afmt[4]) {

				rdev->mode_info.afmt[4]->offset = EVERGREEN_CRTC4_REGISTER_OFFSET;

				rdev->mode_info.afmt[4]->id = 4;

			}

			rdev->mode_info.afmt[5] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

			if (rdev->mode_info.afmt[5]) {

				rdev->mode_info.afmt[5]->offset = EVERGREEN_CRTC5_REGISTER_OFFSET;

				rdev->mode_info.afmt[5]->id = 5;

			}

		}

	} else if (ASIC_IS_DCE3(rdev)) {

		/* DCE3.x has 2 audio blocks tied to DIG encoders */

		rdev->mode_info.afmt[0] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

		if (rdev->mode_info.afmt[0]) {

			rdev->mode_info.afmt[0]->offset = DCE3_HDMI_OFFSET0;

			rdev->mode_info.afmt[0]->id = 0;

		}

		rdev->mode_info.afmt[1] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

		if (rdev->mode_info.afmt[1]) {

			rdev->mode_info.afmt[1]->offset = DCE3_HDMI_OFFSET1;

			rdev->mode_info.afmt[1]->id = 1;

		}

	} else if (ASIC_IS_DCE2(rdev)) {

		/* DCE2 has at least 1 routable audio block */

		rdev->mode_info.afmt[0] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

		if (rdev->mode_info.afmt[0]) {

			rdev->mode_info.afmt[0]->offset = DCE2_HDMI_OFFSET0;

			rdev->mode_info.afmt[0]->id = 0;

		}

		/* r6xx has 2 routable audio blocks */

		if (rdev->family >= CHIP_R600) {

			rdev->mode_info.afmt[1] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);

			if (rdev->mode_info.afmt[1]) {

				rdev->mode_info.afmt[1]->offset = DCE2_HDMI_OFFSET1;

				rdev->mode_info.afmt[1]->id = 1;

			}

		}

	}

}



static void radeon_afmt_fini(struct radeon_device *rdev)

{

	int i;



	for (i = 0; i < RADEON_MAX_AFMT_BLOCKS; i++) {

		kfree(rdev->mode_info.afmt[i]);

		rdev->mode_info.afmt[i] = NULL;

	}

}



int radeon_modeset_init(struct radeon_device *rdev)

{

	int i;
@@ -1285,6 +1372,9 @@ int radeon_modeset_init(struct radeon_device *rdev) 
	/* initialize hpd */

	radeon_hpd_init(rdev);



	/* setup afmt */

	radeon_afmt_init(rdev);



	/* Initialize power management */

	radeon_pm_init(rdev);
@@ -1301,6 +1391,7 @@ void radeon_modeset_fini(struct radeon_device *rdev) 
	radeon_pm_fini(rdev);



	if (rdev->mode_info.mode_config_initialized) {

		radeon_afmt_fini(rdev);

		drm_kms_helper_poll_fini(rdev->ddev);

		radeon_hpd_fini(rdev);

		drm_mode_config_cleanup(rdev->ddev);

drivers/gpu/drm/radeon/radeon_mode.h

+9 −0
Original line number Diff line number Diff line
@@ -220,12 +220,20 @@ enum radeon_dvo_chip { 


struct radeon_fbdev;



struct radeon_afmt {

	bool enabled;

	int offset;

	bool last_buffer_filled_status;

	int id;

};



struct radeon_mode_info {

	struct atom_context *atom_context;

	struct card_info *atom_card_info;

	enum radeon_connector_table connector_table;

	bool mode_config_initialized;

	struct radeon_crtc *crtcs[6];

	struct radeon_afmt *afmt[6];

	/* DVI-I properties */

	struct drm_property *coherent_mode_property;

	/* DAC enable load detect */
@@ -364,6 +372,7 @@ struct radeon_encoder_atom_dig { 
	int dpms_mode;

	uint8_t backlight_level;

	int panel_mode;

	struct radeon_afmt *afmt;

};



struct radeon_encoder_atom_dac {