Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline

This commit is contained in:
Nian Wu 2007-03-24 17:00:13 +08:00
parent d874aa3159 1e6e675524
commit 6de3edcb52
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/i830_driver.c
View File

@ -2739,7 +2739,7 @@ i830AdjustFrame(int scrnIndex, int x, int y, int flags)
{
/* Sync the engine before adjust frame */
i830WaitSync(pScrn);
i830PipeSetBase(crtc, output->initial_x + x, output->initial_y + y);
i830PipeSetBase(crtc, crtc->desiredX + x, crtc->desiredY + y);
crtc->x = output->initial_x + x;
crtc->y = output->initial_y + y;
}
@ -2856,8 +2856,6 @@ I830EnterVT(int scrnIndex, int flags)
ResetState(pScrn, TRUE);
SetHWOperatingState(pScrn);
pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
#ifdef XF86DRI
if (pI830->directRenderingEnabled) {
@ -2910,6 +2908,7 @@ I830EnterVT(int scrnIndex, int flags)
/* Force invarient 3D state to be emitted */
*pI830->used3D = 1<<31;
pI830->last_3d = LAST_3D_OTHER;
return TRUE;
}

14
src/i830_tv.c
View File

@ -1486,7 +1486,6 @@ i830_tv_create_resources(xf86OutputPtr output)
strlen (dev_priv->tv_format),
dev_priv->tv_format,
FALSE, TRUE);
RRPostPendingProperty (output->randr_output, tv_format_atom);
if (err != 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"RRChangeOutputProperty error, %d\n", err);
@ -1513,7 +1512,6 @@ i830_tv_create_resources(xf86OutputPtr output)
XA_INTEGER, 32, PropModeReplace,
1, &dev_priv->margin[i],
FALSE, TRUE);
RRPostPendingProperty (output->randr_output, margin_atoms[i]);
if (err != 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"RRChangeOutputProperty error, %d\n", err);
@ -1522,16 +1520,6 @@ i830_tv_create_resources(xf86OutputPtr output)
#endif /* RANDR_12_INTERFACE */
}
static void
i830_tv_commit (xf86OutputPtr output)
{
#ifdef RANDR_12_INTERFACE
if (output->randr_output)
RRPostPendingProperty (output->randr_output, tv_format_atom);
#endif
i830_output_commit (output);
}
#ifdef RANDR_12_INTERFACE
static Bool
i830_tv_set_property(xf86OutputPtr output, Atom property,
@ -1593,7 +1581,7 @@ static const xf86OutputFuncsRec i830_tv_output_funcs = {
.mode_fixup = i830_tv_mode_fixup,
.prepare = i830_output_prepare,
.mode_set = i830_tv_mode_set,
.commit = i830_tv_commit,
.commit = i830_output_commit,
.detect = i830_tv_detect,
.get_modes = i830_tv_get_modes,
.destroy = i830_tv_destroy,