diff options
| author | Paul Menzel <paulepanter@users.sourceforge.net> | 2009-06-07 22:08:05 +0200 |
|---|---|---|
| committer | Paul Menzel <paulepanter@users.sourceforge.net> | 2009-06-07 22:08:05 +0200 |
| commit | 5cdafb61c72cfc9c0daddcb2dae9b981e8f5d8b8 (patch) | |
| tree | 8acb61c61b70d126c2f2b965d5a6ac3898968fb1 /src/i810_driver.c | |
| parent | be5e8111a0b6b5ff3d643bea6f8728637ae4d070 (diff) | |
| parent | a7690d9f0b9a3e0628f51635ba78117b614edf1b (diff) | |
| download | xf86-video-intel-frc-debian-unstable-with-frc-patches.tar.gz xf86-video-intel-frc-debian-unstable-with-frc-patches.tar.bz2 | |
Merge branch 'upstream-unstable' into dufdebian-unstable-with-frc-patches
Diffstat (limited to 'src/i810_driver.c')
| -rw-r--r-- | src/i810_driver.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/i810_driver.c b/src/i810_driver.c index fe4bd626..c2768bef 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -268,7 +268,13 @@ typedef enum { OPTION_NO_DDC, OPTION_SHOW_CACHE, OPTION_XVMC_SURFACES, - OPTION_PAGEFLIP + OPTION_PAGEFLIP, + OPTION_SYNC_FIELDS, + OPTION_YSCALE_FTUNE, + OPTION_YRGB_VPHASE, + OPTION_UV_VPHASE, + OPTION_SCHED_PRIO, + OPTION_SYF_DEBUG, } I810Opts; static const OptionInfoRec I810Options[] = { @@ -281,7 +287,13 @@ static const OptionInfoRec I810Options[] = { {OPTION_NO_DDC, "NoDDC", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_SHOW_CACHE, "ShowCache", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_XVMC_SURFACES, "XvMCSurfaces", OPTV_INTEGER, {0}, FALSE}, - {OPTION_PAGEFLIP, "PageFlip", OPTV_BOOLEAN, {0}, FALSE}, + {OPTION_PAGEFLIP, "PageFlip", OPTV_BOOLEAN, {0}, FALSE}, + {OPTION_SYNC_FIELDS, "SyncFields", OPTV_BOOLEAN, {0}, FALSE}, + {OPTION_YSCALE_FTUNE, "SF_YScaleFineTune",OPTV_INTEGER,{0}, FALSE}, + {OPTION_YRGB_VPHASE, "SF_YRGB_VPhase",OPTV_INTEGER, {0}, FALSE}, + {OPTION_UV_VPHASE, "SF_UV_VPhase", OPTV_INTEGER, {0}, FALSE}, + {OPTION_SCHED_PRIO, "SF_SchedPrio", OPTV_INTEGER, {0}, FALSE}, + {OPTION_SYF_DEBUG, "SF_Debug", OPTV_INTEGER, {0}, FALSE}, {-1, NULL, OPTV_NONE, {0}, FALSE} }; /* *INDENT-ON* */ @@ -2777,7 +2789,9 @@ I810ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) xf86DrvMsg(scrnIndex, X_PROBED, "Removing interlaced mode \"%s\"\n", mode->name); } +#if 0 /* allow interlaced mode */ return MODE_BAD; +#endif } return MODE_OK; } |