[Intel-gfx] [PATH v2 6/6] Xv: dont call intel_wait_for_scanline on Sandybridge

[Chris Wilson]

On Thu, 28 Oct 2010 23:42:05 -0700, Kenneth Graunke <kenneth at whitecape.org> wrote:
> On Tuesday 26 October 2010 19:17:33 Xiang, Haihao wrote:
> > MI_LOAD_SCAN_LINE_INCL command is not available on sandybridge.
> > 
> > Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>
> > ---
> >  src/intel_video.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/src/intel_video.c b/src/intel_video.c
> > index afc2405..cdff149 100644
> > --- a/src/intel_video.c
> > +++ b/src/intel_video.c
> > @@ -1578,7 +1578,7 @@ I830PutImageTextured(ScrnInfoPtr scrn,
> >  			return BadAlloc;
> >  	}
> > 
> > -	if (crtc && adaptor_priv->SyncToVblank != 0) {
> > +	if (crtc && adaptor_priv->SyncToVblank != 0 && INTEL_INFO(intel)->gen <
> > 60) { intel_wait_for_scanline(scrn, pixmap, crtc, clipBoxes);
> >  	}
> 
> I think you mean < 6 here (not 60)?

No, 60. It's generation*10 + minor revision, just so that g33 and g45
could be easily identified from their gen3 and gen4 brethen.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre