From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH v2] drm/i915: Error out when trying to set a y-tiled as a sprite Date: Mon, 29 Oct 2012 09:33:24 -0700 Message-ID: <20121029093324.06063a91@jbarnes-desktop> References: <1351523691-21106-1-git-send-email-damien.lespiau@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy11-pub.bluehost.com (oproxy11-pub.bluehost.com [173.254.64.10]) by gabe.freedesktop.org (Postfix) with SMTP id CA1179F70E for ; Mon, 29 Oct 2012 09:33:19 -0700 (PDT) In-Reply-To: <1351523691-21106-1-git-send-email-damien.lespiau@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Damien Lespiau Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, 29 Oct 2012 15:14:51 +0000 Damien Lespiau wrote: > From: Damien Lespiau > > v2: Use a switch for consistency (Chris Wilson) > > Signed-off-by: Damien Lespiau > --- > 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 -- Jesse Barnes, Intel Open Source Technology Center