Attachment 903020 Details for Bug 1105718 – This is basically the upstream commit from Jan 6th by Chris Wilson

[patch] This is basically the upstream commit from Jan 6th by Chris Wilson

uxa-blackfix.patch (text/plain), 2.86 KB, created by Gary Gatling on 2014-06-06 19:36:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Gatling

Created: 2014-06-06 19:36:59 UTC

Size: 2.86 KB

patch

obsolete

>diff -up src/sna/sna_display.c.blackfix src/sna/sna_display.c
>--- src/sna/sna_display.c.blackfix	2014-06-06 14:45:26.027139114 -0400
>+++ src/sna/sna_display.c	2014-06-06 14:46:29.466182791 -0400
>@@ -2091,7 +2091,7 @@ sna_output_dpms(xf86OutputPtr output, in
> 	 * record the value before the kernel modifies it
> 	 * and reapply it afterwards.
> 	 */
>-	if (dpms == DPMSModeOff)
>+	if (dpms != DPMSModeOn)
> 		sna_output_dpms_backlight(output,
> 					  sna_output->dpms_mode,
> 					  dpms);
>@@ -2101,7 +2101,7 @@ sna_output_dpms(xf86OutputPtr output, in
> 				    sna_output->dpms_id,
> 				    dpms);
> 
>-	if (dpms != DPMSModeOff)
>+	if (dpms == DPMSModeOn)
> 		sna_output_dpms_backlight(output,
> 					  sna_output->dpms_mode,
> 					  dpms);
>diff -up src/uxa/intel_display.c.blackfix src/uxa/intel_display.c
>--- src/uxa/intel_display.c.blackfix	2014-06-06 14:42:52.827034416 -0400
>+++ src/uxa/intel_display.c	2014-06-06 14:44:52.970116462 -0400
>@@ -1180,7 +1180,7 @@ intel_output_create_ranged_atom(xf86Outp
> 
> 	err = RRChangeOutputProperty(output->randr_output, *atom, XA_INTEGER,
> 				     32, PropModeReplace, 1, &value, FALSE,
>-				     TRUE);
>+				     FALSE);
> 	if (err != 0)
> 		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
> 			   "RRChangeOutputProperty error, %d\n", err);
>@@ -1263,7 +1263,7 @@ intel_output_create_resources(xf86Output
> 					break;
> 			/* there's always a matching value */
> 			err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
>-						     XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, TRUE);
>+						     XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, FALSE);
> 			if (err != 0) {
> 				xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
> 					   "RRChangeOutputProperty error, %d\n", err);
>@@ -1383,7 +1383,7 @@ intel_output_get_property(xf86OutputPtr
> 
> 		err = RRChangeOutputProperty(output->randr_output, property,
> 					     XA_INTEGER, 32, PropModeReplace, 1, &val,
>-					     FALSE, TRUE);
>+					     FALSE, FALSE);
> 		if (err != 0) {
> 			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
> 				   "RRChangeOutputProperty error, %d\n", err);
>diff -up src/uxa/intel_dri.c.blackfix src/uxa/intel_dri.c
>--- src/uxa/intel_dri.c.blackfix	2014-06-06 14:39:46.732908201 -0400
>+++ src/uxa/intel_dri.c	2014-06-06 14:41:46.360989031 -0400
>@@ -580,7 +580,7 @@ I830DRI2DrawablePipe(DrawablePtr pDraw)
> 	ScreenPtr pScreen = pDraw->pScreen;
> 	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
> 	BoxRec box, crtcbox;
>-	xf86CrtcPtr crtc;
>+	xf86CrtcPtr crtc = NULL;
> 	int pipe = -1;
> 
> 	box.x1 = pDraw->x;
>@@ -588,7 +588,8 @@ I830DRI2DrawablePipe(DrawablePtr pDraw)
> 	box.x2 = box.x1 + pDraw->width;
> 	box.y2 = box.y1 + pDraw->height;
> 
>-	crtc = intel_covering_crtc(pScrn, &box, NULL, &crtcbox);
>+	if (pDraw->type != DRAWABLE_PIXMAP)
>+		crtc = intel_covering_crtc(pScrn, &box, NULL, &crtcbox);
> 
> 	/* Make sure the CRTC is valid and this is the real front buffer */
> 	if (crtc != NULL && !crtc->rotatedData)

Actions: View | Diff

Attachments on bug 1105718: 903020