forked from pool/xorg-x11-server
95 lines
2.5 KiB
Diff
95 lines
2.5 KiB
Diff
|
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
|
||
|
|
index 6c3bf8d..889be6f 100644
|
||
|
|
--- a/hw/xfree86/modes/xf86RandR12.c
|
||
|
|
+++ b/hw/xfree86/modes/xf86RandR12.c
|
||
|
|
@@ -951,7 +951,6 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
- RROutputSetCrtc (output->randr_output, randr_crtc);
|
||
|
|
RROutputSetPhysicalSize(output->randr_output,
|
||
|
|
output->mm_width,
|
||
|
|
output->mm_height);
|
||
|
|
diff --git a/randr/randrstr.h b/randr/randrstr.h
|
||
|
|
index 4cc3a46..bd19fe9 100644
|
||
|
|
--- a/randr/randrstr.h
|
||
|
|
+++ b/randr/randrstr.h
|
||
|
|
@@ -694,9 +694,6 @@ RROutputSetCrtcs (RROutputPtr output,
|
||
|
|
RRCrtcPtr *crtcs,
|
||
|
|
int numCrtcs);
|
||
|
|
|
||
|
|
-void
|
||
|
|
-RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc);
|
||
|
|
-
|
||
|
|
Bool
|
||
|
|
RROutputSetConnection (RROutputPtr output,
|
||
|
|
CARD8 connection);
|
||
|
|
@@ -802,7 +799,6 @@ Query state:
|
||
|
|
1.2:
|
||
|
|
RRScreenSetSizeRange
|
||
|
|
RROutputSetCrtcs
|
||
|
|
- RROutputSetCrtc
|
||
|
|
RRModeGet
|
||
|
|
RROutputSetModes
|
||
|
|
RROutputSetConnection
|
||
|
|
@@ -822,7 +818,6 @@ Query state:
|
||
|
|
RRCrtcCreate
|
||
|
|
RROutputCreate
|
||
|
|
RROutputSetCrtcs
|
||
|
|
- RROutputSetCrtc
|
||
|
|
RROutputSetConnection
|
||
|
|
RROutputSetSubpixelOrder
|
||
|
|
RROldModeAdd • This adds modes one-at-a-time
|
||
|
|
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
|
||
|
|
index 3ce9e21..db5007e 100644
|
||
|
|
--- a/randr/rrcrtc.c
|
||
|
|
+++ b/randr/rrcrtc.c
|
||
|
|
@@ -134,6 +134,7 @@ RRCrtcNotify (RRCrtcPtr crtc,
|
||
|
|
break;
|
||
|
|
if (j == crtc->numOutputs)
|
||
|
|
{
|
||
|
|
+ outputs[i]->crtc = crtc;
|
||
|
|
RROutputChanged (outputs[i], FALSE);
|
||
|
|
RRCrtcChanged (crtc, FALSE);
|
||
|
|
}
|
||
|
|
@@ -149,6 +150,7 @@ RRCrtcNotify (RRCrtcPtr crtc,
|
||
|
|
break;
|
||
|
|
if (i == numOutputs)
|
||
|
|
{
|
||
|
|
+ crtc->outputs[j]->crtc = NULL;
|
||
|
|
RROutputChanged (crtc->outputs[j], FALSE);
|
||
|
|
RRCrtcChanged (crtc, FALSE);
|
||
|
|
}
|
||
|
|
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
|
||
|
|
index 5ef1a6b..858b1ed 100644
|
||
|
|
--- a/randr/rrinfo.c
|
||
|
|
+++ b/randr/rrinfo.c
|
||
|
|
@@ -98,7 +98,6 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
|
||
|
|
if (!output)
|
||
|
|
return;
|
||
|
|
RROutputSetCrtcs (output, &crtc, 1);
|
||
|
|
- RROutputSetCrtc (output, crtc);
|
||
|
|
RROutputSetConnection (output, RR_Connected);
|
||
|
|
#ifdef RENDER
|
||
|
|
RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
|
||
|
|
diff --git a/randr/rroutput.c b/randr/rroutput.c
|
||
|
|
index e001162..1e1cfa5 100644
|
||
|
|
--- a/randr/rroutput.c
|
||
|
|
+++ b/randr/rroutput.c
|
||
|
|
@@ -286,15 +286,6 @@ RROutputSetCrtcs (RROutputPtr output,
|
||
|
|
return TRUE;
|
||
|
|
}
|
||
|
|
|
||
|
|
-void
|
||
|
|
-RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc)
|
||
|
|
-{
|
||
|
|
- if (output->crtc == crtc)
|
||
|
|
- return;
|
||
|
|
- output->crtc = crtc;
|
||
|
|
- RROutputChanged (output, FALSE);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
Bool
|
||
|
|
RROutputSetConnection (RROutputPtr output,
|
||
|
|
CARD8 connection)
|