Attachment 102565 Details for Bug 80868 – better patch

[patch] better patch

0001-drm-radeon-enable-display-scaling-on-all-connectors-.patch (text/plain), 9.95 KB, created by Alex Deucher on 2014-07-10 17:13:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2014-07-10 17:13:13 UTC

Size: 9.95 KB

patch

obsolete

>From fdbfca63c9ad9cd27f27c5f59a2add41ec728f60 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 9 Jul 2014 13:21:59 -0400
>Subject: [PATCH 1/2] drm/radeon: enable display scaling on all connectors (v2)
>
>This enables the display scaler on all connectors for r5xx
>and newer asics.  Previously we only enabled the scaler for
>fixed mode displays (eDP or LVDS) since they have to use the
>scaler to support non-native modes.  Most other displays
>are multi-sync or have a built in scaler to support non-native
>modes.  The default scaling mode for non-fixed displays is
>none which will use the scaler in the monitor.  Note that
>we do not populate any fake modes like we do for fixed
>displays so it will only use the modes in the edid.  For
>other modes, you'll need to populate them manually.
>
>bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=80868
>
>v2: properly handle scaling with no modes defined
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/atombios_encoders.c |  10 +--
> drivers/gpu/drm/radeon/radeon_connectors.c | 106 ++++++++++++++++++++++++-----
> 2 files changed, 95 insertions(+), 21 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
>index 2b29084..f27f0f7 100644
>--- a/drivers/gpu/drm/radeon/atombios_encoders.c
>+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
>@@ -327,12 +327,10 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
> 	    && (mode->crtc_vsync_start < (mode->crtc_vdisplay + 2)))
> 		adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2;
> 
>-	/* get the native mode for LVDS */
>-	if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT))
>+	/* get the native mode for scaling */
>+	if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT)) {
> 		radeon_panel_mode_fixup(encoder, adjusted_mode);
>-
>-	/* get the native mode for TV */
>-	if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) {
>+	} else if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) {
> 		struct radeon_encoder_atom_dac *tv_dac = radeon_encoder->enc_priv;
> 		if (tv_dac) {
> 			if (tv_dac->tv_std == TV_STD_NTSC ||
>@@ -342,6 +340,8 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
> 			else
> 				radeon_atom_get_tv_timings(rdev, 1, adjusted_mode);
> 		}
>+	} else if (radeon_encoder->rmx_type != RMX_OFF) {
>+		radeon_panel_mode_fixup(encoder, adjusted_mode);
> 	}
> 
> 	if (ASIC_IS_DCE3(rdev) &&
>diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
>index 4483119..88e3ffe 100644
>--- a/drivers/gpu/drm/radeon/radeon_connectors.c
>+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
>@@ -285,6 +285,27 @@ static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *conn
> 	return NULL;
> }
> 
>+static void radeon_get_native_mode(struct drm_connector *connector)
>+{
>+	struct drm_encoder *encoder = radeon_best_single_encoder(connector);
>+	struct radeon_encoder *radeon_encoder;
>+
>+	if (encoder == NULL)
>+		return;
>+
>+	radeon_encoder = to_radeon_encoder(encoder);
>+
>+	if (!list_empty(&connector->probed_modes)) {
>+		struct drm_display_mode *preferred_mode =
>+			list_first_entry(&connector->probed_modes,
>+					 struct drm_display_mode, head);
>+
>+		radeon_encoder->native_mode = *preferred_mode;
>+	} else {
>+		radeon_encoder->native_mode.clock = 0;
>+	}
>+}
>+
> /*
>  * radeon_connector_analog_encoder_conflict_solve
>  * - search for other connectors sharing this encoder
>@@ -585,6 +606,35 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct
> 		radeon_property_change_mode(&radeon_encoder->base);
> 	}
> 
>+	if (property == dev->mode_config.scaling_mode_property) {
>+		enum radeon_rmx_type rmx_type;
>+
>+		if (connector->encoder)
>+			radeon_encoder = to_radeon_encoder(connector->encoder);
>+		else {
>+			struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;
>+			radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector));
>+		}
>+
>+		switch (val) {
>+		default:
>+		case DRM_MODE_SCALE_NONE: rmx_type = RMX_OFF; break;
>+		case DRM_MODE_SCALE_CENTER: rmx_type = RMX_CENTER; break;
>+		case DRM_MODE_SCALE_ASPECT: rmx_type = RMX_ASPECT; break;
>+		case DRM_MODE_SCALE_FULLSCREEN: rmx_type = RMX_FULL; break;
>+		}
>+		if (radeon_encoder->rmx_type == rmx_type)
>+			return 0;
>+
>+		if ((rmx_type != DRM_MODE_SCALE_NONE) &&
>+		    (radeon_encoder->native_mode.clock == 0))
>+			return 0;
>+
>+		radeon_encoder->rmx_type = rmx_type;
>+
>+		radeon_property_change_mode(&radeon_encoder->base);
>+	}
>+
> 	return 0;
> }
> 
>@@ -802,6 +852,8 @@ static int radeon_vga_get_modes(struct drm_connector *connector)
> 
> 	ret = radeon_ddc_get_modes(radeon_connector);
> 
>+	radeon_get_native_mode(connector);
>+
> 	return ret;
> }
> 
>@@ -1005,6 +1057,9 @@ static int radeon_dvi_get_modes(struct drm_connector *connector)
> 	int ret;
> 
> 	ret = radeon_ddc_get_modes(radeon_connector);
>+
>+	radeon_get_native_mode(connector);
>+
> 	return ret;
> }
> 
>@@ -1384,6 +1439,8 @@ static int radeon_dp_get_modes(struct drm_connector *connector)
> 				radeon_atom_ext_encoder_setup_ddc(encoder);
> 		}
> 		ret = radeon_ddc_get_modes(radeon_connector);
>+
>+		radeon_get_native_mode(connector);
> 	}
> 
> 	return ret;
>@@ -1747,6 +1804,9 @@ radeon_add_atom_connector(struct drm_device *dev,
> 			drm_object_attach_property(&radeon_connector->base.base,
> 						      rdev->mode_info.load_detect_property,
> 						      1);
>+			drm_object_attach_property(&radeon_connector->base.base,
>+						   dev->mode_config.scaling_mode_property,
>+						   DRM_MODE_SCALE_NONE);
> 			break;
> 		case DRM_MODE_CONNECTOR_DVII:
> 		case DRM_MODE_CONNECTOR_DVID:
>@@ -1768,6 +1828,10 @@ radeon_add_atom_connector(struct drm_device *dev,
> 						      0);
> 
> 			drm_object_attach_property(&radeon_connector->base.base,
>+						      dev->mode_config.scaling_mode_property,
>+						      DRM_MODE_SCALE_NONE);
>+
>+			drm_object_attach_property(&radeon_connector->base.base,
> 						   rdev->mode_info.dither_property,
> 						   RADEON_FMT_DITHER_DISABLE);
> 
>@@ -1817,6 +1881,10 @@ radeon_add_atom_connector(struct drm_device *dev,
> 			drm_object_attach_property(&radeon_connector->base.base,
> 						      rdev->mode_info.load_detect_property,
> 						      1);
>+			if (ASIC_IS_AVIVO(rdev))
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   dev->mode_config.scaling_mode_property,
>+							   DRM_MODE_SCALE_NONE);
> 			/* no HPD on analog connectors */
> 			radeon_connector->hpd.hpd = RADEON_HPD_NONE;
> 			connector->polled = DRM_CONNECTOR_POLL_CONNECT;
>@@ -1835,6 +1903,10 @@ radeon_add_atom_connector(struct drm_device *dev,
> 			drm_object_attach_property(&radeon_connector->base.base,
> 						      rdev->mode_info.load_detect_property,
> 						      1);
>+			if (ASIC_IS_AVIVO(rdev))
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   dev->mode_config.scaling_mode_property,
>+							   DRM_MODE_SCALE_NONE);
> 			/* no HPD on analog connectors */
> 			radeon_connector->hpd.hpd = RADEON_HPD_NONE;
> 			connector->interlace_allowed = true;
>@@ -1868,17 +1940,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> 				drm_object_attach_property(&radeon_connector->base.base,
> 							      rdev->mode_info.underscan_vborder_property,
> 							      0);
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   rdev->mode_info.dither_property,
>+							   RADEON_FMT_DITHER_DISABLE);
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   dev->mode_config.scaling_mode_property,
>+							   DRM_MODE_SCALE_NONE);
> 			}
> 			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
> 				drm_object_attach_property(&radeon_connector->base.base,
> 							   rdev->mode_info.audio_property,
> 							   RADEON_AUDIO_AUTO);
> 			}
>-			if (ASIC_IS_AVIVO(rdev)) {
>-				drm_object_attach_property(&radeon_connector->base.base,
>-							   rdev->mode_info.dither_property,
>-							   RADEON_FMT_DITHER_DISABLE);
>-			}
> 			if (connector_type == DRM_MODE_CONNECTOR_DVII) {
> 				radeon_connector->dac_load_detect = true;
> 				drm_object_attach_property(&radeon_connector->base.base,
>@@ -1918,17 +1991,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> 				drm_object_attach_property(&radeon_connector->base.base,
> 							      rdev->mode_info.underscan_vborder_property,
> 							      0);
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   rdev->mode_info.dither_property,
>+							   RADEON_FMT_DITHER_DISABLE);
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   dev->mode_config.scaling_mode_property,
>+							   DRM_MODE_SCALE_NONE);
> 			}
> 			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
> 				drm_object_attach_property(&radeon_connector->base.base,
> 							   rdev->mode_info.audio_property,
> 							   RADEON_AUDIO_AUTO);
> 			}
>-			if (ASIC_IS_AVIVO(rdev)) {
>-				drm_object_attach_property(&radeon_connector->base.base,
>-							   rdev->mode_info.dither_property,
>-							   RADEON_FMT_DITHER_DISABLE);
>-			}
> 			subpixel_order = SubPixelHorizontalRGB;
> 			connector->interlace_allowed = true;
> 			if (connector_type == DRM_MODE_CONNECTOR_HDMIB)
>@@ -1965,18 +2039,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> 				drm_object_attach_property(&radeon_connector->base.base,
> 							      rdev->mode_info.underscan_vborder_property,
> 							      0);
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   rdev->mode_info.dither_property,
>+							   RADEON_FMT_DITHER_DISABLE);
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   dev->mode_config.scaling_mode_property,
>+							   DRM_MODE_SCALE_NONE);
> 			}
> 			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
> 				drm_object_attach_property(&radeon_connector->base.base,
> 							   rdev->mode_info.audio_property,
> 							   RADEON_AUDIO_AUTO);
> 			}
>-			if (ASIC_IS_AVIVO(rdev)) {
>-				drm_object_attach_property(&radeon_connector->base.base,
>-							   rdev->mode_info.dither_property,
>-							   RADEON_FMT_DITHER_DISABLE);
>-
>-			}
> 			connector->interlace_allowed = true;
> 			/* in theory with a DP to VGA converter... */
> 			connector->doublescan_allowed = false;
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 80868: 102216 | 102491 | 102565

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.