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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CD691C433EF for ; Mon, 9 May 2022 13:32:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6646A10E526; Mon, 9 May 2022 13:32:21 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 06F6110E526 for ; Mon, 9 May 2022 13:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652103140; x=1683639140; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=Sr848/LXvFEfthB02CaE/fikaMm37nhZzUL9dthgrl8=; b=VN3MrKBTJ2rGFj46jb9SgUnfJqnCmO/tPeGkEoApx8ZFS0cPtjZfcbj4 1H7zAy5BU+JTMCBrOeoHQ0M8jD/vQK88liD1em0utgFVabicfLK/z4bSr r7cej0uxID4TG7mBZYsYFC0pYVkXbwT2NsSl9lfCCfbMfbphNVRHoGKdb dOJEoiWnPoPaJLfRkMqXbr2cAmSHQC35eILqi4jZUHm+5EE8OHyLmWpyU +ZOuElA0tTdoVU+jVJPKrsEOJMQEk/cZWipqYypMIlYypiK4QDr4bDewQ fDwkH4yBIdLuUBJbIpvln7LDa+uF1STTvSX74CHYvroA94o1KLRVwow/h Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10341"; a="248951506" X-IronPort-AV: E=Sophos;i="5.91,211,1647327600"; d="scan'208";a="248951506" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2022 06:32:19 -0700 X-IronPort-AV: E=Sophos;i="5.91,211,1647327600"; d="scan'208";a="519234778" Received: from oanderso-mobl1.ger.corp.intel.com (HELO [10.213.217.157]) ([10.213.217.157]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2022 06:32:18 -0700 Message-ID: Date: Mon, 9 May 2022 14:32:16 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Content-Language: en-US To: =?UTF-8?Q?Jos=c3=a9_Roberto_de_Souza?= , intel-gfx@lists.freedesktop.org References: <20220505193524.276400-1-jose.souza@intel.com> <20220505193524.276400-5-jose.souza@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: <20220505193524.276400-5-jose.souza@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH CI 5/7] drm/i915: Drop has_ddi from device info 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 05/05/2022 20:35, José Roberto de Souza wrote: > No need to have this parameter in intel_device_info struct > as all platforms with display version 9 or newer, haswell or broadwell > supports it. > > As a side effect of the of removal this flag, it will not be printed > in dmesg during driver load anymore and developers will have to rely > on to check the macro and compare with platform being used and IP > versions of it. > > Reviewed-by: Matt Roper > Signed-off-by: José Roberto de Souza > --- > drivers/gpu/drm/i915/i915_drv.h | 4 +++- > drivers/gpu/drm/i915/i915_pci.c | 3 --- > drivers/gpu/drm/i915/intel_device_info.h | 1 - > 3 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 5538564bc1d25..600d8cee272da 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1298,7 +1298,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > #define HAS_DP20(dev_priv) (IS_DG2(dev_priv)) > > #define HAS_CDCLK_CRAWL(dev_priv) (INTEL_INFO(dev_priv)->display.has_cdclk_crawl) > -#define HAS_DDI(dev_priv) (INTEL_INFO(dev_priv)->display.has_ddi) > +#define HAS_DDI(dev_priv) (DISPLAY_VER(dev_priv) >= 9 || \ > + IS_BROADWELL(dev_priv) || \ > + IS_HASWELL(dev_priv)) This one is a bit borderline, not sure it passes Jani's criteria of simplicity, which I thought was a good one. And from the OCD angle it kind of sucks to expand the conditionals to all call sites (when it's even called from i915_irq.c, justifiably or not I don't know). What is the high level motivation for this work? Also, why is this in drm-intel-gt-next? :) Regards, Tvrtko > #define HAS_FPGA_DBG_UNCLAIMED(dev_priv) (INTEL_INFO(dev_priv)->display.has_fpga_dbg) > #define HAS_PSR(dev_priv) (INTEL_INFO(dev_priv)->display.has_psr) > #define HAS_PSR_HW_TRACKING(dev_priv) \ > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 2dc0284629d30..a0693d9ff9cee 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -535,7 +535,6 @@ static const struct intel_device_info vlv_info = { > .platform_engine_mask = BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0), \ > .display.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \ > BIT(TRANSCODER_C) | BIT(TRANSCODER_EDP), \ > - .display.has_ddi = 1, \ > .display.has_fpga_dbg = 1, \ > .display.has_dp_mst = 1, \ > .has_rc6p = 0 /* RC6p removed-by HSW */, \ > @@ -683,7 +682,6 @@ static const struct intel_device_info skl_gt4_info = { > BIT(TRANSCODER_C) | BIT(TRANSCODER_EDP) | \ > BIT(TRANSCODER_DSI_A) | BIT(TRANSCODER_DSI_C), \ > .has_64bit_reloc = 1, \ > - .display.has_ddi = 1, \ > .display.has_fpga_dbg = 1, \ > .display.fbc_mask = BIT(INTEL_FBC_A), \ > .display.has_hdcp = 1, \ > @@ -932,7 +930,6 @@ static const struct intel_device_info adl_s_info = { > .dbuf.size = 4096, \ > .dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2) | BIT(DBUF_S3) | \ > BIT(DBUF_S4), \ > - .display.has_ddi = 1, \ > .display.has_dmc = 1, \ > .display.has_dp_mst = 1, \ > .display.has_dsb = 1, \ > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h > index bef65e3f02c55..bc71ce48763ad 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -167,7 +167,6 @@ enum intel_ppgtt_type { > func(cursor_needs_physical); \ > func(has_cdclk_crawl); \ > func(has_dmc); \ > - func(has_ddi); \ > func(has_dp_mst); \ > func(has_dsb); \ > func(has_dsc); \