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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 16343C433E0 for ; Tue, 23 Jun 2020 21:24:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D62C120738 for ; Tue, 23 Jun 2020 21:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947458; bh=8TvrV79sT5HOZ52kyWhpR5dn/H/pge/c5cNWQhpxhfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eMsZBJOwzupDnqJwQYCaZJadGR6MnC2iCJIvL0rv76qJtW517A777Okx4MTfBwlo3 kXbm/w/L7jzgsXinfBWgY1c1QSgfpPslaMswWUrdyCcXDhzMJ4rkjYf9EkoTm/FGH9 r5+3ilPNpGQ2t7x+b712pYkl2vg7mw4/FgZzzqHk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389942AbgFWVYM (ORCPT ); Tue, 23 Jun 2020 17:24:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:37404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389377AbgFWUUL (ORCPT ); Tue, 23 Jun 2020 16:20:11 -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 63C0D2064B; Tue, 23 Jun 2020 20:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943610; bh=8TvrV79sT5HOZ52kyWhpR5dn/H/pge/c5cNWQhpxhfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R5Kqk0JDtT5U3azT8H51tu0KOyLyOMZd2I4b1cITIqfeceB/Q42gx0Um3N7iwZuiy yUhrSYWN2SUgY09JYkipkpUmZL1ozAoLlukbnsnDh/nwID1bZ0q2TUrkiiFkehc/EF RvcRbvb34wpddt01JhD86oEcypiXWewGuZF/OkH8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Swathi Dhanavanthri , Rafael Antognolli , Matt Roper , Rodrigo Vivi Subject: [PATCH 5.7 459/477] drm/i915/tgl: Make Wa_14010229206 permanent Date: Tue, 23 Jun 2020 21:57:36 +0200 Message-Id: <20200623195429.244980729@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@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 From: Swathi Dhanavanthri commit 63d0f3ea8ebb67160eca281320d255c72b0cb51a upstream. This workaround now applies to all steppings, not just A0. Wa_1409085225 is a temporary A0-only W/A however it is identical to Wa_14010229206 and hence the combined workaround is made permanent. Bspec: 52890 Signed-off-by: Swathi Dhanavanthri Tested-by: Rafael Antognolli Reviewed-by: Matt Roper [mattrope: added missing blank line] Signed-off-by: Matt Roper Link: https://patchwork.freedesktop.org/patch/msgid/20200326234955.16155-1-swathi.dhanavanthri@intel.com Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1620,12 +1620,6 @@ rcs_engine_wa_init(struct intel_engine_c GEN7_FF_THREAD_MODE, GEN12_FF_TESSELATION_DOP_GATE_DISABLE); - /* - * Wa_1409085225:tgl - * Wa_14010229206:tgl - */ - wa_masked_en(wal, GEN9_ROW_CHICKEN4, GEN12_DISABLE_TDL_PUSH); - /* Wa_1408615072:tgl */ wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2, VSUNIT_CLKGATE_DIS_TGL); @@ -1643,6 +1637,12 @@ rcs_engine_wa_init(struct intel_engine_c wa_masked_en(wal, GEN9_CS_DEBUG_MODE1, FF_DOP_CLOCK_GATE_DISABLE); + + /* + * Wa_1409085225:tgl + * Wa_14010229206:tgl + */ + wa_masked_en(wal, GEN9_ROW_CHICKEN4, GEN12_DISABLE_TDL_PUSH); } if (IS_GEN(i915, 11)) {