Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp1030534ybe; Wed, 4 Sep 2019 11:24:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/2LOmvIMm0SWWYw9N3QYevGT5ghUE8pEznh7swqa23fBEEQUSqJC+Di/wBpY4KCCmINBH X-Received: by 2002:a17:902:d704:: with SMTP id w4mr5283453ply.136.1567621496458; Wed, 04 Sep 2019 11:24:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567621496; cv=none; d=google.com; s=arc-20160816; b=HoNBsCDEYpeCHDfhr4JR4a7PCcG76Lq2uTQlJkCkJDMpxqV8fSjpQRi4M9OKe9NoAT /QfIiW4FVNQ0cpYAI4zbrk9zBUBjz3//oeAi2v6Jxu+4lMHri+Mmfb3KZkRhQWCzpEaq xo/LzXjvMe9i0nsE2+3u0zNUAbmQajgGnkRHjQ/ZM9ipTqhX/LyPCOdvWcSwm1JQsYdH +kT4fHLGAJ6veOEsvy6ZEptD0BiUy4W1pmRaDdPKZWhJF/698AbNgVX5GCw5TismXgo4 YuDimnxD97gj8pLiMIQ1tePgskb0QBoOe3C7BeiIg9zXT5IPRDLEvStTmRpWMaXxDngK vQeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MvGbJBHRpSr5sXj9MVa8dNVXzPVrtGRDfawTI3Af29o=; b=gYic7ZaMW7hBmlxyAe+9trOoFRI+lzrpdCIHrCNOPb3fAAZJCqMen5IvHxmdWLlrDJ D3pM3zOuagkwPcF5WIkRmBwin4YjWbmkSwiwCm5/R0QATbgW5fGOUdhYFgTXbycx1uSh NrE5tb2aI7rc6jLHrrRgQUWQqNkDSpgzHQNUb1hErYZGEWUV0ZSb0AfyxysxM5BI1FVW L4GKEn2xu9utV4r8/70sSThyBHQREu67Qw6Ka24TUSLT4Vxn1h2ZNPYL6XeFzCpGuKvl SUUTCdYds8iSdQhh7SFT4wbFtzx1nfS+qMLUjEm0y+REDnTB/jPqXAGZbC8YJ7CqjJ8o 6CuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JRAheQIx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f12si6806098plt.227.2019.09.04.11.24.40; Wed, 04 Sep 2019 11:24:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JRAheQIx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389006AbfIDSF4 (ORCPT + 99 others); Wed, 4 Sep 2019 14:05:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:47628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389335AbfIDSFy (ORCPT ); Wed, 4 Sep 2019 14:05:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9DC022341B; Wed, 4 Sep 2019 18:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620353; bh=dFom+vnutnq3Ba+A9r8rQfUz5K+76ud16x0BKCELUrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JRAheQIxrrOHkOJaTV7BsAXZqaQxwdN24cBgIP0zsbCHBxhA5E3gPHeytzHP2AziB ffdvrYC4Xd2WdINDHGsSJeq/XL19QE0wawfXoizI0jOqtmSEjaIpEPiiKrmR3CPnS5 LuBURjrv9ZtPXBkEyOCLB/cgAkWB88wKLfnW/RyY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lionel Landwerlin , Chris Wilson , Tvrtko Ursulin , Sasha Levin Subject: [PATCH 4.19 26/93] drm/i915: fix broadwell EU computation Date: Wed, 4 Sep 2019 19:53:28 +0200 Message-Id: <20190904175305.641446001@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175302.845828956@linuxfoundation.org> References: <20190904175302.845828956@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 63ac3328f0d1d37f286e397b14d9596ed09d7ca5 ] subslice_mask is an array indexed by slice, not subslice. Signed-off-by: Lionel Landwerlin Fixes: 8cc7669355136f ("drm/i915: store all subslice masks") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108712 Reviewed-by: Chris Wilson Reviewed-by: Tvrtko Ursulin Link: https://patchwork.freedesktop.org/patch/msgid/20181112123931.2815-1-lionel.g.landwerlin@intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/intel_device_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 0ef0c6448d53a..01fa98299bae6 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -474,7 +474,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv) u8 eu_disabled_mask; u32 n_disabled; - if (!(sseu->subslice_mask[ss] & BIT(ss))) + if (!(sseu->subslice_mask[s] & BIT(ss))) /* skip disabled subslice */ continue; -- 2.20.1