From patchwork Mon Oct 29 15:14:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Lespiau X-Patchwork-Id: 1663951 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id A59EA3FDDA for ; Mon, 29 Oct 2012 15:15:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 717889F672 for ; Mon, 29 Oct 2012 08:15:12 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C4889E7E9 for ; Mon, 29 Oct 2012 08:14:57 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hj13so1704986wib.12 for ; Mon, 29 Oct 2012 08:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=fQc/iM8ZEUp4mXXx4+SJ6BH7nZ+tQGrrDKKKErlyp7M=; b=SiPuT86OsExuTd67rpfsO5vv+iKwPlh6CrjAT5fijh6e55CJmceigdjM+s70Kx3Wab BTDQbCS64QD+L3I1RsGfettRlDPrtgRGa5BwmS4ZDSJE0uZrs+XnK4Fl/1s/H2nRGNY2 6+PryvjvlbCWEwlBxm8vIwE/KHdeo2UNE+2QQZdvtcvkwE3mgi9/Cj6Bmz5wDg/G57YD rZ89DZiBNgwSmnSdkreZBq0lrqjfwDAPni/0YmXn+v+6ViyZ4Oicjcm1rJnAECN0zwET pkd/nH61ya4rdnOVkvYmOdKzpf7/QvVqbr13UEEZxkmiGW38iFtvb6WkJdDeMNV1pNRY TqvQ== Received: by 10.216.210.16 with SMTP id t16mr16140459weo.175.1351523697179; Mon, 29 Oct 2012 08:14:57 -0700 (PDT) Received: from localhost.localdomain ([83.217.123.106]) by mx.google.com with ESMTPS id p4sm11736534wix.0.2012.10.29.08.14.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Oct 2012 08:14:55 -0700 (PDT) From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 29 Oct 2012 15:14:51 +0000 Message-Id: <1351523691-21106-1-git-send-email-damien.lespiau@gmail.com> X-Mailer: git-send-email 1.7.7.5 Subject: [Intel-gfx] [PATCH v2] drm/i915: Error out when trying to set a y-tiled as a sprite X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org From: Damien Lespiau v2: Use a switch for consistency (Chris Wilson) Signed-off-by: Damien Lespiau Reviewed-by: Jesse Barnes --- 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.