summaryrefslogtreecommitdiff
path: root/src/i830_lvds.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2007-01-29 21:25:13 -0800
committerKeith Packard <keithp@neko.keithp.com>2007-01-29 21:25:13 -0800
commitc8581254cb811f76aa6eae49d74489b543b3eb05 (patch)
tree95de90111a0088a78856647b3595db52787ad356 /src/i830_lvds.c
parent9da1791eeca446cd59e2e7d0803e8a7920dbbea5 (diff)
parentd329fa121b2401cadb991c2854e077cfa68e15e8 (diff)
Merge branch 'modesetting-rotation' into modesetting
This adds reasonably driver-independent rotation support to the common layer. The piece required in the driver is to allocate and redirect the crtc to a shadow frame buffer. The driver uses Render to perform the actual rotation operation (which leaves us free to do fun projective transforms at some point in the future :-).
Diffstat (limited to 'src/i830_lvds.c')
-rw-r--r--src/i830_lvds.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c
index 0092dedb..59af13b9 100644
--- a/src/i830_lvds.c
+++ b/src/i830_lvds.c
@@ -270,10 +270,10 @@ i830_lvds_get_modes(xf86OutputPtr output)
xf86MonPtr edid_mon;
DisplayModePtr modes;
- edid_mon = i830_xf86OutputGetEDID (output, intel_output->pDDCBus);
- i830_xf86OutputSetEDID (output, edid_mon);
+ edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
+ xf86OutputSetEDID (output, edid_mon);
- modes = i830_xf86OutputGetEDIDModes (output);
+ modes = xf86OutputGetEDIDModes (output);
if (modes != NULL)
return modes;