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 4A876EB64D9 for ; Thu, 29 Jun 2023 11:29:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81CDD10E127; Thu, 29 Jun 2023 11:29:24 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E49E10E127 for ; Thu, 29 Jun 2023 11:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688038162; x=1719574162; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=2VQHBOJmn3rbMMju7z0BTG4tKj5/ieowyQvenyeBiLk=; b=Qk5XG4zOM/l4M+MpAq85/G/J4cIA1f/pxWQiYEXYNKL32TgdFaBx5lJu Vf9eJFmZBCRWU8YQFPz3MOo96/H8XvHHDdAUbDjT39Eue9HFQCXKRksw2 9mT3wMFx2me0kE1WWJxbSQnis+ke96gPa/FOQ+/DIzRTkaJsqxpeA81HH zpWKMbwY92TH1U0FJ90/h3n6IUeYkFLOmbE0kFVbykUUpANR8xrlM5AV3 piH5TioxAfVetC+nX12uEQUIXq0n3cBrTIRHC03SUv22+czV40F57G+8N R8DOoxWW71kr+F8v6zcpK5TP/Ocdg8+cndzRQPLrDAinTTBWDgpPtnsW1 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="448465577" X-IronPort-AV: E=Sophos;i="6.01,168,1684825200"; d="scan'208";a="448465577" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2023 04:29:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="861892691" X-IronPort-AV: E=Sophos;i="6.01,168,1684825200"; d="scan'208";a="861892691" Received: from gyorgysx-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.63.135]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2023 04:29:19 -0700 From: Jani Nikula To: Tvrtko Ursulin , intel-gfx@lists.freedesktop.org In-Reply-To: <4e6f881b-1a5c-2b09-5e20-17aaee5f2d58@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <4e6f881b-1a5c-2b09-5e20-17aaee5f2d58@linux.intel.com> Date: Thu, 29 Jun 2023 14:29:00 +0300 Message-ID: <87bkgyse0z.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH v2 6/6] drm/i915: make device info a const pointer to rodata 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: Matt Roper , Lucas De Marchi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 29 Jun 2023, Tvrtko Ursulin wrote: > On 27/06/2023 16:14, Jani Nikula wrote: >> Finally we can get rid of the pseudo-const write-once device info, and >> convert it into a const pointer to device info in rodata. >> >> Cc: Matt Roper >> Cc: Lucas De Marchi >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/i915/i915_drv.h | 4 ++-- >> drivers/gpu/drm/i915/intel_device_info.c | 17 ++++------------- >> 2 files changed, 6 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 8947d1201298..682ef2b5c7d5 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -203,7 +203,7 @@ struct drm_i915_private { >> /* i915 device parameters */ >> struct i915_params params; >> >> - const struct intel_device_info __info; /* Use INTEL_INFO() to access. */ >> + const struct intel_device_info *__info; /* Use INTEL_INFO() to access. */ >> struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */ >> struct intel_driver_caps caps; >> >> @@ -415,7 +415,7 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915) >> (engine__) && (engine__)->uabi_class == (class__); \ >> (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node))) >> >> -#define INTEL_INFO(i915) (&(i915)->__info) >> +#define INTEL_INFO(i915) ((i915)->__info) >> #define RUNTIME_INFO(i915) (&(i915)->__runtime) >> #define DISPLAY_INFO(i915) ((i915)->display.info.__device_info) >> #define DISPLAY_RUNTIME_INFO(i915) (&(i915)->display.info.__runtime_info) >> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c >> index 0740922cd71f..ea0ec6174ce5 100644 >> --- a/drivers/gpu/drm/i915/intel_device_info.c >> +++ b/drivers/gpu/drm/i915/intel_device_info.c >> @@ -364,13 +364,6 @@ void intel_device_info_runtime_init_early(struct drm_i915_private *i915) >> intel_device_info_subplatform_init(i915); >> } >> >> -/* FIXME: Remove this, and make device info a const pointer to rodata. */ >> -static struct intel_device_info * >> -mkwrite_device_info(struct drm_i915_private *i915) >> -{ >> - return (struct intel_device_info *)INTEL_INFO(i915); >> -} >> - >> static const struct intel_display_device_info no_display = {}; >> >> /** >> @@ -430,26 +423,24 @@ void intel_device_info_driver_create(struct drm_i915_private *i915, >> u16 device_id, >> const struct intel_device_info *match_info) >> { >> - struct intel_device_info *info; >> struct intel_runtime_info *runtime; >> u16 ver, rel, step; >> >> - /* Setup the write-once "constant" device info */ >> - info = mkwrite_device_info(i915); >> - memcpy(info, match_info, sizeof(*info)); >> + /* Setup INTEL_INFO() */ >> + i915->__info = match_info; >> >> /* Initialize initial runtime info from static const data and pdev. */ >> runtime = RUNTIME_INFO(i915); >> memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime)); >> >> /* Probe display support */ >> - i915->display.info.__device_info = intel_display_device_probe(i915, info->has_gmd_id, >> + i915->display.info.__device_info = intel_display_device_probe(i915, HAS_GMD_ID(i915), > > Why does intel_display_device_probe need an explicit has_gmdid when it > could use HAS_GMD_ID itself? I think all of the display related initialization from this function should be moved within intel_display_device_probe() in follow-up. > But anyway, LGTM. If it saves you some time before the other time zone > comes online: > > Reviewed-by: Tvrtko Ursulin Thanks, Jani. > > Regards, > > Tvrtko > >> &ver, &rel, &step); >> memcpy(DISPLAY_RUNTIME_INFO(i915), >> &DISPLAY_INFO(i915)->__runtime_defaults, >> sizeof(*DISPLAY_RUNTIME_INFO(i915))); >> >> - if (info->has_gmd_id) { >> + if (HAS_GMD_ID(i915)) { >> DISPLAY_RUNTIME_INFO(i915)->ip.ver = ver; >> DISPLAY_RUNTIME_INFO(i915)->ip.rel = rel; >> DISPLAY_RUNTIME_INFO(i915)->ip.step = step; -- Jani Nikula, Intel Open Source Graphics Center