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.
Signed-off-by: Jani Nikula <[email protected]> --- 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 295f14416be7..6df7593c29d5 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -85,7 +85,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 <linux/types.h> - -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 28300ef898f6..597890649285 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 <linux/types.h> + +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
