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 A0F1BCD6E61 for ; Thu, 13 Nov 2025 13:53:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CCE310E821; Thu, 13 Nov 2025 13:53:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="apZ+pJhQ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7330F10E81E; Thu, 13 Nov 2025 13:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763042016; x=1794578016; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=lZpXgiQnwshrvkDsHf035xYELMg4Bm6MKUOn+IYJ8VI=; b=apZ+pJhQAPhgf162ck6lfn2hSuVvsW+kesRVf3ddWI0vqD+C1gNrZJnH pnNGaxg5DTJJzg9nEjC9PbVzFTfmGdkvaeeODYV5XFE9jeJAINRTGCfM1 aJJR1Rc72Z7+KlsP6iZG/Kx5Rgz9ldYWYDnf0V7GhhKqJQwaeEXHaK60X M+d+j6iTQVF84z/znGK1AzHmOYC6G3P49aDJir5utQdxrx24ZzhDPx1FN Of5sjYVy9FIoIs7hlzYag8uwTA+y5K0q85nct1a4qkrSANcwyHhtyeY/N 3DQGhjfZFUIclw2R+RqhphFAu9dc/0OR6B7rKu6MYZN0e5wjrIgxO5KIQ A==; X-CSE-ConnectionGUID: gsGq5wmuS6eaTIJ+/p9lOA== X-CSE-MsgGUID: GYgwU5HcSrKP9eg6yIT8Ag== X-IronPort-AV: E=McAfee;i="6800,10657,11612"; a="76224300" X-IronPort-AV: E=Sophos;i="6.19,302,1754982000"; d="scan'208";a="76224300" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2025 05:53:31 -0800 X-CSE-ConnectionGUID: I31ZybrbQ5GpkUzAB65lxg== X-CSE-MsgGUID: jE3cK3y3TKeh+lCrV0reQQ== X-ExtLoop1: 1 Received: from klitkey1-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.81]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2025 05:53:29 -0800 Date: Thu, 13 Nov 2025 15:53:27 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, uma.shankar@intel.com Subject: Re: [PATCH] drm/i915: move intel_gmch.[ch] from soc/ to display/ Message-ID: References: <20251113133751.696625-1-jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20251113133751.696625-1-jani.nikula@intel.com> X-Patchwork-Hint: comment Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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 Thu, Nov 13, 2025 at 03:37:50PM +0200, Jani Nikula wrote: > The sole user of the remaining functions in intel_gmch.[ch] is in > display. Move them under display. > > This allows us to remove the compat soc/intel_gmch.h from xe. > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/Makefile | 5 +---- > drivers/gpu/drm/i915/{soc => display}/intel_gmch.c | 3 +-- > drivers/gpu/drm/i915/{soc => display}/intel_gmch.h | 0 > drivers/gpu/drm/i915/display/intel_vga.c | 3 +-- > drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h | 6 ------ > 5 files changed, 3 insertions(+), 14 deletions(-) > rename drivers/gpu/drm/i915/{soc => display}/intel_gmch.c (95%) > rename drivers/gpu/drm/i915/{soc => display}/intel_gmch.h (100%) > delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index 90588d5bb908..98822c98d960 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -57,10 +57,6 @@ i915-y += \ > vlv_iosf_sb.o \ > vlv_suspend.o > > -# core peripheral code > -i915-y += \ > - soc/intel_gmch.o > - > # core library code > i915-y += \ > i915_memcpy.o \ > @@ -280,6 +276,7 @@ i915-y += \ > display/intel_flipq.o \ > display/intel_frontbuffer.o \ > display/intel_global_state.o \ > + display/intel_gmch.o \ I think I'd just stick the stuff into intel_vga.c since that's where the vgaarb registration is as well. > display/intel_hdcp.o \ > display/intel_hdcp_gsc.o \ > display/intel_hdcp_gsc_message.o \ > diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.c b/drivers/gpu/drm/i915/display/intel_gmch.c > similarity index 95% > rename from drivers/gpu/drm/i915/soc/intel_gmch.c > rename to drivers/gpu/drm/i915/display/intel_gmch.c > index 30f489417064..7797c7341047 100644 > --- a/drivers/gpu/drm/i915/soc/intel_gmch.c > +++ b/drivers/gpu/drm/i915/display/intel_gmch.c > @@ -9,9 +9,8 @@ > #include > #include > > -#include "../display/intel_display_core.h" /* FIXME */ > - > #include "i915_drv.h" > +#include "intel_display_core.h" > #include "intel_gmch.h" > #include "intel_pci_config.h" > > diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.h b/drivers/gpu/drm/i915/display/intel_gmch.h > similarity index 100% > rename from drivers/gpu/drm/i915/soc/intel_gmch.h > rename to drivers/gpu/drm/i915/display/intel_gmch.h > diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c > index 6e125564db34..91ba17965ee3 100644 > --- a/drivers/gpu/drm/i915/display/intel_vga.c > +++ b/drivers/gpu/drm/i915/display/intel_vga.c > @@ -11,10 +11,9 @@ > #include > #include