Attachment 22692 Details for Bug 19203 – New patch without multiple OutputSetEDID calls

[patch] New patch without multiple OutputSetEDID calls

0001-randr12-bodge-in-continuous-timings-when-the-scaler.patch (text/plain), 2.57 KB, created by Stuart Bennett on 2009-02-08 06:35:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stuart Bennett

Created: 2009-02-08 06:35:17 UTC

Size: 2.57 KB

patch

obsolete

>From 7706ba9eb2e88ff7ae538eac72d798af9456e3fe Mon Sep 17 00:00:00 2001
>From: Stuart Bennett <sb476@cam.ac.uk>
>Date: Tue, 6 Jan 2009 16:23:33 +0000
>Subject: [PATCH] randr12: bodge-in continuous timings when the scaler is in use
>
>Similar to 3354e660b0744976871683ce226f17e873f26b50 in the intel driver, except
>I can't see much benefit in allowing bigger-than-native resolutions, so no sync
>range hacking
>
>A pity the xserver has no idea of scalers and so each driver ends up with a hack
>---
> src/nv_output.c |   19 +++++++++++++------
> 1 files changed, 13 insertions(+), 6 deletions(-)
>
>diff --git a/src/nv_output.c b/src/nv_output.c
>index ab13430..f1f8493 100644
>--- a/src/nv_output.c
>+++ b/src/nv_output.c
>@@ -158,7 +158,6 @@ static bool edid_sink_connected(xf86OutputPtr output)
> 		NVSetOwner(pNv, 0);	/* necessary? */
> 
> 	nv_connector->edid = xf86OutputGetEDID(output, nv_connector->pDDCBus);
>-	xf86OutputSetEDID(output, nv_connector->edid);
> 
> 	if (wastied)
> 		NVSetOwner(pNv, 0x4);
>@@ -208,7 +207,6 @@ nv_output_detect(xf86OutputPtr output)
> 				ret = XF86OutputStatusConnected;
> 		} else if (pNv->VBIOS.fp.ddc_permitted && pNv->VBIOS.fp.edid) {
> 			nv_connector->edid = xf86InterpretEDID(pScrn->scrnIndex, pNv->VBIOS.fp.edid);
>-			xf86OutputSetEDID(output, nv_connector->edid);
> 			ret = XF86OutputStatusConnected;
> 		}
> 	}
>@@ -276,18 +274,27 @@ nv_output_get_edid_modes(xf86OutputPtr output)
> {
> 	struct nouveau_connector *nv_connector = to_nouveau_connector(output);
> 	struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder;
>-	ScrnInfoPtr pScrn = output->scrn;
>+	enum nouveau_encoder_type enctype = nv_encoder->dcb->type;
> 	DisplayModePtr edid_modes;
> 
>+	if (enctype == OUTPUT_LVDS ||
>+	    (enctype == OUTPUT_TMDS && nv_encoder->scaling_mode != SCALE_PANEL))
>+		/* the digital scaler is not limited to modes given in the EDID,
>+		 * so enable the GTF bit in order that the xserver thinks
>+		 * continuous timing is available and adds the standard modes
>+		 */
>+		nv_connector->edid->features.msc |= 1;
>+
>+	xf86OutputSetEDID(output, nv_connector->edid);
> 	if (!(edid_modes = xf86OutputGetEDIDModes(output)))
> 		return edid_modes;
> 
>-	if (nv_encoder->dcb->type == OUTPUT_TMDS || nv_encoder->dcb->type == OUTPUT_LVDS)
>+	if (enctype == OUTPUT_LVDS || enctype == OUTPUT_TMDS)
> 		if (!get_native_mode_from_edid(output, edid_modes))
> 			return NULL;
> 
>-	if (nv_encoder->dcb->type == OUTPUT_LVDS)
>-		parse_lvds_manufacturer_table(pScrn, nv_encoder->native_mode->Clock);
>+	if (enctype == OUTPUT_LVDS)
>+		parse_lvds_manufacturer_table(output->scrn, nv_encoder->native_mode->Clock);
> 
> 	return edid_modes;
> }
>-- 
>1.6.0.2
>

Actions: View | Splinter Review

Attachments on bug 19203: 21734 | 21806 | 22643 | 22644 | 22645 | 22692

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.