| Message ID | 20231212135338.3816669-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/radeon: include drm/drm_edid.h only where needed | expand |
Applied. Thanks! Alex On Tue, Dec 12, 2023 at 9:10 AM Jani Nikula <jani.nikula@intel.com> wrote: > > Including drm_edid.h from radeon_mode.h causes the rebuild of more than > a hundred files when drm_edid.h is modified, while there are only a > handful of files that actually need to include drm_edid.h. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/radeon/atombios_encoders.c | 1 + > drivers/gpu/drm/radeon/dce3_1_afmt.c | 1 + > drivers/gpu/drm/radeon/dce6_afmt.c | 1 + > drivers/gpu/drm/radeon/evergreen.c | 1 + > drivers/gpu/drm/radeon/evergreen_hdmi.c | 1 + > drivers/gpu/drm/radeon/radeon_atombios.c | 1 + > drivers/gpu/drm/radeon/radeon_audio.c | 1 + > drivers/gpu/drm/radeon/radeon_audio.h | 4 +++- > drivers/gpu/drm/radeon/radeon_combios.c | 1 + > drivers/gpu/drm/radeon/radeon_encoders.c | 1 + > drivers/gpu/drm/radeon/radeon_mode.h | 2 +- > 11 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c > index 4aca09cab4b8..6e537c5bd295 100644 > --- a/drivers/gpu/drm/radeon/atombios_encoders.c > +++ b/drivers/gpu/drm/radeon/atombios_encoders.c > @@ -29,6 +29,7 @@ > #include <linux/pci.h> > > #include <drm/drm_crtc_helper.h> > +#include <drm/drm_edid.h> > #include <drm/drm_file.h> > #include <drm/drm_modeset_helper_vtables.h> > #include <drm/radeon_drm.h> > diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c > index e8fe239b9d79..324e9b765098 100644 > --- a/drivers/gpu/drm/radeon/dce3_1_afmt.c > +++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c > @@ -21,6 +21,7 @@ > * OTHER DEALINGS IN THE SOFTWARE. > */ > #include <linux/hdmi.h> > +#include <drm/drm_edid.h> > > #include "radeon.h" > #include "radeon_asic.h" > diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c > index 4a1d5447eac1..4c06f47453fd 100644 > --- a/drivers/gpu/drm/radeon/dce6_afmt.c > +++ b/drivers/gpu/drm/radeon/dce6_afmt.c > @@ -21,6 +21,7 @@ > * > */ > #include <linux/hdmi.h> > +#include <drm/drm_edid.h> > > #include "dce6_afmt.h" > #include "radeon.h" > diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c > index f0ae087be914..a424b86008b8 100644 > --- a/drivers/gpu/drm/radeon/evergreen.c > +++ b/drivers/gpu/drm/radeon/evergreen.c > @@ -26,6 +26,7 @@ > #include <linux/pci.h> > #include <linux/slab.h> > > +#include <drm/drm_edid.h> > #include <drm/drm_vblank.h> > #include <drm/radeon_drm.h> > #include <drm/drm_fourcc.h> > diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c > index 5f3078f8ab95..681119c91d94 100644 > --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c > +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c > @@ -26,6 +26,7 @@ > */ > #include <linux/hdmi.h> > > +#include <drm/drm_edid.h> > #include <drm/radeon_drm.h> > #include "evergreen_hdmi.h" > #include "radeon.h" > diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c > index 85c4bb186203..3596ea4a8b60 100644 > --- a/drivers/gpu/drm/radeon/radeon_atombios.c > +++ b/drivers/gpu/drm/radeon/radeon_atombios.c > @@ -27,6 +27,7 @@ > #include <linux/pci.h> > > #include <drm/drm_device.h> > +#include <drm/drm_edid.h> > #include <drm/radeon_drm.h> > > #include "radeon.h" > diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c > index 279bf130a18c..053058c5c1fa 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_edid.h> > #include <drm/drm_eld.h> > #include "dce6_afmt.h" > #include "evergreen_hdmi.h" > diff --git a/drivers/gpu/drm/radeon/radeon_audio.h b/drivers/gpu/drm/radeon/radeon_audio.h > index 05e67867469b..dacaaa007051 100644 > --- a/drivers/gpu/drm/radeon/radeon_audio.h > +++ b/drivers/gpu/drm/radeon/radeon_audio.h > @@ -27,7 +27,9 @@ > > #include <linux/types.h> > > -#define RREG32_ENDPOINT(block, reg) \ > +struct cea_sad; > + > +#define RREG32_ENDPOINT(block, reg) \ > radeon_audio_endpoint_rreg(rdev, (block), (reg)) > #define WREG32_ENDPOINT(block, reg, v) \ > radeon_audio_endpoint_wreg(rdev, (block), (reg), (v)) > diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c > index 2620efc7c675..6952b1273b0f 100644 > --- a/drivers/gpu/drm/radeon/radeon_combios.c > +++ b/drivers/gpu/drm/radeon/radeon_combios.c > @@ -28,6 +28,7 @@ > #include <linux/pci.h> > > #include <drm/drm_device.h> > +#include <drm/drm_edid.h> > #include <drm/radeon_drm.h> > > #include "radeon.h" > diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c > index 9cb6401fe97e..3de3dce9e89d 100644 > --- a/drivers/gpu/drm/radeon/radeon_encoders.c > +++ b/drivers/gpu/drm/radeon/radeon_encoders.c > @@ -26,6 +26,7 @@ > > #include <linux/pci.h> > > +#include <drm/drm_edid.h> > #include <drm/drm_device.h> > #include <drm/radeon_drm.h> > > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index 1decdcec0264..59c4db13d90a 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -32,13 +32,13 @@ > > #include <drm/display/drm_dp_helper.h> > #include <drm/drm_crtc.h> > -#include <drm/drm_edid.h> > #include <drm/drm_encoder.h> > #include <drm/drm_fixed.h> > #include <drm/drm_modeset_helper_vtables.h> > #include <linux/i2c.h> > #include <linux/i2c-algo-bit.h> > > +struct edid; > struct radeon_bo; > struct radeon_device; > > -- > 2.39.2 >
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 4aca09cab4b8..6e537c5bd295 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -29,6 +29,7 @@ #include <linux/pci.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> #include <drm/drm_file.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/radeon_drm.h> diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c index e8fe239b9d79..324e9b765098 100644 --- a/drivers/gpu/drm/radeon/dce3_1_afmt.c +++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c @@ -21,6 +21,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ #include <linux/hdmi.h> +#include <drm/drm_edid.h> #include "radeon.h" #include "radeon_asic.h" diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index 4a1d5447eac1..4c06f47453fd 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -21,6 +21,7 @@ * */ #include <linux/hdmi.h> +#include <drm/drm_edid.h> #include "dce6_afmt.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index f0ae087be914..a424b86008b8 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -26,6 +26,7 @@ #include <linux/pci.h> #include <linux/slab.h> +#include <drm/drm_edid.h> #include <drm/drm_vblank.h> #include <drm/radeon_drm.h> #include <drm/drm_fourcc.h> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c index 5f3078f8ab95..681119c91d94 100644 --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c @@ -26,6 +26,7 @@ */ #include <linux/hdmi.h> +#include <drm/drm_edid.h> #include <drm/radeon_drm.h> #include "evergreen_hdmi.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 85c4bb186203..3596ea4a8b60 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -27,6 +27,7 @@ #include <linux/pci.h> #include <drm/drm_device.h> +#include <drm/drm_edid.h> #include <drm/radeon_drm.h> #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 279bf130a18c..053058c5c1fa 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_edid.h> #include <drm/drm_eld.h> #include "dce6_afmt.h" #include "evergreen_hdmi.h" diff --git a/drivers/gpu/drm/radeon/radeon_audio.h b/drivers/gpu/drm/radeon/radeon_audio.h index 05e67867469b..dacaaa007051 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.h +++ b/drivers/gpu/drm/radeon/radeon_audio.h @@ -27,7 +27,9 @@ #include <linux/types.h> -#define RREG32_ENDPOINT(block, reg) \ +struct cea_sad; + +#define RREG32_ENDPOINT(block, reg) \ radeon_audio_endpoint_rreg(rdev, (block), (reg)) #define WREG32_ENDPOINT(block, reg, v) \ radeon_audio_endpoint_wreg(rdev, (block), (reg), (v)) diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 2620efc7c675..6952b1273b0f 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -28,6 +28,7 @@ #include <linux/pci.h> #include <drm/drm_device.h> +#include <drm/drm_edid.h> #include <drm/radeon_drm.h> #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 9cb6401fe97e..3de3dce9e89d 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -26,6 +26,7 @@ #include <linux/pci.h> +#include <drm/drm_edid.h> #include <drm/drm_device.h> #include <drm/radeon_drm.h> diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 1decdcec0264..59c4db13d90a 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -32,13 +32,13 @@ #include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_fixed.h> #include <drm/drm_modeset_helper_vtables.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> +struct edid; struct radeon_bo; struct radeon_device;
Including drm_edid.h from radeon_mode.h causes the rebuild of more than a hundred files when drm_edid.h is modified, while there are only a handful of files that actually need to include drm_edid.h. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/radeon/atombios_encoders.c | 1 + drivers/gpu/drm/radeon/dce3_1_afmt.c | 1 + drivers/gpu/drm/radeon/dce6_afmt.c | 1 + drivers/gpu/drm/radeon/evergreen.c | 1 + drivers/gpu/drm/radeon/evergreen_hdmi.c | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 1 + drivers/gpu/drm/radeon/radeon_audio.c | 1 + drivers/gpu/drm/radeon/radeon_audio.h | 4 +++- drivers/gpu/drm/radeon/radeon_combios.c | 1 + drivers/gpu/drm/radeon/radeon_encoders.c | 1 + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- 11 files changed, 13 insertions(+), 2 deletions(-)