From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH] drm/i915: Error out when trying to set a y-tiled as a sprite Date: Fri, 26 Oct 2012 10:42:54 -0700 Message-ID: <20121026104254.6d4896ef@jbarnes-desktop> References: <1351272650-8402-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 BFC9F9EAF2 for ; Fri, 26 Oct 2012 10:42:59 -0700 (PDT) In-Reply-To: <1351272650-8402-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 Fri, 26 Oct 2012 18:30:50 +0100 Damien Lespiau wrote: > From: Damien Lespiau > > Signed-off-by: Damien Lespiau > --- > drivers/gpu/drm/i915/intel_sprite.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index 3434b6e..aa8d09b 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -465,6 +465,11 @@ 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 */ > + if (!(obj->tiling_mode == I915_TILING_NONE || > + obj->tiling_mode == I915_TILING_X)) > + 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. Do we not catch this when we make the fb? If not we may want to do this there... -- Jesse Barnes, Intel Open Source Technology Center