| Message ID | 3ec9dfb58154d95e98afe03048a8f31cbbe1659e.1712743191.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: move Intel drm headers to a subdirectory | expand |
Hi Jani, On Wed, Apr 10, 2024 at 01:05:11PM +0300, Jani Nikula wrote: > Clean up the top level include/drm directory by grouping all the Intel > specific files under a common subdirectory. > > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Dave Airlie <airlied@gmail.com> > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Tomas Winkler <tomas.winkler@intel.com> > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Takashi Iwai <tiwai@suse.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_audio.c | 2 +- > drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- > drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 2 +- > drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 2 +- > drivers/gpu/drm/xe/xe_gsc_proxy.c | 2 +- > drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c | 2 +- > drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- > drivers/misc/mei/pxp/mei_pxp.c | 2 +- > include/drm/{ => intel}/i915_component.h | 0 > include/sound/hdaudio.h | 2 +- Please update also Documentation/gpu/i915.rst. Andi
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index 07e0c73204f3..53951c50b504 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -26,7 +26,7 @@ #include <drm/drm_edid.h> #include <drm/drm_eld.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include "i915_drv.h" #include "intel_atomic.h" diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index d5ed4c7dfbc0..183ea437d623 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -13,7 +13,7 @@ #include <linux/random.h> #include <drm/display/drm_hdcp_helper.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include "i915_drv.h" #include "i915_reg.h" diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c index e7619d81353c..d8edd7c054c8 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c @@ -5,7 +5,7 @@ #include <linux/component.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include <drm/intel/i915_gsc_proxy_mei_interface.h> #include "gt/intel_gt.h" diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c index b00d6c280159..051b6cdcf721 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c @@ -6,7 +6,7 @@ #include <linux/component.h> #include <drm/i915_pxp_tee_interface.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include "gem/i915_gem_lmem.h" #include "gt/intel_gt_print.h" diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c index ea7b5ffb8954..a278d08b343c 100644 --- a/drivers/gpu/drm/xe/xe_gsc_proxy.c +++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c @@ -9,7 +9,7 @@ #include <linux/delay.h> #include <drm/drm_managed.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include <drm/intel/i915_gsc_proxy_mei_interface.h> #include "abi/gsc_proxy_commands_abi.h" diff --git a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c index d5fbaf5d0c8e..f52fe23a6c0b 100644 --- a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c +++ b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/uuid.h> #include <drm/drm_connector.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include <drm/intel/i915_gsc_proxy_mei_interface.h> /** diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index f8759a6c9ed3..e43ea536c947 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -23,7 +23,7 @@ #include <linux/mei_cl_bus.h> #include <linux/component.h> #include <drm/drm_connector.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include <drm/i915_hdcp_interface.h> #include "mei_hdcp.h" diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index b1e4c23b31a3..5a7a4d8b0e23 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -19,7 +19,7 @@ #include <linux/mei_cl_bus.h> #include <linux/component.h> #include <drm/drm_connector.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> #include <drm/i915_pxp_tee_interface.h> #include "mei_pxp.h" diff --git a/include/drm/i915_component.h b/include/drm/intel/i915_component.h similarity index 100% rename from include/drm/i915_component.h rename to include/drm/intel/i915_component.h diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index a73d7f34f4e5..00d1ab6936dd 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -18,7 +18,7 @@ #include <sound/pcm.h> #include <sound/memalloc.h> #include <sound/hda_verbs.h> -#include <drm/i915_component.h> +#include <drm/intel/i915_component.h> /* codec node id */ typedef u16 hda_nid_t;
Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Dave Airlie <airlied@gmail.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Tomas Winkler <tomas.winkler@intel.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_audio.c | 2 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 2 +- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 2 +- drivers/gpu/drm/xe/xe_gsc_proxy.c | 2 +- drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c | 2 +- drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- drivers/misc/mei/pxp/mei_pxp.c | 2 +- include/drm/{ => intel}/i915_component.h | 0 include/sound/hdaudio.h | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename include/drm/{ => intel}/i915_component.h (100%)