From: Jani Nikula <jani.nikula@intel.com>
To: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: add intel_display_limits.h for key enums
Date: Wed, 25 Jan 2023 14:14:57 +0200 [thread overview]
Message-ID: <87mt666cam.fsf@intel.com> (raw)
In-Reply-To: <Y8bgndYojVvvfq7P@intel.com>
On Tue, 17 Jan 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Mon, Jan 16, 2023 at 06:46:44PM +0200, Jani Nikula wrote:
>> Move a handful of key enums to a new file intel_display_limits.h. These
>> are the enum types, and the MAX/NUM enumerations within them, that are
>> used in other headers. Otherwise, there's no common theme between them.
>>
>> Replace intel_display.h include with intel_display_limit.h where
>> relevant, and add the intel_display.h include directly in the .c files
>> where needed.
>>
>> Since intel_display.h is used almost everywhere in display/, include it
>> from intel_display_types.h to avoid massive changes across the
>> board. There are very few files that would need intel_display_types.h
>> but not intel_display.h so this is neglible, and further cleanup between
>> these headers can be left for the future.
>>
>> Overall this change drops the direct and indirect dependencies on
>> intel_display.h from about 300 to about 100 compilation units, because
>> we can drop the include from i915_drv.h.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks for the review, pushed to din with Ville's IRC ack.
BR,
Jani.
>
>>
>> ---
>>
>> N.b. intel_display_limits.h is not a great name. I was hoping it was
>> only needed for the MAX/NUM enumerations such as I915_MAX_PIPES but
>> there are a number of headers that use the types for struct members as
>> well. intel_display_enums.h sounds too generic too. Suggestions?
>> ---
>> drivers/gpu/drm/i915/display/intel_bw.h | 2 +-
>> drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +-
>> drivers/gpu/drm/i915/display/intel_display.h | 115 +---------------
>> .../gpu/drm/i915/display/intel_display_core.h | 2 +-
>> .../drm/i915/display/intel_display_limits.h | 124 ++++++++++++++++++
>> .../i915/display/intel_display_power_map.c | 1 +
>> .../drm/i915/display/intel_display_types.h | 1 +
>> drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +-
>> drivers/gpu/drm/i915/display/skl_watermark.h | 2 +-
>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 1 +
>> drivers/gpu/drm/i915/gem/i915_gem_domain.c | 1 +
>> drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 +
>> drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 +
>> drivers/gpu/drm/i915/gt/intel_rps.c | 1 +
>> drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 +
>> drivers/gpu/drm/i915/gvt/display.c | 1 +
>> drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 +-
>> drivers/gpu/drm/i915/i915_drv.h | 2 +-
>> drivers/gpu/drm/i915/i915_pci.c | 1 +
>> drivers/gpu/drm/i915/i915_vma.c | 1 +
>> drivers/gpu/drm/i915/intel_device_info.c | 1 +
>> drivers/gpu/drm/i915/intel_device_info.h | 2 +-
>> drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 +
>> drivers/gpu/drm/i915/intel_pm.c | 1 +
>> drivers/gpu/drm/i915/intel_pm_types.h | 2 +-
>> drivers/gpu/drm/i915/vlv_sideband.c | 1 +
>> 26 files changed, 149 insertions(+), 123 deletions(-)
>> create mode 100644 drivers/gpu/drm/i915/display/intel_display_limits.h
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
>> index cb7ee3a24a58..f20292143745 100644
>> --- a/drivers/gpu/drm/i915/display/intel_bw.h
>> +++ b/drivers/gpu/drm/i915/display/intel_bw.h
>> @@ -8,7 +8,7 @@
>>
>> #include <drm/drm_atomic.h>
>>
>> -#include "intel_display.h"
>> +#include "intel_display_limits.h"
>> #include "intel_display_power.h"
>> #include "intel_global_state.h"
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
>> index c674879a84a5..51e2f6a11ce4 100644
>> --- a/drivers/gpu/drm/i915/display/intel_cdclk.h
>> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.h
>> @@ -8,7 +8,7 @@
>>
>> #include <linux/types.h>
>>
>> -#include "intel_display.h"
>> +#include "intel_display_limits.h"
>> #include "intel_global_state.h"
>>
>> struct drm_i915_private;
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
>> index ef73730f32b0..cb6f520cc575 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display.h
>> @@ -28,6 +28,7 @@
>> #include <drm/drm_util.h>
>>
>> #include "i915_reg_defs.h"
>> +#include "intel_display_limits.h"
>>
>> enum drm_scaling_filter;
>> struct dpll;
>> @@ -62,51 +63,9 @@ struct intel_remapped_info;
>> struct intel_rotation_info;
>> struct pci_dev;
>>
>> -/*
>> - * Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
>> - * rest have consecutive values and match the enum values of transcoders
>> - * with a 1:1 transcoder -> pipe mapping.
>> - */
>> -enum pipe {
>> - INVALID_PIPE = -1,
>> -
>> - PIPE_A = 0,
>> - PIPE_B,
>> - PIPE_C,
>> - PIPE_D,
>> - _PIPE_EDP,
>> -
>> - I915_MAX_PIPES = _PIPE_EDP
>> -};
>>
>> #define pipe_name(p) ((p) + 'A')
>>
>> -enum transcoder {
>> - INVALID_TRANSCODER = -1,
>> - /*
>> - * The following transcoders have a 1:1 transcoder -> pipe mapping,
>> - * keep their values fixed: the code assumes that TRANSCODER_A=0, the
>> - * rest have consecutive values and match the enum values of the pipes
>> - * they map to.
>> - */
>> - TRANSCODER_A = PIPE_A,
>> - TRANSCODER_B = PIPE_B,
>> - TRANSCODER_C = PIPE_C,
>> - TRANSCODER_D = PIPE_D,
>> -
>> - /*
>> - * The following transcoders can map to any pipe, their enum value
>> - * doesn't need to stay fixed.
>> - */
>> - TRANSCODER_EDP,
>> - TRANSCODER_DSI_0,
>> - TRANSCODER_DSI_1,
>> - TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
>> - TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
>> -
>> - I915_MAX_TRANSCODERS
>> -};
>> -
>> static inline const char *transcoder_name(enum transcoder transcoder)
>> {
>> switch (transcoder) {
>> @@ -147,29 +106,6 @@ enum i9xx_plane_id {
>> #define plane_name(p) ((p) + 'A')
>> #define sprite_name(p, s) ((p) * RUNTIME_INFO(dev_priv)->num_sprites[(p)] + (s) + 'A')
>>
>> -/*
>> - * Per-pipe plane identifier.
>> - * I915_MAX_PLANES in the enum below is the maximum (across all platforms)
>> - * number of planes per CRTC. Not all platforms really have this many planes,
>> - * which means some arrays of size I915_MAX_PLANES may have unused entries
>> - * between the topmost sprite plane and the cursor plane.
>> - *
>> - * This is expected to be passed to various register macros
>> - * (eg. PLANE_CTL(), PS_PLANE_SEL(), etc.) so adjust with care.
>> - */
>> -enum plane_id {
>> - PLANE_PRIMARY,
>> - PLANE_SPRITE0,
>> - PLANE_SPRITE1,
>> - PLANE_SPRITE2,
>> - PLANE_SPRITE3,
>> - PLANE_SPRITE4,
>> - PLANE_SPRITE5,
>> - PLANE_CURSOR,
>> -
>> - I915_MAX_PLANES,
>> -};
>> -
>> #define for_each_plane_id_on_crtc(__crtc, __p) \
>> for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \
>> for_each_if((__crtc)->plane_ids_mask & BIT(__p))
>> @@ -182,34 +118,6 @@ enum plane_id {
>> for_each_dbuf_slice((__dev_priv), (__slice)) \
>> for_each_if((__mask) & BIT(__slice))
>>
>> -enum port {
>> - PORT_NONE = -1,
>> -
>> - PORT_A = 0,
>> - PORT_B,
>> - PORT_C,
>> - PORT_D,
>> - PORT_E,
>> - PORT_F,
>> - PORT_G,
>> - PORT_H,
>> - PORT_I,
>> -
>> - /* tgl+ */
>> - PORT_TC1 = PORT_D,
>> - PORT_TC2,
>> - PORT_TC3,
>> - PORT_TC4,
>> - PORT_TC5,
>> - PORT_TC6,
>> -
>> - /* XE_LPD repositions D/E offsets and bitfields */
>> - PORT_D_XELPD = PORT_TC5,
>> - PORT_E_XELPD,
>> -
>> - I915_MAX_PORTS
>> -};
>> -
>> #define port_name(p) ((p) + 'A')
>>
>> /*
>> @@ -312,27 +220,6 @@ enum phy_fia {
>> FIA3,
>> };
>>
>> -enum hpd_pin {
>> - HPD_NONE = 0,
>> - HPD_TV = HPD_NONE, /* TV is known to be unreliable */
>> - HPD_CRT,
>> - HPD_SDVO_B,
>> - HPD_SDVO_C,
>> - HPD_PORT_A,
>> - HPD_PORT_B,
>> - HPD_PORT_C,
>> - HPD_PORT_D,
>> - HPD_PORT_E,
>> - HPD_PORT_TC1,
>> - HPD_PORT_TC2,
>> - HPD_PORT_TC3,
>> - HPD_PORT_TC4,
>> - HPD_PORT_TC5,
>> - HPD_PORT_TC6,
>> -
>> - HPD_NUM_PINS
>> -};
>> -
>> #define for_each_hpd_pin(__pin) \
>> for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
>> index 57ddce3ba02b..1d5d9d56fb3f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
>> @@ -17,7 +17,7 @@
>> #include <drm/drm_modeset_lock.h>
>>
>> #include "intel_cdclk.h"
>> -#include "intel_display.h"
>> +#include "intel_display_limits.h"
>> #include "intel_display_power.h"
>> #include "intel_dmc.h"
>> #include "intel_dpll_mgr.h"
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_limits.h b/drivers/gpu/drm/i915/display/intel_display_limits.h
>> new file mode 100644
>> index 000000000000..5126d0b5ae5d
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/display/intel_display_limits.h
>> @@ -0,0 +1,124 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2022 Intel Corporation
>> + */
>> +
>> +#ifndef __INTEL_DISPLAY_LIMITS_H__
>> +#define __INTEL_DISPLAY_LIMITS_H__
>> +
>> +/*
>> + * Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
>> + * rest have consecutive values and match the enum values of transcoders
>> + * with a 1:1 transcoder -> pipe mapping.
>> + */
>> +enum pipe {
>> + INVALID_PIPE = -1,
>> +
>> + PIPE_A = 0,
>> + PIPE_B,
>> + PIPE_C,
>> + PIPE_D,
>> + _PIPE_EDP,
>> +
>> + I915_MAX_PIPES = _PIPE_EDP
>> +};
>> +
>> +enum transcoder {
>> + INVALID_TRANSCODER = -1,
>> + /*
>> + * The following transcoders have a 1:1 transcoder -> pipe mapping,
>> + * keep their values fixed: the code assumes that TRANSCODER_A=0, the
>> + * rest have consecutive values and match the enum values of the pipes
>> + * they map to.
>> + */
>> + TRANSCODER_A = PIPE_A,
>> + TRANSCODER_B = PIPE_B,
>> + TRANSCODER_C = PIPE_C,
>> + TRANSCODER_D = PIPE_D,
>> +
>> + /*
>> + * The following transcoders can map to any pipe, their enum value
>> + * doesn't need to stay fixed.
>> + */
>> + TRANSCODER_EDP,
>> + TRANSCODER_DSI_0,
>> + TRANSCODER_DSI_1,
>> + TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
>> + TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
>> +
>> + I915_MAX_TRANSCODERS
>> +};
>> +
>> +/*
>> + * Per-pipe plane identifier.
>> + * I915_MAX_PLANES in the enum below is the maximum (across all platforms)
>> + * number of planes per CRTC. Not all platforms really have this many planes,
>> + * which means some arrays of size I915_MAX_PLANES may have unused entries
>> + * between the topmost sprite plane and the cursor plane.
>> + *
>> + * This is expected to be passed to various register macros
>> + * (eg. PLANE_CTL(), PS_PLANE_SEL(), etc.) so adjust with care.
>> + */
>> +enum plane_id {
>> + PLANE_PRIMARY,
>> + PLANE_SPRITE0,
>> + PLANE_SPRITE1,
>> + PLANE_SPRITE2,
>> + PLANE_SPRITE3,
>> + PLANE_SPRITE4,
>> + PLANE_SPRITE5,
>> + PLANE_CURSOR,
>> +
>> + I915_MAX_PLANES,
>> +};
>> +
>> +enum port {
>> + PORT_NONE = -1,
>> +
>> + PORT_A = 0,
>> + PORT_B,
>> + PORT_C,
>> + PORT_D,
>> + PORT_E,
>> + PORT_F,
>> + PORT_G,
>> + PORT_H,
>> + PORT_I,
>> +
>> + /* tgl+ */
>> + PORT_TC1 = PORT_D,
>> + PORT_TC2,
>> + PORT_TC3,
>> + PORT_TC4,
>> + PORT_TC5,
>> + PORT_TC6,
>> +
>> + /* XE_LPD repositions D/E offsets and bitfields */
>> + PORT_D_XELPD = PORT_TC5,
>> + PORT_E_XELPD,
>> +
>> + I915_MAX_PORTS
>> +};
>> +
>> +enum hpd_pin {
>> + HPD_NONE = 0,
>> + HPD_TV = HPD_NONE, /* TV is known to be unreliable */
>> + HPD_CRT,
>> + HPD_SDVO_B,
>> + HPD_SDVO_C,
>> + HPD_PORT_A,
>> + HPD_PORT_B,
>> + HPD_PORT_C,
>> + HPD_PORT_D,
>> + HPD_PORT_E,
>> + HPD_PORT_TC1,
>> + HPD_PORT_TC2,
>> + HPD_PORT_TC3,
>> + HPD_PORT_TC4,
>> + HPD_PORT_TC5,
>> + HPD_PORT_TC6,
>> +
>> + HPD_NUM_PINS
>> +};
>> +
>> +#endif /* __INTEL_DISPLAY_LIMITS_H__ */
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_power_map.c b/drivers/gpu/drm/i915/display/intel_display_power_map.c
>> index f5d66ca85b19..6645eb1911d8 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_power_map.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_power_map.c
>> @@ -10,6 +10,7 @@
>>
>> #include "intel_display_power_map.h"
>> #include "intel_display_power_well.h"
>> +#include "intel_display_types.h"
>>
>> #define __LIST_INLINE_ELEMS(__elem_type, ...) \
>> ((__elem_type[]) { __VA_ARGS__ })
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
>> index 32e8b2fc3cc6..8f3d5d02e207 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
>> @@ -50,6 +50,7 @@
>> #include "i915_vma_types.h"
>> #include "intel_bios.h"
>> #include "intel_display.h"
>> +#include "intel_display_limits.h"
>> #include "intel_display_power.h"
>> #include "intel_dpll_mgr.h"
>> #include "intel_pm_types.h"
>> diff --git a/drivers/gpu/drm/i915/display/intel_dvo_dev.h b/drivers/gpu/drm/i915/display/intel_dvo_dev.h
>> index ea8eb7dcee38..f7e98e1c6470 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dvo_dev.h
>> +++ b/drivers/gpu/drm/i915/display/intel_dvo_dev.h
>> @@ -25,7 +25,7 @@
>>
>> #include "i915_reg_defs.h"
>>
>> -#include "intel_display.h"
>> +#include "intel_display_limits.h"
>>
>> enum drm_connector_status;
>> struct drm_display_mode;
>> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.h b/drivers/gpu/drm/i915/display/skl_watermark.h
>> index 7a5a4e67cd73..37954c472070 100644
>> --- a/drivers/gpu/drm/i915/display/skl_watermark.h
>> +++ b/drivers/gpu/drm/i915/display/skl_watermark.h
>> @@ -8,7 +8,7 @@
>>
>> #include <linux/types.h>
>>
>> -#include "intel_display.h"
>> +#include "intel_display_limits.h"
>> #include "intel_global_state.h"
>> #include "intel_pm_types.h"
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c
>> index 005a7f842784..e76c9703680e 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c
>> @@ -5,6 +5,7 @@
>>
>> #include <drm/drm_fourcc.h>
>>
>> +#include "display/intel_display.h"
>> #include "gem/i915_gem_ioctls.h"
>> #include "gem/i915_gem_lmem.h"
>> #include "gem/i915_gem_region.h"
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
>> index 9969e687ad85..497de40b8e68 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
>> @@ -4,6 +4,7 @@
>> * Copyright © 2014-2016 Intel Corporation
>> */
>>
>> +#include "display/intel_display.h"
>> #include "display/intel_frontbuffer.h"
>> #include "gt/intel_gt.h"
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>> index 0c7fe360f873..b2f3f49f418f 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>> @@ -12,6 +12,7 @@
>> #include <drm/i915_drm.h>
>> #include <drm/intel-gtt.h>
>>
>> +#include "display/intel_display.h"
>> #include "gem/i915_gem_lmem.h"
>>
>> #include "intel_ggtt_gmch.h"
>> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
>> index 7ac8ed13e1fe..37d0b0fe791d 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
>> @@ -5,6 +5,7 @@
>>
>> #include <linux/highmem.h>
>>
>> +#include "display/intel_display.h"
>> #include "i915_drv.h"
>> #include "i915_reg.h"
>> #include "i915_scatterlist.h"
>> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
>> index 9ad3bc7201cb..f5d7b5126433 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_rps.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
>> @@ -7,6 +7,7 @@
>>
>> #include <drm/i915_drm.h>
>>
>> +#include "display/intel_display.h"
>> #include "i915_drv.h"
>> #include "i915_irq.h"
>> #include "intel_breadcrumbs.h"
>> diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
>> index 0ebf5fbf0e39..3c4ae1da0d41 100644
>> --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
>> +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
>> @@ -49,6 +49,7 @@
>> #include "i915_pvinfo.h"
>> #include "trace.h"
>>
>> +#include "display/intel_display.h"
>> #include "gem/i915_gem_context.h"
>> #include "gem/i915_gem_pm.h"
>> #include "gt/intel_context.h"
>> diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
>> index c033249e73f4..4d898b14de93 100644
>> --- a/drivers/gpu/drm/i915/gvt/display.c
>> +++ b/drivers/gpu/drm/i915/gvt/display.c
>> @@ -36,6 +36,7 @@
>> #include "i915_reg.h"
>> #include "gvt.h"
>>
>> +#include "display/intel_display.h"
>> #include "display/intel_dpio_phy.h"
>>
>> static int get_edp_pipe(struct intel_vgpu *vgpu)
>> diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.h b/drivers/gpu/drm/i915/gvt/fb_decoder.h
>> index 0daa3931aef7..4eff44194439 100644
>> --- a/drivers/gpu/drm/i915/gvt/fb_decoder.h
>> +++ b/drivers/gpu/drm/i915/gvt/fb_decoder.h
>> @@ -38,7 +38,7 @@
>>
>> #include <linux/types.h>
>>
>> -#include "display/intel_display.h"
>> +#include "display/intel_display_limits.h"
>>
>> struct intel_vgpu;
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index 48fd82722f12..aa7901bf484f 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -36,7 +36,7 @@
>>
>> #include <drm/ttm/ttm_device.h>
>>
>> -#include "display/intel_display.h"
>> +#include "display/intel_display_limits.h"
>> #include "display/intel_display_core.h"
>>
>> #include "gem/i915_gem_context_types.h"
>> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
>> index bc1af7e8f398..c69637bf0ad7 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -26,6 +26,7 @@
>> #include <drm/drm_drv.h>
>> #include <drm/i915_pciids.h>
>>
>> +#include "display/intel_display.h"
>> #include "gt/intel_gt_regs.h"
>> #include "gt/intel_sa_media.h"
>>
>> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
>> index 5272e2be990e..f51fd9fd4c89 100644
>> --- a/drivers/gpu/drm/i915/i915_vma.c
>> +++ b/drivers/gpu/drm/i915/i915_vma.c
>> @@ -26,6 +26,7 @@
>> #include <linux/dma-fence-array.h>
>> #include <drm/drm_gem.h>
>>
>> +#include "display/intel_display.h"
>> #include "display/intel_frontbuffer.h"
>> #include "gem/i915_gem_lmem.h"
>> #include "gem/i915_gem_tiling.h"
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>> index 05e90d09b208..98769e5f2c3d 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.c
>> +++ b/drivers/gpu/drm/i915/intel_device_info.c
>> @@ -29,6 +29,7 @@
>>
>> #include "display/intel_cdclk.h"
>> #include "display/intel_de.h"
>> +#include "display/intel_display.h"
>> #include "gt/intel_gt_regs.h"
>> #include "i915_drv.h"
>> #include "i915_reg.h"
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
>> index d588e5fd2eea..80bda653d61b 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.h
>> +++ b/drivers/gpu/drm/i915/intel_device_info.h
>> @@ -29,7 +29,7 @@
>>
>> #include "intel_step.h"
>>
>> -#include "display/intel_display.h"
>> +#include "display/intel_display_limits.h"
>>
>> #include "gt/intel_engine_types.h"
>> #include "gt/intel_context_types.h"
>> diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
>> index ce6b3c3b636a..1f4805aa2b08 100644
>> --- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
>> +++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
>> @@ -5,6 +5,7 @@
>>
>> #include "display/intel_audio_regs.h"
>> #include "display/intel_backlight_regs.h"
>> +#include "display/intel_display_types.h"
>> #include "display/intel_dmc_regs.h"
>> #include "display/intel_dpio_phy.h"
>> #include "display/vlv_dsi_pll_regs.h"
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 73c88b1c9545..3fc65bd12cc1 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -26,6 +26,7 @@
>> */
>>
>> #include "display/intel_de.h"
>> +#include "display/intel_display.h"
>> #include "display/intel_display_trace.h"
>> #include "display/skl_watermark.h"
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm_types.h b/drivers/gpu/drm/i915/intel_pm_types.h
>> index 211632f58751..93152537b420 100644
>> --- a/drivers/gpu/drm/i915/intel_pm_types.h
>> +++ b/drivers/gpu/drm/i915/intel_pm_types.h
>> @@ -8,7 +8,7 @@
>>
>> #include <linux/types.h>
>>
>> -#include "display/intel_display.h"
>> +#include "display/intel_display_limits.h"
>>
>> enum intel_ddb_partitioning {
>> INTEL_DDB_PART_1_2,
>> diff --git a/drivers/gpu/drm/i915/vlv_sideband.c b/drivers/gpu/drm/i915/vlv_sideband.c
>> index 6eea6e1a99c0..b98dec3ad817 100644
>> --- a/drivers/gpu/drm/i915/vlv_sideband.c
>> +++ b/drivers/gpu/drm/i915/vlv_sideband.c
>> @@ -9,6 +9,7 @@
>> #include "vlv_sideband.h"
>>
>> #include "display/intel_dpio_phy.h"
>> +#include "display/intel_display_types.h"
>>
>> /*
>> * IOSF sideband, see VLV2_SidebandMsg_HAS.docx and
>> --
>> 2.34.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
prev parent reply other threads:[~2023-01-25 12:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-16 16:46 [Intel-gfx] [PATCH] drm/i915/display: add intel_display_limits.h for key enums Jani Nikula
2023-01-16 17:38 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: add intel_display_limits.h for key enums (rev2) Patchwork
2023-01-16 18:06 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-01-16 19:24 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: add intel_display_limits.h for key enums (rev3) Patchwork
2023-01-16 19:49 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-16 22:30 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-01-17 17:53 ` [Intel-gfx] [PATCH] drm/i915/display: add intel_display_limits.h for key enums Rodrigo Vivi
2023-01-18 9:28 ` Jani Nikula
2023-01-25 12:14 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mt666cam.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.