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 D4F64FD3762 for ; Wed, 25 Feb 2026 14:49:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 71A0410E1AB; Wed, 25 Feb 2026 14:49:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Gnt6LWLH"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A82610E798; Wed, 25 Feb 2026 14:49:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1772030987; x=1803566987; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SvmL5k/1pWea+lumq4XEyqi6zRjFL7b1DuEu/15EHfQ=; b=Gnt6LWLH0m5iKqSUS0MNE4aD3curP5zZHTFc1Sazl6vzNClAHAimrryB tYf7QeECKD2Pz/n+A1quZahGbOJgHaS/YCcTCxrwXm+BWDya3FPY4pet1 Lnf+SEidevdm20hvHf7J2hWdl3ksI2ajuN07NrCPgp+8q8ZvzFQrnabHp h6ETET/sCRhAE/c2thRsg2UQA4c3fEtX2kpjekIiePwT9ffgpSaKtAhJL xLfXB+8iv5NBeBWqzTktVaULsTGkmiXKUSXxC39t5PbBLlc0FDBe1JzJQ hrPSZWu55qX7Q15eVjMzXtCT2iF1KzbQOQL40rNx28Aga/fmiEHBHwPDu A==; X-CSE-ConnectionGUID: AxAP0JOuScikMqf/WVymZg== X-CSE-MsgGUID: mooAd6yuSiagahC+rhvYJw== X-IronPort-AV: E=McAfee;i="6800,10657,11712"; a="95686371" X-IronPort-AV: E=Sophos;i="6.21,310,1763452800"; d="scan'208";a="95686371" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2026 06:49:47 -0800 X-CSE-ConnectionGUID: 3GTaz5njSF2iIC9u5MhBKg== X-CSE-MsgGUID: u+HxwkjORY2quCDPnLFAgg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,310,1763452800"; d="scan'208";a="216387397" Received: from mjarzebo-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.68]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2026 06:49:45 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Juha-Pekka Heikkila Subject: [PATCH 05/10] drm/i915/dpt: remove display/intel_dpt.h Date: Wed, 25 Feb 2026 16:49:11 +0200 Message-ID: X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" The remaining functions declared in intel_dpt.h are i915 specific, and so are the users, so we can move them to i915_dpt.h. There are some useless intel_dpt.h includes around that we can remove. Reviewed-by: Juha-Pekka Heikkila Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_display.c | 1 - drivers/gpu/drm/i915/display/intel_dpt.h | 19 ------------------- drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- .../drm/i915/display/skl_universal_plane.c | 1 - drivers/gpu/drm/i915/i915_dpt.c | 2 +- drivers/gpu/drm/i915/i915_dpt.h | 10 ++++++++++ 6 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 drivers/gpu/drm/i915/display/intel_dpt.h diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 33821cc2948b..24ea9c2b28ad 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -84,7 +84,6 @@ #include "intel_dp_tunnel.h" #include "intel_dpll.h" #include "intel_dpll_mgr.h" -#include "intel_dpt.h" #include "intel_dpt_common.h" #include "intel_drrs.h" #include "intel_dsb.h" diff --git a/drivers/gpu/drm/i915/display/intel_dpt.h b/drivers/gpu/drm/i915/display/intel_dpt.h deleted file mode 100644 index 0482af43e946..000000000000 --- a/drivers/gpu/drm/i915/display/intel_dpt.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Copyright © 2021 Intel Corporation - */ - -#ifndef __INTEL_DPT_H__ -#define __INTEL_DPT_H__ - -#include - -struct i915_address_space; -struct i915_vma; - -struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm, - unsigned int alignment); -void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm); -u64 intel_dpt_offset(struct i915_vma *dpt_vma); - -#endif /* __INTEL_DPT_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c index 7249b784fbba..5d4ae8be5ca6 100644 --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c @@ -17,7 +17,7 @@ #include "intel_display_core.h" #include "intel_display_rpm.h" #include "intel_display_types.h" -#include "intel_dpt.h" +#include "i915_dpt.h" #include "intel_fb.h" #include "intel_fb_pin.h" #include "intel_plane.h" diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 746e942cafd2..677f1339b7f8 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -17,7 +17,6 @@ #include "intel_display_regs.h" #include "intel_display_types.h" #include "intel_display_utils.h" -#include "intel_dpt.h" #include "intel_fb.h" #include "intel_fbc.h" #include "intel_frontbuffer.h" diff --git a/drivers/gpu/drm/i915/i915_dpt.c b/drivers/gpu/drm/i915/i915_dpt.c index 635127ee5505..f33e886f3316 100644 --- a/drivers/gpu/drm/i915/i915_dpt.c +++ b/drivers/gpu/drm/i915/i915_dpt.c @@ -8,12 +8,12 @@ #include "display/intel_display_core.h" #include "display/intel_display_rpm.h" -#include "display/intel_dpt.h" #include "gem/i915_gem_domain.h" #include "gem/i915_gem_internal.h" #include "gem/i915_gem_lmem.h" #include "gt/gen8_ppgtt.h" +#include "i915_dpt.h" #include "i915_drv.h" struct i915_dpt { diff --git a/drivers/gpu/drm/i915/i915_dpt.h b/drivers/gpu/drm/i915/i915_dpt.h index 494cd4af3bcd..9b765bc8d88b 100644 --- a/drivers/gpu/drm/i915/i915_dpt.h +++ b/drivers/gpu/drm/i915/i915_dpt.h @@ -4,6 +4,16 @@ #ifndef __I915_DPT_H__ #define __I915_DPT_H__ +#include + +struct i915_address_space; +struct i915_vma; + +struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm, + unsigned int alignment); +void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm); +u64 intel_dpt_offset(struct i915_vma *dpt_vma); + extern const struct intel_display_dpt_interface i915_display_dpt_interface; #endif /* __I915_DPT_H__ */ -- 2.47.3