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

sna: Remove some obsolete Options 

Throttling and delayed-flush are now redundant.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-01-01 15:49:12 +00:00
parent 65924da91d
commit 372c14aae8
5 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel_options.c
View File

@ -22,9 +22,7 @@ const OptionInfoRec intel_options[] = {
{OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, 1},
#endif
#ifdef USE_SNA
{OPTION_THROTTLE, "Throttle", OPTV_BOOLEAN, {0}, 1},
{OPTION_ZAPHOD, "ZaphodHeads", OPTV_STRING, {0}, 0},
{OPTION_DELAYED_FLUSH, "DelayedFlush", OPTV_BOOLEAN, {0}, 1},
{OPTION_TEAR_FREE, "TearFree", OPTV_BOOLEAN, {0}, 0},
{OPTION_CRTC_PIXMAPS, "PerCrtcPixmaps", OPTV_BOOLEAN, {0}, 0},
#endif

2
src/intel_options.h
View File

@ -29,9 +29,7 @@ enum intel_options {
#define INTEL_XVMC 1
#endif
#ifdef USE_SNA
OPTION_THROTTLE,
OPTION_ZAPHOD,
OPTION_DELAYED_FLUSH,
OPTION_TEAR_FREE,
OPTION_CRTC_PIXMAPS,
#endif

9
src/sna/sna.h
View File

@ -193,13 +193,11 @@ struct sna {
ScrnInfoPtr scrn;
unsigned flags;
#define SNA_NO_THROTTLE 0x1
#define SNA_NO_DELAYED_FLUSH 0x2
#define SNA_NO_WAIT 0x4
#define SNA_NO_FLIP 0x8
#define SNA_NO_WAIT 0x1
#define SNA_NO_FLIP 0x2
#define SNA_TRIPLE_BUFFER 0x4
#define SNA_TEAR_FREE 0x10
#define SNA_FORCE_SHADOW 0x20
#define SNA_TRIPLE_BUFFER 0x40
unsigned watch_flush;
@ -234,7 +232,6 @@ struct sna {
unsigned int tiling;
#define SNA_TILING_FB 0x1
#define SNA_TILING_2D 0x2
#define SNA_TILING_3D 0x4
#define SNA_TILING_ALL (~0)
EntityInfoPtr pEnt;

12
src/sna/sna_accel.c
View File

@ -13860,9 +13860,6 @@ static bool sna_accel_do_flush(struct sna *sna)
return false;
}
if (sna->flags & SNA_NO_DELAYED_FLUSH)
return true;
interval = sna->vblank_interval ?: 20;
if (sna->timer_active & (1<<(FLUSH_TIMER))) {
int32_t delta = sna->timer_expire[FLUSH_TIMER] - TIME;
@ -13885,9 +13882,6 @@ static bool sna_accel_do_flush(struct sna *sna)
static bool sna_accel_do_throttle(struct sna *sna)
{
if (sna->flags & SNA_NO_THROTTLE)
return false;
if (sna->timer_active & (1<<(THROTTLE_TIMER))) {
int32_t delta = sna->timer_expire[THROTTLE_TIMER] - TIME;
if (delta <= 3) {
@ -14405,15 +14399,13 @@ void sna_accel_block_handler(struct sna *sna, struct timeval **tv)
if (sna_accel_do_flush(sna))
sna_accel_flush(sna);
assert(sna->flags & SNA_NO_DELAYED_FLUSH ||
sna_accel_scanout(sna) == NULL ||
assert(sna_accel_scanout(sna) == NULL ||
sna_accel_scanout(sna)->gpu_bo->exec == NULL ||
sna->timer_active & (1<<(FLUSH_TIMER)));
if (sna_accel_do_throttle(sna))
sna_accel_throttle(sna);
assert(sna->flags & SNA_NO_THROTTLE ||
!sna->kgem.need_retire ||
assert(!sna->kgem.need_retire ||
sna->timer_active & (1<<(THROTTLE_TIMER)));
if (sna_accel_do_expire(sna))

10
src/sna/sna_driver.c
View File

@ -563,10 +563,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
sna->tiling &= ~SNA_TILING_FB;
sna->flags = 0;
if (!xf86ReturnOptValBool(sna->Options, OPTION_THROTTLE, TRUE))
sna->flags |= SNA_NO_THROTTLE;
if (!xf86ReturnOptValBool(sna->Options, OPTION_DELAYED_FLUSH, TRUE))
sna->flags |= SNA_NO_DELAYED_FLUSH;
if (!xf86ReturnOptValBool(sna->Options, OPTION_SWAPBUFFERS_WAIT, TRUE))
sna->flags |= SNA_NO_WAIT;
if (xf86ReturnOptValBool(sna->Options, OPTION_TRIPLE_BUFFER, TRUE))
@ -583,12 +579,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
sna->tiling & SNA_TILING_FB ? "tiled" : "linear");
xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n",
sna->tiling & SNA_TILING_2D ? "tiled" : "linear");
xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "3D buffers %s\n",
sna->tiling & SNA_TILING_3D ? "tiled" : "linear");
xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Throttling %sabled\n",
sna->flags & SNA_NO_THROTTLE ? "dis" : "en");
xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Delayed flush %sabled\n",
sna->flags & SNA_NO_DELAYED_FLUSH ? "dis" : "en");
xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "\"Tear free\" %sabled\n",
sna->flags & SNA_TEAR_FREE ? "en" : "dis");
xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Forcing per-crtc-pixmaps? %s\n",