summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-04-21 15:17:31 -0700
committerEric Anholt <eric@anholt.net>2009-04-21 15:28:59 -0700
commit04ed92e3db8d9fcf2a1089ed433ab67bf0969655 (patch)
tree542fd32abc839b90eff605920b00d46fd476ebf2
parentab2c988767aec854d3c1702bee1e5a06bd00870c (diff)
downloadxorg-driver-xf86-video-intel-04ed92e3db8d9fcf2a1089ed433ab67bf0969655.tar.gz
Remove dead xoffset/yoffset from pre-randr.
-rw-r--r--src/i830.h4
-rw-r--r--src/i830_driver.c5
2 files changed, 1 insertions, 8 deletions
diff --git a/src/i830.h b/src/i830.h
index 49e08ce4..b252f56c 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -607,10 +607,6 @@ typedef struct _I830Rec {
Bool suspended;
Bool leaving;
- /* fbOffset converted to (x, y). */
- int xoffset;
- int yoffset;
-
unsigned int SaveGeneration;
OsTimerPtr devicesTimer;
diff --git a/src/i830_driver.c b/src/i830_driver.c
index fabf94a6..f1ea5115 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3147,9 +3147,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
pScrn->fbOffset = pI830->front_buffer->offset;
- pI830->xoffset = (pScrn->fbOffset / pI830->cpp) % pScrn->displayWidth;
- pI830->yoffset = (pScrn->fbOffset / pI830->cpp) / pScrn->displayWidth;
-
if (!pI830->use_drm_mode) {
vgaHWSetMmioFuncs(hwp, pI830->MMIOBase, 0);
vgaHWGetIOBase(hwp);
@@ -3330,7 +3327,7 @@ i830AdjustFrame(int scrnIndex, int x, int y, int flags)
xf86CrtcPtr crtc = output->crtc;
DPRINTF(PFX, "i830AdjustFrame: y = %d (+ %d), x = %d (+ %d)\n",
- x, pI830->xoffset, y, pI830->yoffset);
+ x, crtc->desiredX, y, crtc->desiredY);
if (pI830->use_drm_mode)
return;