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=-5.7 required=3.0 tests=DATE_IN_PAST_03_06, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 1ED7FC11D0C for ; Thu, 20 Feb 2020 20:46:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFD8B20801 for ; Thu, 20 Feb 2020 20:46:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFD8B20801 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 740946EE43; Thu, 20 Feb 2020 20:46:29 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 300E76EE43 for ; Thu, 20 Feb 2020 20:46:28 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Feb 2020 12:46:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,465,1574150400"; d="scan'208";a="269733470" Received: from msatwood-mobl.jf.intel.com (HELO msatwood-mobl) ([10.24.15.21]) by fmsmga002.fm.intel.com with SMTP; 20 Feb 2020 12:46:27 -0800 Date: Thu, 20 Feb 2020 12:46:23 -0500 From: Matt Atwood To: Matt Roper , intel-gfx@lists.freedesktop.org Message-ID: <20200220174623.GB5984@msatwood-mobl> References: <20200204011032.582737-1-matthew.d.roper@intel.com> <20200204011032.582737-2-matthew.d.roper@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200204011032.582737-2-matthew.d.roper@intel.com> Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/tgl: Program MBUS_ABOX{1, 2}_CTL during display init X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, Feb 03, 2020 at 05:10:32PM -0800, Matt Roper wrote: > On gen11 we only needed to program MBus credits into MBUS_ABOX_CTL > during display initialization, but on gen12 we're now supposed to > program the same values into MBUS_ABOX1_CTL and MBUS_ABOX2_CTL as well. > > v2: > - Program registers with rmw to preserve contents of unrelated bits. > - Switch to the new display uncore helpers. > > Bspec: 49213 > Bspec: 50096 > Cc: Stanislav Lisovskiy Reviewed-by: Matt Atwood > Signed-off-by: Matt Roper > --- > drivers/gpu/drm/i915/display/intel_display_power.c | 4 ++++ > drivers/gpu/drm/i915/i915_reg.h | 2 ++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index 529319c962e8..f638691cda6e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -4516,6 +4516,10 @@ static void icl_mbus_init(struct drm_i915_private *dev_priv) > MBUS_ABOX_BW_CREDIT(1); > > intel_de_rmw(dev_priv, MBUS_ABOX_CTL, mask, val); > + if (INTEL_GEN(dev_priv) >= 12) { > + intel_de_rmw(dev_priv, MBUS_ABOX1_CTL, mask, val); > + intel_de_rmw(dev_priv, MBUS_ABOX2_CTL, mask, val); > + } > } > > static void hsw_assert_cdclk(struct drm_i915_private *dev_priv) > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 0bd431f6a011..d3df704ee099 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2865,6 +2865,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define MI_ARB_STATE _MMIO(0x20e4) /* 915+ only */ > > #define MBUS_ABOX_CTL _MMIO(0x45038) > +#define MBUS_ABOX1_CTL _MMIO(0x45048) > +#define MBUS_ABOX2_CTL _MMIO(0x4504C) > #define MBUS_ABOX_BW_CREDIT_MASK (3 << 20) > #define MBUS_ABOX_BW_CREDIT(x) ((x) << 20) > #define MBUS_ABOX_B_CREDIT_MASK (0xF << 16) > -- > 2.24.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx