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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 0397CC4338F for ; Fri, 23 Jul 2021 23:46:46 +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 A623360F23 for ; Fri, 23 Jul 2021 23:46:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A623360F23 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CD966FCAD; Fri, 23 Jul 2021 23:46:45 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id EDE946FCAD for ; Fri, 23 Jul 2021 23:46:43 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10054"; a="233813484" X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="233813484" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 16:46:43 -0700 X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="434265107" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.134]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 16:46:43 -0700 Date: Fri, 23 Jul 2021 16:46:41 -0700 From: Matt Roper To: Lucas De Marchi Message-ID: <20210723234641.GG1556418@mdroper-desk1.amr.corp.intel.com> References: <20210723234352.214459-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210723234352.214459-1-lucas.demarchi@intel.com> Subject: Re: [Intel-gfx] [PATCH] drm/i915: fix not reading DSC disable fuse in GLK 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: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Jul 23, 2021 at 04:43:52PM -0700, Lucas De Marchi wrote: > We were using GRAPHICS_VER() to handle SKL_DFSM register, which means we > were not handling GLK correctly since that has GRAPHICS_VER == 9, but > DISPLAY_VER == 10. Switch the entire branch to check DISPLAY_VER > which makes it more in line with Bspec. > > Even though the Bspec has an exception for RKL in > TGL_DFSM_PIPE_D_DISABLE, we don't have to do anything as the bit has > disable semantic and RKL doesn't have pipe D. > > Bspec: 50075, 7548 > Fixes: 2b5a4562edd0 ("drm/i915/display: Simplify GLK display version tests") > Cc: Matt Roper > Signed-off-by: Lucas De Marchi Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/intel_device_info.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c > index d5cf5977938a..99b51c292942 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -335,7 +335,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) > info->pipe_mask &= ~BIT(PIPE_C); > info->cpu_transcoder_mask &= ~BIT(TRANSCODER_C); > } > - } else if (HAS_DISPLAY(dev_priv) && GRAPHICS_VER(dev_priv) >= 9) { > + } else if (HAS_DISPLAY(dev_priv) && DISPLAY_VER(dev_priv) >= 9) { > u32 dfsm = intel_de_read(dev_priv, SKL_DFSM); > > if (dfsm & SKL_DFSM_PIPE_A_DISABLE) { > @@ -350,7 +350,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) > info->pipe_mask &= ~BIT(PIPE_C); > info->cpu_transcoder_mask &= ~BIT(TRANSCODER_C); > } > - if (GRAPHICS_VER(dev_priv) >= 12 && > + > + if (DISPLAY_VER(dev_priv) >= 12 && > (dfsm & TGL_DFSM_PIPE_D_DISABLE)) { > info->pipe_mask &= ~BIT(PIPE_D); > info->cpu_transcoder_mask &= ~BIT(TRANSCODER_D); > @@ -362,10 +363,10 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) > if (dfsm & SKL_DFSM_DISPLAY_PM_DISABLE) > info->display.has_fbc = 0; > > - if (GRAPHICS_VER(dev_priv) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE)) > + if (DISPLAY_VER(dev_priv) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE)) > info->display.has_dmc = 0; > > - if (GRAPHICS_VER(dev_priv) >= 10 && > + if (DISPLAY_VER(dev_priv) >= 10 && > (dfsm & CNL_DFSM_DISPLAY_DSC_DISABLE)) > info->display.has_dsc = 0; > } > -- > 2.31.1 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx