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 EBECDC433EF for ; Thu, 19 May 2022 10:35:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 60AB111A4DD; Thu, 19 May 2022 10:35:39 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id B011311A45A for ; Thu, 19 May 2022 10:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652956538; x=1684492538; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=7QtMkOSYBtOeUqJeIq4wUqasqRvEQZhN3gBVqkD+3AE=; b=FXxN9hq4RLpwZXw336XER/QsJzhix+Itd9QLnNmdLu+VeQkR10LAT/+H 9PB43bvyZXwjaZfiqJQbReAawPsl4czdBl87YhRCGVaafis2dVIm1TGLK gbA6YZH7fzq1vHDrk/ehiT1pmYnXy1hAU2FJ89jO7tvW4sqWkbmNhr0lx ZCh+2Kw3RuyUKV9cIkzZyD5zmv3lnvj3272WM/Qzp0rw2r5YVXufVx8le xqL+3ChyNDiQ9EjeZC5NBkTyTk/y5EJ5haAowOPZBEv6yZGWkSpajycbr XOgPfkOMBLomLApt1IDNoM6+7mHhinMim5uUDijPquS/sng/sfO52NgwS g==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="252033589" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="252033589" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 03:35:38 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="661629174" Received: from wangyaqi-mobl.ger.corp.intel.com (HELO [10.213.199.90]) ([10.213.199.90]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 03:35:37 -0700 Message-ID: <305aa71f-ac4e-b1bb-cd1e-de54f066eebb@linux.intel.com> Date: Thu, 19 May 2022 11:35:21 +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> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: <20220505193524.276400-1-jose.souza@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH CI 1/7] drm/i915: Drop has_gt_uc 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 graphics version 9 or newer has graphics > microcontroller. > > 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. We have decided to revert this series for now until consensus on the direction and potentially individual conversions can be reached. I've sent the revert patches and will merge them once they pass CI. Regards, Tvrtko > Reviewed-by: Matt Roper > Signed-off-by: José Roberto de Souza > --- > drivers/gpu/drm/i915/i915_drv.h | 2 +- > drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- > drivers/gpu/drm/i915/i915_pci.c | 3 --- > drivers/gpu/drm/i915/intel_device_info.h | 1 - > 4 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 2dddc27a1b0ed..af3967149b2d2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1355,7 +1355,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > */ > #define HAS_FLAT_CCS(dev_priv) (INTEL_INFO(dev_priv)->has_flat_ccs) > > -#define HAS_GT_UC(dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc) > +#define HAS_GT_UC(dev_priv) (GRAPHICS_VER(dev_priv) >= 9) > > #define HAS_POOLED_EU(dev_priv) (INTEL_INFO(dev_priv)->has_pooled_eu) > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 0512c66fa4f3f..5bd9cb8998527 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -2008,7 +2008,7 @@ __i915_gpu_coredump(struct intel_gt *gt, intel_engine_mask_t engine_mask, u32 du > return ERR_PTR(-ENOMEM); > } > > - if (INTEL_INFO(i915)->has_gt_uc) { > + if (HAS_GT_UC(i915)) { > error->gt->uc = gt_record_uc(error->gt, compress); > if (error->gt->uc) { > if (dump_flags & CORE_DUMP_FLAG_IS_GUC_CAPTURE) > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 498708b33924f..6d4e2c4292f3b 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -644,7 +644,6 @@ static const struct intel_device_info chv_info = { > GEN(9), \ > GEN9_DEFAULT_PAGE_SIZES, \ > .display.has_dmc = 1, \ > - .has_gt_uc = 1, \ > .display.has_hdcp = 1, \ > .display.has_ipc = 1, \ > .display.has_psr = 1, \ > @@ -705,7 +704,6 @@ static const struct intel_device_info skl_gt4_info = { > .has_rps = true, \ > .display.has_dp_mst = 1, \ > .has_logical_ring_contexts = 1, \ > - .has_gt_uc = 1, \ > .dma_mask_size = 39, \ > .ppgtt_type = INTEL_PPGTT_FULL, \ > .ppgtt_size = 48, \ > @@ -1008,7 +1006,6 @@ static const struct intel_device_info adl_p_info = { > .has_64bit_reloc = 1, \ > .has_flat_ccs = 1, \ > .has_global_mocs = 1, \ > - .has_gt_uc = 1, \ > .has_llc = 1, \ > .has_logical_ring_contexts = 1, \ > .has_logical_ring_elsq = 1, \ > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h > index e7d2cf7d65c85..dcc8c63ae6ed4 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -146,7 +146,6 @@ enum intel_ppgtt_type { > func(has_4tile); \ > func(has_flat_ccs); \ > func(has_global_mocs); \ > - func(has_gt_uc); \ > func(has_heci_pxp); \ > func(has_heci_gscfi); \ > func(has_guc_deprivilege); \