xf86-video-intel: Branch 'modesetting-keithp' - src/i830_randr.c
Keith Packard
keithp at kemper.freedesktop.org
Mon Nov 27 03:00:25 EET 2006
src/i830_randr.c | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
New commits:
diff-tree 71d4e3f2a4aa45e70c18f4ab445e7c1665df1892 (from 8967e01774b279de79a2d436cbad92da508f1a59)
Author: Keith Packard <keithp at neko.keithp.com>
Date: Tue Nov 21 00:04:53 2006 -0800
make modesetting-keithp compile against recent server
diff --git a/src/i830_randr.c b/src/i830_randr.c
index 0039b54..eddc331 100644
--- a/src/i830_randr.c
+++ b/src/i830_randr.c
@@ -531,7 +531,7 @@ I830RandRCrtcSet (ScreenPtr pScreen,
int y,
Rotation rotation,
int numOutputs,
- RROutputConfigPtr outputs)
+ RROutputPtr *outputs)
{
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
@@ -598,8 +598,6 @@ I830RandRSetInfo12 (ScreenPtr pScreen)
DisplayModePtr modes, mode;
xRRModeInfo modeInfo;
RRModePtr rrmode, *rrmodes;
- CARD32 possibleOptions = 0;
- CARD32 currentOptions = 0;
if (randrp->virtualX == -1 || randrp->virtualY == -1)
{
@@ -635,10 +633,6 @@ I830RandRSetInfo12 (ScreenPtr pScreen)
crtc_types = (1 << 1);
clone_types = (1 << I830_OUTPUT_LVDS);
subpixel = SubPixelHorizontalRGB;
- possibleOptions = (RROutputOptionScaleNone|
- RROutputOptionScaleMaxAspect |
- RROutputOptionScaleMax);
- currentOptions = RROutputOptionScaleMax;
break;
case I830_OUTPUT_TVOUT:
crtc_types = ((1 << 0) |
@@ -672,8 +666,6 @@ I830RandRSetInfo12 (ScreenPtr pScreen)
RROutputSetCrtc (randrp->outputs[i], crtc);
RROutputSetPhysicalSize(randrp->outputs[i], pI830->output[i].mm_width,
pI830->output[i].mm_height);
- RROutputSetPossibleOptions (randrp->outputs[i], possibleOptions);
- RROutputSetCurrentOptions (randrp->outputs[i], currentOptions);
nmode = 0;
npreferred = 0;
rrmodes = NULL;
@@ -707,7 +699,7 @@ I830RandRSetInfo12 (ScreenPtr pScreen)
modeInfo.vTotal = mode->VTotal;
modeInfo.modeFlags = mode->Flags;
- rrmode = RRModeGet (pScreen, &modeInfo, mode->name);
+ rrmode = RRModeGet (&modeInfo, mode->name);
rrmode->devPrivate = mode;
if (rrmode) {
rrmodes[nmode++] = rrmode;
@@ -787,17 +779,18 @@ I830RandRCreateScreenResources12 (Screen
*/
for (i = 0; i < pI830->num_pipes; i++)
{
- randrp->crtcs[i] = RRCrtcCreate (pScreen, (void *) i);
+ randrp->crtcs[i] = RRCrtcCreate ((void *) i);
RRCrtcGammaSetSize (randrp->crtcs[i], 256);
+ RRCrtcAttachScreen (randrp->crtcs[i], pScreen);
}
for (i = 0; i < pI830->num_outputs; i++)
{
output = &pI830->output[i];
name = i830_output_type_names[output->type];
- randrp->outputs[i] = RROutputCreate (pScreen,
- name, strlen (name),
+ randrp->outputs[i] = RROutputCreate (name, strlen (name),
(void *) i);
+ RROutputAttachScreen (randrp->outputs[i], pScreen);
}
mode = pScrn->currentMode;
More information about the xorg-commit
mailing list