Commit 9caa2b02 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

one revert, and two regression fixes for audio/hdmi
* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/audio: make sure connector is valid in hotplug case
  Revert "drm/radeon: only mark audio as connected if the monitor supports it (v3)"
  drm/radeon: don't share plls if monitors differ in audio support
parents 990ed272 fbfd3bc7

drivers/gpu/drm/radeon/atombios_crtc.c

+3 −1
Original line number Diff line number Diff line
@@ -1798,7 +1798,9 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc) 
			if ((crtc->mode.clock == test_crtc->mode.clock) &&

			    (adjusted_clock == test_adjusted_clock) &&

			    (radeon_crtc->ss_enabled == test_radeon_crtc->ss_enabled) &&

			    (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID))

			    (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID) &&

			    (drm_detect_monitor_audio(radeon_connector_edid(test_radeon_crtc->connector)) ==

			     drm_detect_monitor_audio(radeon_connector_edid(radeon_crtc->connector))))

				return test_radeon_crtc->pll_id;

		}

	}

drivers/gpu/drm/radeon/evergreen_hdmi.c

+3 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable) 
	if (enable) {

		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);



		if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {

		if (connector && drm_detect_monitor_audio(radeon_connector_edid(connector))) {

			WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset,

			       HDMI_AVI_INFO_SEND | /* enable AVI info frames */

			       HDMI_AVI_INFO_CONT | /* required for audio info values to be updated */
@@ -438,7 +438,8 @@ void evergreen_dp_enable(struct drm_encoder *encoder, bool enable) 
	if (!dig || !dig->afmt)

		return;



	if (enable && drm_detect_monitor_audio(radeon_connector_edid(connector))) {

	if (enable && connector &&

	    drm_detect_monitor_audio(radeon_connector_edid(connector))) {

		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

		struct radeon_connector *radeon_connector = to_radeon_connector(connector);

		struct radeon_connector_atom_dig *dig_connector;

drivers/gpu/drm/radeon/radeon_audio.c

+12 −15
Original line number Diff line number Diff line
@@ -460,9 +460,6 @@ void radeon_audio_detect(struct drm_connector *connector, 
	if (!connector || !connector->encoder)

		return;



	if (!radeon_encoder_is_digital(connector->encoder))

		return;



	rdev = connector->encoder->dev->dev_private;



	if (!radeon_audio_chipset_supported(rdev))
@@ -471,30 +468,30 @@ void radeon_audio_detect(struct drm_connector *connector, 
	radeon_encoder = to_radeon_encoder(connector->encoder);

	dig = radeon_encoder->enc_priv;



	if (!dig->afmt)

	if (status == connector_status_connected) {

		struct radeon_connector *radeon_connector;

		int sink_type;



		if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) {

			radeon_encoder->audio = NULL;

			return;

		}



	if (status == connector_status_connected) {

		struct radeon_connector *radeon_connector = to_radeon_connector(connector);

		radeon_connector = to_radeon_connector(connector);

		sink_type = radeon_dp_getsinktype(radeon_connector);



		if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&

		    radeon_dp_getsinktype(radeon_connector) ==

		    CONNECTOR_OBJECT_ID_DISPLAYPORT)

			sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)

			radeon_encoder->audio = rdev->audio.dp_funcs;

		else

			radeon_encoder->audio = rdev->audio.hdmi_funcs;



		dig->afmt->pin = radeon_audio_get_pin(connector->encoder);

		if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {

		radeon_audio_enable(rdev, dig->afmt->pin, 0xf);

	} else {

		radeon_audio_enable(rdev, dig->afmt->pin, 0);

		dig->afmt->pin = NULL;

	}

	} else {

		radeon_audio_enable(rdev, dig->afmt->pin, 0);

		dig->afmt->pin = NULL;

	}

}



void radeon_audio_fini(struct radeon_device *rdev)

drivers/gpu/drm/radeon/radeon_connectors.c

+2 −6
Original line number Diff line number Diff line
@@ -1379,10 +1379,8 @@ out: 
	/* updated in get modes as well since we need to know if it's analog or digital */

	radeon_connector_update_scratch_regs(connector, ret);



	if (radeon_audio != 0) {

		radeon_connector_get_edid(connector);

	if (radeon_audio != 0)

		radeon_audio_detect(connector, ret);

	}



exit:

	pm_runtime_mark_last_busy(connector->dev->dev);
@@ -1719,10 +1717,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force) 


	radeon_connector_update_scratch_regs(connector, ret);



	if (radeon_audio != 0) {

		radeon_connector_get_edid(connector);

	if (radeon_audio != 0)

		radeon_audio_detect(connector, ret);

	}



out:

	pm_runtime_mark_last_busy(connector->dev->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE