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 0787ACD5BAD for ; Thu, 13 Nov 2025 09:58:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B3B4610E15D; Thu, 13 Nov 2025 09:58:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DdBwXkVg"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id E539F10E1A5; Thu, 13 Nov 2025 09:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763027892; x=1794563892; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=G6reCJo4Fu7EoTRazt2yhuJXAvQElDQQhNdvjaNgf8c=; b=DdBwXkVgf9eDcpWVQiqiT4oZg41HJlu+Mn3wCksnJLjlHjgZXPnCewug zdegKki7jh8Pgq5azRjBvNRfcYo0cOvhVyUS1/QqJA0vdHWlm6ltGoApo xj5Tma4I0sbIUtu9FKerG0Ks5/05fr6sm+8UrVCdx5VmfdW2M56/C605Q IDgONlxJEJ8tGSqaSKHbnHfpwMSzyuGPJmamSkU5jdEd1B+r1/Hoy3ZpD zPL9MRyVBJVz6Bc/I6HDE5ZyNTXH9MDo10VnF/ulHCxULMeR9v91DPDWX vZVSWzX1K/3O3cjFnahVT+7Bi1sAjxnWouT1yzmbXv0kMYrVJXpNpoUKa w==; X-CSE-ConnectionGUID: T5y67oYzTiu7Jpu+hiHN5Q== X-CSE-MsgGUID: hTvlvU3fQ/6RSbc0AI5hDw== X-IronPort-AV: E=McAfee;i="6800,10657,11611"; a="75418404" X-IronPort-AV: E=Sophos;i="6.19,301,1754982000"; d="scan'208";a="75418404" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2025 01:58:12 -0800 X-CSE-ConnectionGUID: 3zLKJ/bARvy9VMVkgh0q9g== X-CSE-MsgGUID: TVT//949QJe1F1M+ZzPiIg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,301,1754982000"; d="scan'208";a="189732322" Received: from aotchere-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.135]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2025 01:58:09 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, ville.syrjala@linux.intel.com, uma.shankar@intel.com Subject: [PATCH 0/8] drm/i915: start dissolving soc/ Date: Thu, 13 Nov 2025 11:57:57 +0200 Message-ID: X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" soc/ has served a useful purpose, and way back when it was the obvious thing to do. However, it has become a bit awkward, sitting somewhere between i915, xe and display. Split the i915 core specific parts out of intel_dram.c, and move intel_dram.c and intel_rom.c under display. This allows us to clean up the xe build and compat headers very nicely. intel_gmch.[ch] still remains under soc/, as it requires a bit more thought. But this series is a good start. BR, Jani. Jani Nikula (8): drm/i915/edram: extract i915_edram.[ch] for edram detection drm/i915: split out i915_freq.[ch] drm/i915: move intel_dram.[ch] from soc/ to display/ drm/xe: remove MISSING_CASE() from compat i915_utils.h drm/i915/dram: convert to struct intel_display drm/i915: move dram_info to struct intel_display drm/i915: move intel_rom.[ch] from soc/ to display/ drm/xe: remove remaining platform checks from compat i915_drv.h drivers/gpu/drm/i915/Makefile | 8 +- drivers/gpu/drm/i915/display/i9xx_wm.c | 5 +- drivers/gpu/drm/i915/display/intel_bios.c | 3 +- drivers/gpu/drm/i915/display/intel_bw.c | 5 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- .../gpu/drm/i915/display/intel_display_core.h | 4 + .../drm/i915/display/intel_display_power.c | 5 +- .../drm/i915/{soc => display}/intel_dram.c | 239 ++++++++---------- .../drm/i915/{soc => display}/intel_dram.h | 12 +- .../gpu/drm/i915/{soc => display}/intel_rom.c | 0 .../gpu/drm/i915/{soc => display}/intel_rom.h | 0 drivers/gpu/drm/i915/display/skl_watermark.c | 6 +- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 +- drivers/gpu/drm/i915/gt/intel_rps.c | 6 +- drivers/gpu/drm/i915/i915_driver.c | 7 +- drivers/gpu/drm/i915/i915_drv.h | 3 - drivers/gpu/drm/i915/i915_edram.c | 44 ++++ drivers/gpu/drm/i915/i915_edram.h | 11 + drivers/gpu/drm/i915/i915_freq.c | 111 ++++++++ drivers/gpu/drm/i915/i915_freq.h | 13 + drivers/gpu/drm/xe/Makefile | 12 +- .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 15 -- .../drm/xe/compat-i915-headers/i915_utils.h | 6 - .../xe/compat-i915-headers/soc/intel_dram.h | 6 - .../xe/compat-i915-headers/soc/intel_rom.h | 6 - drivers/gpu/drm/xe/display/xe_display.c | 4 +- drivers/gpu/drm/xe/xe_device_types.h | 8 - 27 files changed, 322 insertions(+), 228 deletions(-) rename drivers/gpu/drm/i915/{soc => display}/intel_dram.c (68%) rename drivers/gpu/drm/i915/{soc => display}/intel_dram.h (68%) rename drivers/gpu/drm/i915/{soc => display}/intel_rom.c (100%) rename drivers/gpu/drm/i915/{soc => display}/intel_rom.h (100%) create mode 100644 drivers/gpu/drm/i915/i915_edram.c create mode 100644 drivers/gpu/drm/i915/i915_edram.h create mode 100644 drivers/gpu/drm/i915/i915_freq.c create mode 100644 drivers/gpu/drm/i915/i915_freq.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h -- 2.47.3