On Mon, Oct 29, 2012 at 09:33:24AM -0700, Jesse Barnes wrote:
> On Mon, 29 Oct 2012 15:14:51 +0000
> Damien Lespiau <damien.lespiau at gmail.com> wrote:
>
> > From: Damien Lespiau <damien.lespiau at intel.com>
> >
> > v2: Use a switch for consistency (Chris Wilson)
> >
> > Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_sprite.c | 9 +++++++++
> > 1 files changed, 9 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> > index 87c8f1b..03307be 100644
> > --- a/drivers/gpu/drm/i915/intel_sprite.c
> > +++ b/drivers/gpu/drm/i915/intel_sprite.c
> > @@ -466,6 +466,15 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
> > if (intel_plane->pipe != intel_crtc->pipe)
> > return -EINVAL;
> >
> > + /* Sprite planes can be linear or x-tiled surfaces */
> > + switch (obj->tiling_mode) {
> > + case I915_TILING_NONE:
> > + case I915_TILING_X:
> > + break;
> > + default:
> > + return -EINVAL;
> > + }
> > +
> > /*
> > * Clamp the width & height into the visible area. Note we don't
> > * try to scale the source if part of the visible region is offscreen.
>
> Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
