From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9C9FC3A5A1 for ; Wed, 28 Aug 2019 21:22:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 853FF2189D for ; Wed, 28 Aug 2019 21:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbfH1VWb (ORCPT ); Wed, 28 Aug 2019 17:22:31 -0400 Received: from mga11.intel.com ([192.55.52.93]:20215 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726400AbfH1VWb (ORCPT ); Wed, 28 Aug 2019 17:22:31 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Aug 2019 14:22:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,442,1559545200"; d="scan'208";a="332299072" Received: from astruck-mobl3.ger.corp.intel.com (HELO [10.252.35.162]) ([10.252.35.162]) by orsmga004.jf.intel.com with ESMTP; 28 Aug 2019 14:22:28 -0700 Subject: Re: [PATCH] drm/i915: fix broadwell EU computation To: Rodrigo Vivi , stable@vger.kernel.org Cc: intel-gfx@lists.freedesktop.org, dmitry.v.rogozhkin@intel.com, Chris Wilson , Tvrtko Ursulin , Joonas Lahtinen References: <20190828210209.10541-1-rodrigo.vivi@intel.com> From: Lionel Landwerlin Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Message-ID: Date: Thu, 29 Aug 2019 00:22:27 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190828210209.10541-1-rodrigo.vivi@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 29/08/2019 00:02, Rodrigo Vivi wrote: > From: Lionel Landwerlin > > commit 6a67a20366f894c172734f28c5646bdbe48a46e3 upstream. > > 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 > (cherry picked from commit 63ac3328f0d1d37f286e397b14d9596ed09d7ca5) > Signed-off-by: Joonas Lahtinen > Cc: # 4.17 Rodrigo pointed out I forgot the Cc: tag which is why this didn't make it to stable. The same bug showed up on a CentOS kernel : https://github.com/intel/compute-runtime/issues/200 My bad... :( Thanks for resending! -Lionel > Signed-off-by: Rodrigo Vivi > --- > 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 0ef0c6448d53..01fa98299bae 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; >