diff options
| author | Eric Anholt <eric@anholt.net> | 2006-12-05 15:28:21 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-12-05 15:28:21 -0800 |
| commit | 58c247c6de56508b00eadf77b4c145c94134270d (patch) | |
| tree | 317861b6798008bc21b22a4231b768c70a71f0fb /src/i830_randr.c | |
| parent | 0b4c3e7bff790e1e99ace5036a41e96046335b04 (diff) | |
| parent | 2e8c927f9308069a82f25b65bb0c62bc5a156832 (diff) | |
Merge branch 'modesetting-origin' into modesetting
Conflicts:
src/i830_display.c
Diffstat (limited to 'src/i830_randr.c')
| -rw-r--r-- | src/i830_randr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/i830_randr.c b/src/i830_randr.c index dd70bba3..b12a2b71 100644 --- a/src/i830_randr.c +++ b/src/i830_randr.c @@ -713,7 +713,7 @@ xf86RandR12SetInfo12 (ScrnInfoPtr pScrn) subpixel = SubPixelHorizontalRGB; break; case I830_OUTPUT_ANALOG: - crtc_types = ((1 << 0) | (1 << 1)); + crtc_types = ((1 << 0)); clone_types = ((1 << I830_OUTPUT_ANALOG) | (1 << I830_OUTPUT_DVO) | (1 << I830_OUTPUT_SDVO)); @@ -903,6 +903,9 @@ xf86RandR12Init12 (ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; rrScrPrivPtr rp = rrGetScrPriv(pScreen); + if (xf86CrtcScreenInit (pScreen)) + return FALSE; + rp->rrGetInfo = xf86RandR12GetInfo12; rp->rrScreenSetSize = xf86RandR12ScreenSetSize; rp->rrCrtcSet = xf86RandR12CrtcSet; |