Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: move i915_component.h under include/drm/intel

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

v2: Also change Documentation/gpu/i915.rst (Andi)

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>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a8c07233a8234858eb6711140482ef8db4c91cf4.1717075103.git.jani.nikula@intel.com

+10 -10
+1 -1
Documentation/gpu/i915.rst
··· 150 150 .. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c 151 151 :internal: 152 152 153 - .. kernel-doc:: include/drm/i915_component.h 153 + .. kernel-doc:: include/drm/intel/i915_component.h 154 154 :internal: 155 155 156 156 Intel HDMI LPE Audio Support
+1 -1
drivers/gpu/drm/i915/display/intel_audio.c
··· 26 26 27 27 #include <drm/drm_edid.h> 28 28 #include <drm/drm_eld.h> 29 - #include <drm/i915_component.h> 29 + #include <drm/intel/i915_component.h> 30 30 31 31 #include "i915_drv.h" 32 32 #include "intel_atomic.h"
+1 -1
drivers/gpu/drm/i915/display/intel_hdcp.c
··· 13 13 #include <linux/random.h> 14 14 15 15 #include <drm/display/drm_hdcp_helper.h> 16 - #include <drm/i915_component.h> 16 + #include <drm/intel/i915_component.h> 17 17 18 18 #include "i915_drv.h" 19 19 #include "i915_reg.h"
+1 -1
drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
··· 5 5 6 6 #include <linux/component.h> 7 7 8 - #include <drm/i915_component.h> 8 + #include <drm/intel/i915_component.h> 9 9 #include <drm/intel/i915_gsc_proxy_mei_interface.h> 10 10 11 11 #include "gt/intel_gt.h"
+1 -1
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
··· 6 6 #include <linux/component.h> 7 7 8 8 #include <drm/i915_pxp_tee_interface.h> 9 - #include <drm/i915_component.h> 9 + #include <drm/intel/i915_component.h> 10 10 11 11 #include "gem/i915_gem_lmem.h" 12 12 #include "gt/intel_gt_print.h"
+1 -1
drivers/gpu/drm/xe/xe_gsc_proxy.c
··· 9 9 #include <linux/delay.h> 10 10 11 11 #include <drm/drm_managed.h> 12 - #include <drm/i915_component.h> 12 + #include <drm/intel/i915_component.h> 13 13 #include <drm/intel/i915_gsc_proxy_mei_interface.h> 14 14 15 15 #include "abi/gsc_proxy_commands_abi.h"
+1 -1
drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
··· 17 17 #include <linux/slab.h> 18 18 #include <linux/uuid.h> 19 19 #include <drm/drm_connector.h> 20 - #include <drm/i915_component.h> 20 + #include <drm/intel/i915_component.h> 21 21 #include <drm/intel/i915_gsc_proxy_mei_interface.h> 22 22 23 23 /**
+1 -1
drivers/misc/mei/hdcp/mei_hdcp.c
··· 23 23 #include <linux/mei_cl_bus.h> 24 24 #include <linux/component.h> 25 25 #include <drm/drm_connector.h> 26 - #include <drm/i915_component.h> 26 + #include <drm/intel/i915_component.h> 27 27 #include <drm/i915_hdcp_interface.h> 28 28 29 29 #include "mei_hdcp.h"
+1 -1
drivers/misc/mei/pxp/mei_pxp.c
··· 19 19 #include <linux/mei_cl_bus.h> 20 20 #include <linux/component.h> 21 21 #include <drm/drm_connector.h> 22 - #include <drm/i915_component.h> 22 + #include <drm/intel/i915_component.h> 23 23 #include <drm/i915_pxp_tee_interface.h> 24 24 25 25 #include "mei_pxp.h"
include/drm/i915_component.h include/drm/intel/i915_component.h
+1 -1
include/sound/hdaudio.h
··· 18 18 #include <sound/pcm.h> 19 19 #include <sound/memalloc.h> 20 20 #include <sound/hda_verbs.h> 21 - #include <drm/i915_component.h> 21 + #include <drm/intel/i915_component.h> 22 22 23 23 /* codec node id */ 24 24 typedef u16 hda_nid_t;