On Fri, Oct 26, 2012 at 09:25:21AM -0700, Jesse Barnes wrote: > On Thu, 25 Oct 2012 18:06:19 +0100 > Damien Lespiau <damien.lespiau at gmail.com> wrote: > > > From: Damien Lespiau <damien.lespiau at intel.com> > > > > Just like HSW, VLV does not have a sprite scale. Set > > intel_plane->can_scale accordingly. > > > > Signed-off-by: Damien Lespiau <damien.lespiau at intel.com> > > --- > > drivers/gpu/drm/i915/intel_sprite.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > > index 24b8231..9c378f5 100644 > > --- a/drivers/gpu/drm/i915/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/intel_sprite.c > > @@ -700,7 +700,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe) > > break; > > > > case 7: > > - if (IS_HASWELL(dev)) > > + if (IS_HASWELL(dev) || IS_VALLEYVIEW(dev)) > > intel_plane->can_scale = false; > > else > > intel_plane->can_scale = true; > > Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org> > > We could also set it to true if the gen >= 7 and leave it as false > otherwise. Either way though is fine. Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
