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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 81FC4C3A5A8 for ; Wed, 4 Sep 2019 18:05:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DA17208E4 for ; Wed, 4 Sep 2019 18:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620355; bh=dFom+vnutnq3Ba+A9r8rQfUz5K+76ud16x0BKCELUrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IyzQCgTaTq0aAx8MIswKSzrIF31CGGFIE3+9p2P672gA41w2cAgoVSpoevCBpnUWq h5n34YcOspR02iCPeq06/4bPBGCc6fvCffrecF00WqVCKdRzPlvWwZuEVDslOmO8Rx w0gMf51cw65AIO2InMFKZxM2rPv/i7TjsiM343No= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389343AbfIDSFy (ORCPT ); Wed, 4 Sep 2019 14:05:54 -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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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