From patchwork Tue Dec 18 18:31:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 1893431 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id F1CC2DF2F6 for ; Tue, 18 Dec 2012 18:46:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E230EE5D51 for ; Tue, 18 Dec 2012 10:46:02 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from orsmga101.jf.intel.com (mga06.intel.com [134.134.136.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 05808E63BF for ; Tue, 18 Dec 2012 10:35:17 -0800 (PST) Received: from mail-pb0-f70.google.com ([209.85.160.70]) by mga02.intel.com with ESMTP/TLS/RC4-SHA; 18 Dec 2012 10:35:16 -0800 Received: by mail-pb0-f70.google.com with SMTP id rp2so917302pbb.5 for ; Tue, 18 Dec 2012 10:35:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=CAU+6aho9H+0Hyyus1xb6MuEBqQkxa++l3InZb8ZWhE=; b=BUIsuB4I6a6RfrDDa4UsWzgs/9g5IyoJym4/SF38fFf7tLw/7yK/KqBljH+cho3hXC boosrfjc5ubGpPsylbUKzny7lR626dwWGP/QvzHNIE34eE5JvXiJ6ETHEOnEMYB4ADbY /VMIpvBTFoXFkLVEndjnTmXAJFx/VGwg9L8IbWK+wXuzJXfrwdS1KP4B5wNS8nwB4Pcn HS6oJVAePAf6aUU33D3DuLSbzzFwab8PiIDLx5h4pjXqG0lolUPnYiGZ3TQ4dKjUulN3 R2+LBtTtIjMv1/+jQk2aWvDLhv+liEz3RVP8R2iRKE9bEP9Wy0VcafXwcEmv80eZXA4K M44w== X-Received: by 10.68.213.202 with SMTP id nu10mr9598345pbc.91.1355855716525; Tue, 18 Dec 2012 10:35:16 -0800 (PST) X-Received: by 10.68.213.202 with SMTP id nu10mr9598323pbc.91.1355855716387; Tue, 18 Dec 2012 10:35:16 -0800 (PST) Received: from norris.jf.intel.com ([192.55.55.41]) by mx.google.com with ESMTPS id ip8sm1552525pbc.36.2012.12.18.10.35.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 10:35:15 -0800 (PST) From: Ben Widawsky To: intel-gfx@lists.freedesktop.org Date: Tue, 18 Dec 2012 10:31:23 -0800 Message-Id: <1355855487-20424-2-git-send-email-ben@bwidawsk.net> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1355855487-20424-1-git-send-email-ben@bwidawsk.net> References: <1355855487-20424-1-git-send-email-ben@bwidawsk.net> X-Gm-Message-State: ALoCoQmIJ857DdEvog9GEy+i27cUyljmJfTykYEZSGIGI4Y+OlIlcuInKBmM6HBQWBIlOXX1M2ORtJQiRUtZtEj0K8mKO1HLzI3q+WmKeobjmxK3cdJqbk24ZV6Yq8bnxA6f1KqHo0MGTaY3rCW7vIot7JVjPFl4DKyxtdSzntugm9ppm0OEVe4= X-Mailman-Approved-At: Tue, 18 Dec 2012 10:45:20 -0800 Cc: Ben Widawsky Subject: [Intel-gfx] [PATCH 2/6] drm/i915: Bug on unsupported swizzled platforms 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 Signed-off-by: Ben Widawsky Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/i915_gem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index bf3b0c7..4c6f043 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3887,8 +3887,10 @@ void i915_gem_init_swizzling(struct drm_device *dev) I915_WRITE(TILECTL, I915_READ(TILECTL) | TILECTL_SWZCTL); if (IS_GEN6(dev)) I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_SNB)); - else + else if (IS_GEN7(dev)) I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_IVB)); + else + BUG(); } static bool