| Message ID | bf584e79e13001b962370a26e3b93c1c57ac6a1e.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:12PM +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: 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_hdmi.c | 2 +- > drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- > include/drm/{ => intel}/intel_lpe_audio.h | 0 strange thing here is that we have two different intel_lpe_audio.h. Can't they be merged? And, perhaps, we could also think of dropping the intel_ prefix for the files inside drm/intel/. In any case, Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Thanks, Andi
On Thu, 11 Apr 2024, Andi Shyti <andi.shyti@linux.intel.com> wrote: > Hi Jani, > > On Wed, Apr 10, 2024 at 01:05:12PM +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: 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_hdmi.c | 2 +- >> drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- >> include/drm/{ => intel}/intel_lpe_audio.h | 0 > > strange thing here is that we have two different > intel_lpe_audio.h. Can't they be merged? Not so strange. The one in i915 is internal to i915, and the one in include/drm is shared with sound/x86/intel_hdmi_audio.c. > And, perhaps, we could also think of dropping the intel_ prefix > for the files inside drm/intel/. This series was scripted, so I didn't go into manual stuff like that (yet). :) BR, Jani. > > In any case, > > Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> > > Thanks, > Andi
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 5f6deceaf8ba..959aa1143a7d 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -38,7 +38,7 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> -#include <drm/intel_lpe_audio.h> +#include <drm/intel/intel_lpe_audio.h> #include "g4x_hdmi.h" #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c index 5863763de530..4e3f78d1d4f9 100644 --- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c +++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c @@ -68,7 +68,7 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include <drm/intel_lpe_audio.h> +#include <drm/intel/intel_lpe_audio.h> #include "i915_drv.h" #include "i915_irq.h" diff --git a/include/drm/intel_lpe_audio.h b/include/drm/intel/intel_lpe_audio.h similarity index 100% rename from include/drm/intel_lpe_audio.h rename to include/drm/intel/intel_lpe_audio.h diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 02f5a7f9b728..d41ea09ffbe5 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -31,7 +31,7 @@ #include <sound/jack.h> #include <drm/drm_edid.h> #include <drm/drm_eld.h> -#include <drm/intel_lpe_audio.h> +#include <drm/intel/intel_lpe_audio.h> #include "intel_hdmi_audio.h" #define INTEL_HDMI_AUDIO_SUSPEND_DELAY_MS 5000
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: 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_hdmi.c | 2 +- drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- include/drm/{ => intel}/intel_lpe_audio.h | 0 sound/x86/intel_hdmi_audio.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename include/drm/{ => intel}/intel_lpe_audio.h (100%)