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

Commit 4cb5aa1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: don't try to be smart in the hpd handler
  drm/radeon: re-POST the asic on Apple hardware when booted via EFI
  drm/radeon: Allow panel preferred EDID to override BIOS native mode
  drm/radeon/kms: make some watermark messages debug only
  drm/radeon/kms: fix regression is handling >2 heads on cedar/caicos
  drm/radeon/kms: don't enable connectors that are off in the hotplug handler
parents aa2b1cf5 d5811e87

drivers/gpu/drm/radeon/atombios_dp.c

+12 −0
Original line number Diff line number Diff line
@@ -613,6 +613,18 @@ static bool radeon_dp_get_link_status(struct radeon_connector *radeon_connector, 
	return true;

}



bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector)

{

	u8 link_status[DP_LINK_STATUS_SIZE];

	struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;



	if (!radeon_dp_get_link_status(radeon_connector, link_status))

		return false;

	if (dp_channel_eq_ok(link_status, dig->dp_lane_count))

		return false;

	return true;

}



struct radeon_dp_link_train_info {

	struct radeon_device *rdev;

	struct drm_encoder *encoder;

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ static void evergreen_program_watermarks(struct radeon_device *rdev, 
		    !evergreen_average_bandwidth_vs_available_bandwidth(&wm) ||

		    !evergreen_check_latency_hiding(&wm) ||

		    (rdev->disp_priority == 2)) {

			DRM_INFO("force priority to high\n");

			DRM_DEBUG_KMS("force priority to high\n");

			priority_a_cnt |= PRIORITY_ALWAYS_ON;

			priority_b_cnt |= PRIORITY_ALWAYS_ON;

		}

drivers/gpu/drm/radeon/radeon_connectors.c

+20 −9
Original line number Diff line number Diff line
@@ -60,18 +60,20 @@ void radeon_connector_hotplug(struct drm_connector *connector) 


	radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);



	/* powering up/down the eDP panel generates hpd events which

	 * can interfere with modesetting.

	 */

	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)

	/* if the connector is already off, don't turn it back on */

	if (connector->dpms != DRM_MODE_DPMS_ON)

		return;



	/* pre-r600 did not always have the hpd pins mapped accurately to connectors */

	if (rdev->family >= CHIP_R600) {

		if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd))

	/* just deal with DP (not eDP) here. */

	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {

		int saved_dpms = connector->dpms;



		if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd) &&

		    radeon_dp_needs_link_train(radeon_connector))

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);

		else

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

		connector->dpms = saved_dpms;

	}

}
@@ -474,11 +476,19 @@ static void radeon_fixup_lvds_native_mode(struct drm_encoder *encoder, 
{

	struct radeon_encoder *radeon_encoder =	to_radeon_encoder(encoder);

	struct drm_display_mode *native_mode = &radeon_encoder->native_mode;

	struct drm_display_mode *t, *mode;



	/* If the EDID preferred mode doesn't match the native mode, use it */

	list_for_each_entry_safe(mode, t, &connector->probed_modes, head) {

		if (mode->type & DRM_MODE_TYPE_PREFERRED) {

			if (mode->hdisplay != native_mode->hdisplay ||

			    mode->vdisplay != native_mode->vdisplay)

				memcpy(native_mode, mode, sizeof(*mode));

		}

	}



	/* Try to get native mode details from EDID if necessary */

	if (!native_mode->clock) {

		struct drm_display_mode *t, *mode;



		list_for_each_entry_safe(mode, t, &connector->probed_modes, head) {

			if (mode->hdisplay == native_mode->hdisplay &&

			    mode->vdisplay == native_mode->vdisplay) {
@@ -489,6 +499,7 @@ static void radeon_fixup_lvds_native_mode(struct drm_encoder *encoder, 
			}

		}

	}



	if (!native_mode->clock) {

		DRM_DEBUG_KMS("No LVDS native mode details, disabling RMX\n");

		radeon_encoder->rmx_type = RMX_OFF;

drivers/gpu/drm/radeon/radeon_device.c

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <drm/radeon_drm.h>

#include <linux/vgaarb.h>

#include <linux/vga_switcheroo.h>

#include <linux/efi.h>

#include "radeon_reg.h"

#include "radeon.h"

#include "atom.h"
@@ -348,6 +349,9 @@ bool radeon_card_posted(struct radeon_device *rdev) 
{

	uint32_t reg;



	if (efi_enabled && rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)

		return false;



	/* first check CRTCs */

	if (ASIC_IS_DCE41(rdev)) {

		reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |

drivers/gpu/drm/radeon/radeon_encoders.c

+3 −0
Original line number Diff line number Diff line
@@ -2323,6 +2323,9 @@ radeon_add_atom_encoder(struct drm_device *dev, 
	default:

		encoder->possible_crtcs = 0x3;

		break;

	case 4:

		encoder->possible_crtcs = 0xf;

		break;

	case 6:

		encoder->possible_crtcs = 0x3f;

		break;