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

Commit 579123fd authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Most just regression fixes for audio, dpm, and uvd, plus
a resource leak fix for cik.

* 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/audio: don't set speaker allocation on DCE4+
  drm/radeon: rework audio option
  drm/radeon/audio: don't set speaker allocation on DCE3.2
  drm/radeon: make missing smc ucode non-fatal (CI)
  drm/radeon: make missing smc ucode non-fatal (r7xx-SI)
  drm/radeon/uvd: revert lower msg&fb buffer requirements on UVD3
  drm/radeon: stop the leaks in cik_ib_test
  drm/radeon/atom: workaround vbios bug in transmitter table on rs780
parents 3bcec5f0 555b1b65

drivers/gpu/drm/radeon/atombios_encoders.c

+36 −18
Original line number Diff line number Diff line
@@ -707,24 +707,37 @@ 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 ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||

		    (drm_detect_hdmi_monitor(radeon_connector->edid) &&

		     (radeon_connector->audio == RADEON_AUDIO_AUTO)))

		if (radeon_audio != 0) {

			if (radeon_connector->use_digital &&

			    (radeon_connector->audio == RADEON_AUDIO_ENABLE))

				return ATOM_ENCODER_MODE_HDMI;

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

				 (radeon_connector->audio == RADEON_AUDIO_AUTO))

				return ATOM_ENCODER_MODE_HDMI;

			else if (radeon_connector->use_digital)

				return ATOM_ENCODER_MODE_DVI;

			else

				return ATOM_ENCODER_MODE_CRT;

		} else if (radeon_connector->use_digital) {

			return ATOM_ENCODER_MODE_DVI;

		} else {

			return ATOM_ENCODER_MODE_CRT;

		}

		break;

	case DRM_MODE_CONNECTOR_DVID:

	case DRM_MODE_CONNECTOR_HDMIA:

	default:

		if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||

		    (drm_detect_hdmi_monitor(radeon_connector->edid) &&

		     (radeon_connector->audio == RADEON_AUDIO_AUTO)))

		if (radeon_audio != 0) {

			if (radeon_connector->audio == RADEON_AUDIO_ENABLE)

				return ATOM_ENCODER_MODE_HDMI;

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

				 (radeon_connector->audio == RADEON_AUDIO_AUTO))

				return ATOM_ENCODER_MODE_HDMI;

			else

				return ATOM_ENCODER_MODE_DVI;

		} else {

			return ATOM_ENCODER_MODE_DVI;

		}

		break;

	case DRM_MODE_CONNECTOR_LVDS:

		return ATOM_ENCODER_MODE_LVDS;
@@ -732,14 +745,19 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	case DRM_MODE_CONNECTOR_DisplayPort:

		dig_connector = radeon_connector->con_priv;

		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||

		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))

		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) {

			return ATOM_ENCODER_MODE_DP;

		else if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||

			 (drm_detect_hdmi_monitor(radeon_connector->edid) &&

			  (radeon_connector->audio == RADEON_AUDIO_AUTO)))

		} else if (radeon_audio != 0) {

			if (radeon_connector->audio == RADEON_AUDIO_ENABLE)

				return ATOM_ENCODER_MODE_HDMI;

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

				 (radeon_connector->audio == RADEON_AUDIO_AUTO))

				return ATOM_ENCODER_MODE_HDMI;

			else

				return ATOM_ENCODER_MODE_DVI;

		} else {

			return ATOM_ENCODER_MODE_DVI;

		}

		break;

	case DRM_MODE_CONNECTOR_eDP:

		return ATOM_ENCODER_MODE_DP;
@@ -1655,7 +1673,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) 
			 * does the same thing and more.

			 */

			if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730) &&

			    (rdev->family != CHIP_RS880))

			    (rdev->family != CHIP_RS780) && (rdev->family != CHIP_RS880))

				atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);

		}

		if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) {

drivers/gpu/drm/radeon/cik.c

+4 −0
Original line number Diff line number Diff line
@@ -1694,6 +1694,7 @@ static int cik_init_microcode(struct radeon_device *rdev) 
			       fw_name);

			release_firmware(rdev->smc_fw);

			rdev->smc_fw = NULL;

			err = 0;

		} else if (rdev->smc_fw->size != smc_req_size) {

			printk(KERN_ERR

			       "cik_smc: Bogus length %zu in firmware \"%s\"\n",
@@ -3182,6 +3183,7 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
	r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256);

	if (r) {

		DRM_ERROR("radeon: failed to get ib (%d).\n", r);

		radeon_scratch_free(rdev, scratch);

		return r;

	}

	ib.ptr[0] = PACKET3(PACKET3_SET_UCONFIG_REG, 1);
@@ -3198,6 +3200,8 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
	r = radeon_fence_wait(ib.fence, false);

	if (r) {

		DRM_ERROR("radeon: fence wait failed (%d).\n", r);

		radeon_scratch_free(rdev, scratch);

		radeon_ib_free(rdev, &ib);

		return r;

	}

	for (i = 0; i < rdev->usec_timeout; i++) {

drivers/gpu/drm/radeon/dce6_afmt.c

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	u8 *sadb;

	int sad_count;



	/* XXX: setting this register causes hangs on some asics */

	return;



	if (!dig->afmt->pin)

		return;

drivers/gpu/drm/radeon/evergreen_hdmi.c

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	u8 *sadb;

	int sad_count;



	/* XXX: setting this register causes hangs on some asics */

	return;



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

		if (connector->encoder == encoder)

			radeon_connector = to_radeon_connector(connector);

drivers/gpu/drm/radeon/ni.c

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ int ni_init_microcode(struct radeon_device *rdev) 
			       fw_name);

			release_firmware(rdev->smc_fw);

			rdev->smc_fw = NULL;

			err = 0;

		} else if (rdev->smc_fw->size != smc_req_size) {

			printk(KERN_ERR

			       "ni_mc: Bogus length %zu in firmware \"%s\"\n",