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

Commit 7a7e8734 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next 

This merges the evergreen HDMI audio support.

* 'drm-radeon-testing' of ../drm-radeon-next:
  drm/radeon/kms: define TMDS/LVTM HDMI enabling bits
  drm/radeon/kms: workaround invalid AVI infoframe checksum issue
  drm/radeon/kms: setup HDMI mode on Evergreen encoders
  drm/radeon/kms: support for audio on Evergreen
  drm/radeon/kms: minor HDMI audio cleanups
  drm/radeon/kms: do not force DVI mode on DCE4 if audio is on
ridge

Conflicts:
	drivers/gpu/drm/radeon/evergreen.c
parents 2318fcd6 93a4ed87

drivers/gpu/drm/radeon/atombios_encoders.c

+12 −23
Original line number Diff line number Diff line
@@ -409,8 +409,6 @@ int 
atombios_get_encoder_mode(struct drm_encoder *encoder)

{

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct drm_connector *connector;

	struct radeon_connector *radeon_connector;

	struct radeon_connector_atom_dig *dig_connector;
@@ -434,13 +432,10 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	switch (connector->connector_type) {

	case DRM_MODE_CONNECTOR_DVII:

	case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */

		if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {

			/* fix me */

			if (ASIC_IS_DCE4(rdev))

				return ATOM_ENCODER_MODE_DVI;

			else

		if (drm_detect_monitor_audio(radeon_connector->edid) &&

		    radeon_audio)

			return ATOM_ENCODER_MODE_HDMI;

		} else if (radeon_connector->use_digital)

		else if (radeon_connector->use_digital)

			return ATOM_ENCODER_MODE_DVI;

		else

			return ATOM_ENCODER_MODE_CRT;
@@ -448,13 +443,10 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	case DRM_MODE_CONNECTOR_DVID:

	case DRM_MODE_CONNECTOR_HDMIA:

	default:

		if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {

			/* fix me */

			if (ASIC_IS_DCE4(rdev))

				return ATOM_ENCODER_MODE_DVI;

			else

		if (drm_detect_monitor_audio(radeon_connector->edid) &&

		    radeon_audio)

			return ATOM_ENCODER_MODE_HDMI;

		} else

		else

			return ATOM_ENCODER_MODE_DVI;

		break;

	case DRM_MODE_CONNECTOR_LVDS:
@@ -465,13 +457,10 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||

		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))

			return ATOM_ENCODER_MODE_DP;

		else if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {

			/* fix me */

			if (ASIC_IS_DCE4(rdev))

				return ATOM_ENCODER_MODE_DVI;

			else

		else if (drm_detect_monitor_audio(radeon_connector->edid) &&

			 radeon_audio)

			return ATOM_ENCODER_MODE_HDMI;

		} else

		else

			return ATOM_ENCODER_MODE_DVI;

		break;

	case DRM_MODE_CONNECTOR_eDP:

drivers/gpu/drm/radeon/evergreen.c

+7 −0
Original line number Diff line number Diff line
@@ -3190,6 +3190,11 @@ static int evergreen_startup(struct radeon_device *rdev) 
	if (r) {

		DRM_ERROR("radeon: failed testing IB (%d).\n", r);

		rdev->accel_working = false;

	}



	r = r600_audio_init(rdev);

	if (r) {

		DRM_ERROR("radeon: audio init failed\n");

		return r;

	}
@@ -3227,6 +3232,7 @@ int evergreen_suspend(struct radeon_device *rdev) 
{

	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];



	r600_audio_fini(rdev);

	/* FIXME: we should wait for ring to be empty */

	radeon_ib_pool_suspend(rdev);

	r600_blit_suspend(rdev);
@@ -3342,6 +3348,7 @@ int evergreen_init(struct radeon_device *rdev) 


void evergreen_fini(struct radeon_device *rdev)

{

	r600_audio_fini(rdev);

	r600_blit_fini(rdev);

	r700_cp_fini(rdev);

	r600_irq_fini(rdev);

drivers/gpu/drm/radeon/evergreen_reg.h

+13 −0
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ 
#define EVERGREEN_P1PLL_SS_CNTL                         0x414

#define EVERGREEN_P2PLL_SS_CNTL                         0x454

#       define EVERGREEN_PxPLL_SS_EN                    (1 << 12)



#define EVERGREEN_AUDIO_PLL1_MUL			0x5b0

#define EVERGREEN_AUDIO_PLL1_DIV			0x5b4

#define EVERGREEN_AUDIO_PLL1_UNK			0x5bc



#define EVERGREEN_AUDIO_ENABLE				0x5e78

#define EVERGREEN_AUDIO_VENDOR_ID			0x5ec0



/* GRPH blocks at 0x6800, 0x7400, 0x10000, 0x10c00, 0x11800, 0x12400 */

#define EVERGREEN_GRPH_ENABLE                           0x6800

#define EVERGREEN_GRPH_CONTROL                          0x6804
@@ -220,4 +228,9 @@ 
#define EVERGREEN_DC_GPIO_HPD_EN                        0x64b8

#define EVERGREEN_DC_GPIO_HPD_Y                         0x64bc



/* HDMI blocks at 0x7030, 0x7c30, 0x10830, 0x11430, 0x12030, 0x12c30 */

#define EVERGREEN_HDMI_BASE				0x7030



#define EVERGREEN_HDMI_CONFIG_OFFSET			0xf0



#endif

drivers/gpu/drm/radeon/r500_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ 


#define AVIVO_TMDSA_CNTL                    0x7880

#   define AVIVO_TMDSA_CNTL_ENABLE               (1 << 0)

#   define AVIVO_TMDSA_CNTL_HDMI_EN              (1 << 2)

#   define AVIVO_TMDSA_CNTL_HPD_MASK             (1 << 4)

#   define AVIVO_TMDSA_CNTL_HPD_SELECT           (1 << 8)

#   define AVIVO_TMDSA_CNTL_SYNC_PHASE           (1 << 12)
@@ -633,6 +634,7 @@ 


#define AVIVO_LVTMA_CNTL					0x7a80

#   define AVIVO_LVTMA_CNTL_ENABLE               (1 << 0)

#   define AVIVO_LVTMA_CNTL_HDMI_EN              (1 << 2)

#   define AVIVO_LVTMA_CNTL_HPD_MASK             (1 << 4)

#   define AVIVO_LVTMA_CNTL_HPD_SELECT           (1 << 8)

#   define AVIVO_LVTMA_CNTL_SYNC_PHASE           (1 << 12)

drivers/gpu/drm/radeon/r600_audio.c

+39 −18
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 */

static int r600_audio_chipset_supported(struct radeon_device *rdev)

{

	return (rdev->family >= CHIP_R600 && rdev->family < CHIP_CEDAR)

	return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE5(rdev))

		|| rdev->family == CHIP_RS600

		|| rdev->family == CHIP_RS690

		|| rdev->family == CHIP_RS740;
@@ -161,8 +161,18 @@ static void r600_audio_update_hdmi(unsigned long param) 
 */

static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)

{

	u32 value = 0;

	DRM_INFO("%s audio support\n", enable ? "Enabling" : "Disabling");

	WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000);

	if (ASIC_IS_DCE4(rdev)) {

		if (enable) {

			value |= 0x81000000; /* Required to enable audio */

			value |= 0x0e1000f0; /* fglrx sets that too */

		}

		WREG32(EVERGREEN_AUDIO_ENABLE, value);

	} else {

		WREG32_P(R600_AUDIO_ENABLE,

			 enable ? 0x81000000 : 0x0, ~0x81000000);

	}

	rdev->audio_enabled = enable;

}
@@ -248,6 +258,15 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) 
		return;

	}



	if (ASIC_IS_DCE4(rdev)) {

		/* TODO: other PLLs? */

		WREG32(EVERGREEN_AUDIO_PLL1_MUL, base_rate * 10);

		WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10);

		WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071);



		/* Some magic trigger or src sel? */

		WREG32_P(0x5ac, 0x01, ~0x77);

	} else {

		switch (dig->dig_encoder) {

		case 0:

			WREG32(R600_AUDIO_PLL1_MUL, base_rate * 50);
@@ -261,11 +280,13 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) 
			WREG32(R600_AUDIO_CLK_SRCSEL, 1);

			break;

		default:

		dev_err(rdev->dev, "Unsupported DIG on encoder 0x%02X\n",

			dev_err(rdev->dev,

				"Unsupported DIG on encoder 0x%02X\n",

				radeon_encoder->encoder_id);

			return;

		}

	}

}



/*

 * release the audio timer