> -----Original Message----- > From: Nikula, Jani <jani.nikula@xxxxxxxxx> > Sent: Thursday, September 7, 2023 2:58 PM > To: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; Nikula, Jani <jani.nikula@xxxxxxxxx>; > Golani, Mitulkumar Ajitkumar <mitulkumar.ajitkumar.golani@xxxxxxxxx> > Subject: [PATCH 3/6] drm/edid: include drm_eld.h only where required > > Reduce the dependencies on drm_eld.h. Some files might be able to drop the > dependency on drm_edid.h too with the direct inclusion of drm_eld.h. > > Cc: Mitul Golani <mitulkumar.ajitkumar.golani@xxxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + > drivers/gpu/drm/drm_edid.c | 1 + > drivers/gpu/drm/i915/display/intel_audio.c | 1 + > drivers/gpu/drm/i915/display/intel_crtc_state_dump.c | 1 + > drivers/gpu/drm/i915/display/intel_sdvo.c | 1 + > drivers/gpu/drm/nouveau/dispnv50/disp.c | 1 + > drivers/gpu/drm/radeon/radeon_audio.c | 1 + > drivers/gpu/drm/tegra/hdmi.c | 1 + > drivers/gpu/drm/tegra/sor.c | 1 + > include/drm/drm_edid.h | 1 - > sound/core/pcm_drm_eld.c | 1 + > sound/soc/codecs/hdac_hdmi.c | 1 + > sound/soc/codecs/hdmi-codec.c | 1 + > sound/x86/intel_hdmi_audio.c | 1 + > 14 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index 268cb99a4c4b..fe7e307ae7f9 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -86,6 +86,7 @@ > #include <drm/drm_blend.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > #include <drm/drm_vblank.h> > #include <drm/drm_audio_component.h> > #include <drm/drm_gem_atomic_helper.h> > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index > 39dd3f694544..2025970816c9 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -41,6 +41,7 @@ > #include <drm/drm_displayid.h> > #include <drm/drm_drv.h> > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > #include <drm/drm_encoder.h> > #include <drm/drm_print.h> > > diff --git a/drivers/gpu/drm/i915/display/intel_audio.c > b/drivers/gpu/drm/i915/display/intel_audio.c > index 19605264a35c..39f5b698e08a 100644 > --- a/drivers/gpu/drm/i915/display/intel_audio.c > +++ b/drivers/gpu/drm/i915/display/intel_audio.c > @@ -25,6 +25,7 @@ > #include <linux/kernel.h> > > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > #include <drm/i915_component.h> > > #include "i915_drv.h" > diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > index 8d4640d0fd34..fcddd6d81768 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > @@ -4,6 +4,7 @@ > */ > > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > > #include "i915_drv.h" > #include "intel_crtc_state_dump.h" > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c > b/drivers/gpu/drm/i915/display/intel_sdvo.c > index 135a2527fd1b..6abae283998e 100644 > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c > @@ -35,6 +35,7 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > > #include "i915_drv.h" > #include "i915_reg.h" > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c > b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index 4e7c9c353c51..9332aa633867 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -38,6 +38,7 @@ > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_probe_helper.h> > #include <drm/drm_vblank.h> > diff --git a/drivers/gpu/drm/radeon/radeon_audio.c > b/drivers/gpu/drm/radeon/radeon_audio.c > index d6ccaf24ee0c..279bf130a18c 100644 > --- a/drivers/gpu/drm/radeon/radeon_audio.c > +++ b/drivers/gpu/drm/radeon/radeon_audio.c > @@ -26,6 +26,7 @@ > #include <linux/component.h> > > #include <drm/drm_crtc.h> > +#include <drm/drm_eld.h> > #include "dce6_afmt.h" > #include "evergreen_hdmi.h" > #include "radeon.h" > diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c > index 0ba3ca3ac509..a1fcee665023 100644 > --- a/drivers/gpu/drm/tegra/hdmi.c > +++ b/drivers/gpu/drm/tegra/hdmi.c > @@ -24,6 +24,7 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > #include <drm/drm_debugfs.h> > +#include <drm/drm_eld.h> > #include <drm/drm_file.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_probe_helper.h> > diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index > d5a3d3f4fece..83341576630d 100644 > --- a/drivers/gpu/drm/tegra/sor.c > +++ b/drivers/gpu/drm/tegra/sor.c > @@ -20,6 +20,7 @@ > #include <drm/display/drm_scdc_helper.h> #include > <drm/drm_atomic_helper.h> #include <drm/drm_debugfs.h> > +#include <drm/drm_eld.h> > #include <drm/drm_file.h> > #include <drm/drm_panel.h> > #include <drm/drm_simple_kms_helper.h> > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index > 1ff52f57ab9c..e98aa6818700 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -25,7 +25,6 @@ > > #include <linux/types.h> > #include <linux/hdmi.h> > -#include <drm/drm_eld.h> /* FIXME: remove this, include directly where > needed */ #include <drm/drm_mode.h> > > struct drm_device; > diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c index > 07075071972d..1cdca4d4fc9c 100644 > --- a/sound/core/pcm_drm_eld.c > +++ b/sound/core/pcm_drm_eld.c > @@ -6,6 +6,7 @@ > #include <linux/export.h> > #include <linux/hdmi.h> > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > #include <sound/pcm.h> > #include <sound/pcm_drm_eld.h> > > diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c > index 8b6b76029694..d1b53fc1efb6 100644 > --- a/sound/soc/codecs/hdac_hdmi.c > +++ b/sound/soc/codecs/hdac_hdmi.c > @@ -16,6 +16,7 @@ > #include <linux/pm_runtime.h> > #include <linux/hdmi.h> > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> > #include <sound/pcm_params.h> > #include <sound/jack.h> > #include <sound/soc.h> > diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi- > codec.c index d21f69f05342..9b01d060f7cc 100644 > --- a/sound/soc/codecs/hdmi-codec.c > +++ b/sound/soc/codecs/hdmi-codec.c > @@ -17,6 +17,7 @@ > #include <sound/pcm_iec958.h> > > #include <drm/drm_crtc.h> /* This is only to get MAX_ELD_BYTES */ > +#include <drm/drm_eld.h> > > #define HDMI_CODEC_CHMAP_IDX_UNKNOWN -1 > > diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c > index ab95fb34a635..02f5a7f9b728 100644 > --- a/sound/x86/intel_hdmi_audio.c > +++ b/sound/x86/intel_hdmi_audio.c > @@ -30,6 +30,7 @@ > #include <sound/control.h> > #include <sound/jack.h> > #include <drm/drm_edid.h> > +#include <drm/drm_eld.h> Changes LGTM. Reviewed-by: Mitul Golani <mitulkumar.ajitkumar.golani@xxxxxxxxx> > #include <drm/intel_lpe_audio.h> > #include "intel_hdmi_audio.h" > > -- > 2.39.2
