From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm/i915: Error out when trying to set a y-tiled as a sprite Date: Wed, 31 Oct 2012 19:28:36 +0200 Message-ID: <20121031172836.GH3791@intel.com> References: <1351523691-21106-1-git-send-email-damien.lespiau@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 80D979E7A1 for ; Wed, 31 Oct 2012 10:28:40 -0700 (PDT) Content-Disposition: inline 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, Oct 29, 2012 at 03:14:51PM +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/i= ntel_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 d= rm_crtc *crtc, > if (intel_plane->pipe !=3D 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; > + } I'm confused why this is necessary. intel_pin_and_fence_fb_obj() already has the check, so things should never go much further than this. Futhermore someone can still go and change the tiling mode after this point. Or indeed even at the same time as we're not holding struct_mutex here (but this would be caught by intel_pin_and_fence_fb_obj()). -- = Ville Syrj=E4l=E4 Intel OTC