From patchwork Wed Apr 26 09:11:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonas Lahtinen X-Patchwork-Id: 9700671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6754B60245 for ; Wed, 26 Apr 2017 09:12:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 473A420572 for ; Wed, 26 Apr 2017 09:12:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C554212BE; Wed, 26 Apr 2017 09:12:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EF79A20572 for ; Wed, 26 Apr 2017 09:12:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 982816E5C3; Wed, 26 Apr 2017 09:12:17 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B20A6E5C0 for ; Wed, 26 Apr 2017 09:12:15 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2017 02:12:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.37,253,1488873600"; d="scan'208"; a="1123605330" Received: from jlahtine-desk.ger.corp.intel.com ([10.252.8.113]) by orsmga001.jf.intel.com with ESMTP; 26 Apr 2017 02:12:13 -0700 From: Joonas Lahtinen To: Intel graphics driver community testing & development Date: Wed, 26 Apr 2017 12:11:54 +0300 Message-Id: <1493197914-12383-2-git-send-email-joonas.lahtinen@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493197914-12383-1-git-send-email-joonas.lahtinen@linux.intel.com> References: <1493197914-12383-1-git-send-email-joonas.lahtinen@linux.intel.com> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Sanitize hardware context computation X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Inspired by the engine context size sanitization, lets also clean the legacy hardware context computation. Signed-off-by: Joonas Lahtinen Cc: Chris Wilson --- drivers/gpu/drm/i915/i915_gem_context.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 8bd0c49..d82135d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -94,29 +94,23 @@ static int get_context_size(struct drm_i915_private *dev_priv) { - int ret; u32 reg; switch (INTEL_GEN(dev_priv)) { - case 6: - reg = I915_READ(CXT_SIZE); - ret = GEN6_CXT_TOTAL_SIZE(reg) * 64; - break; + default: + MISSING_CASE(INTEL_GEN(dev_priv)); + case 8: + return GEN8_CXT_TOTAL_SIZE; case 7: - reg = I915_READ(GEN7_CXT_SIZE); if (IS_HASWELL(dev_priv)) - ret = HSW_CXT_TOTAL_SIZE; - else - ret = GEN7_CXT_TOTAL_SIZE(reg) * 64; - break; - case 8: - ret = GEN8_CXT_TOTAL_SIZE; - break; - default: - BUG(); - } + return HSW_CXT_TOTAL_SIZE; - return ret; + reg = I915_READ(GEN7_CXT_SIZE); + return GEN7_CXT_TOTAL_SIZE(reg) * 64; + case 6: + reg = I915_READ(CXT_SIZE); + return GEN6_CXT_TOTAL_SIZE(reg) * 64; + } } void i915_gem_context_free(struct kref *ctx_ref)