| Message ID | 20240104201632.1100753-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/nouveau: include drm/drm_edid.h only where needed | expand |
Hi Jani, On Thu, Jan 04, 2024 at 10:16:30PM +0200, Jani Nikula wrote: > Including drm_edid.h from nouveau_connector.h causes the rebuild of 15 > files when drm_edid.h is modified, while there are only a few files that > actually need to include drm_edid.h. > > Cc: Karol Herbst <kherbst@redhat.com> > Cc: Lyude Paul <lyude@redhat.com> > Cc: Danilo Krummrich <dakr@redhat.com> > Cc: nouveau@lists.freedesktop.org > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Andi
On 1/4/24 21:16, Jani Nikula wrote: > Including drm_edid.h from nouveau_connector.h causes the rebuild of 15 > files when drm_edid.h is modified, while there are only a few files that > actually need to include drm_edid.h. > > Cc: Karol Herbst <kherbst@redhat.com> > Cc: Lyude Paul <lyude@redhat.com> > Cc: Danilo Krummrich <dakr@redhat.com> > Cc: nouveau@lists.freedesktop.org > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Danilo Krummrich <dakr@redhat.com> > --- > drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + > drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c > index 5f490fbf1877..83355dbc15ee 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/head.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c > @@ -32,6 +32,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_edid.h> > #include <drm/drm_vblank.h> > #include "nouveau_connector.h" > > diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h > index a2df4918340c..0608cabed058 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_connector.h > +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h > @@ -35,7 +35,6 @@ > > #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_util.h> > > @@ -44,6 +43,7 @@ > > struct nvkm_i2c_port; > struct dcb_output; > +struct edid; > > #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT > struct nouveau_backlight {
On Mon, 08 Jan 2024, Danilo Krummrich <dakr@redhat.com> wrote: > On 1/4/24 21:16, Jani Nikula wrote: >> Including drm_edid.h from nouveau_connector.h causes the rebuild of 15 >> files when drm_edid.h is modified, while there are only a few files that >> actually need to include drm_edid.h. >> >> Cc: Karol Herbst <kherbst@redhat.com> >> Cc: Lyude Paul <lyude@redhat.com> >> Cc: Danilo Krummrich <dakr@redhat.com> >> Cc: nouveau@lists.freedesktop.org >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Danilo Krummrich <dakr@redhat.com> Are you going to pick this up via the nouveau tree, or shall I apply it to drm-misc-next? BR, Jani. > >> --- >> drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + >> drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c >> index 5f490fbf1877..83355dbc15ee 100644 >> --- a/drivers/gpu/drm/nouveau/dispnv50/head.c >> +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c >> @@ -32,6 +32,7 @@ >> >> #include <drm/drm_atomic.h> >> #include <drm/drm_atomic_helper.h> >> +#include <drm/drm_edid.h> >> #include <drm/drm_vblank.h> >> #include "nouveau_connector.h" >> >> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h >> index a2df4918340c..0608cabed058 100644 >> --- a/drivers/gpu/drm/nouveau/nouveau_connector.h >> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h >> @@ -35,7 +35,6 @@ >> >> #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_util.h> >> >> @@ -44,6 +43,7 @@ >> >> struct nvkm_i2c_port; >> struct dcb_output; >> +struct edid; >> >> #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT >> struct nouveau_backlight { >
On 1/9/24 10:59, Jani Nikula wrote: > On Mon, 08 Jan 2024, Danilo Krummrich <dakr@redhat.com> wrote: >> On 1/4/24 21:16, Jani Nikula wrote: >>> Including drm_edid.h from nouveau_connector.h causes the rebuild of 15 >>> files when drm_edid.h is modified, while there are only a few files that >>> actually need to include drm_edid.h. >>> >>> Cc: Karol Herbst <kherbst@redhat.com> >>> Cc: Lyude Paul <lyude@redhat.com> >>> Cc: Danilo Krummrich <dakr@redhat.com> >>> Cc: nouveau@lists.freedesktop.org >>> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> >> Reviewed-by: Danilo Krummrich <dakr@redhat.com> > > Are you going to pick this up via the nouveau tree, or shall I apply it > to drm-misc-next? We don't maintain a separate tree, hence feel free to apply it to drm-misc-next. - Danilo > > BR, > Jani. > >> >>> --- >>> drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + >>> drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- >>> 2 files changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c >>> index 5f490fbf1877..83355dbc15ee 100644 >>> --- a/drivers/gpu/drm/nouveau/dispnv50/head.c >>> +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c >>> @@ -32,6 +32,7 @@ >>> >>> #include <drm/drm_atomic.h> >>> #include <drm/drm_atomic_helper.h> >>> +#include <drm/drm_edid.h> >>> #include <drm/drm_vblank.h> >>> #include "nouveau_connector.h" >>> >>> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h >>> index a2df4918340c..0608cabed058 100644 >>> --- a/drivers/gpu/drm/nouveau/nouveau_connector.h >>> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h >>> @@ -35,7 +35,6 @@ >>> >>> #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_util.h> >>> >>> @@ -44,6 +43,7 @@ >>> >>> struct nvkm_i2c_port; >>> struct dcb_output; >>> +struct edid; >>> >>> #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT >>> struct nouveau_backlight { >> >
On Tue, 09 Jan 2024, Danilo Krummrich <dakr@redhat.com> wrote: > On 1/9/24 10:59, Jani Nikula wrote: >> On Mon, 08 Jan 2024, Danilo Krummrich <dakr@redhat.com> wrote: >>> On 1/4/24 21:16, Jani Nikula wrote: >>>> Including drm_edid.h from nouveau_connector.h causes the rebuild of 15 >>>> files when drm_edid.h is modified, while there are only a few files that >>>> actually need to include drm_edid.h. >>>> >>>> Cc: Karol Herbst <kherbst@redhat.com> >>>> Cc: Lyude Paul <lyude@redhat.com> >>>> Cc: Danilo Krummrich <dakr@redhat.com> >>>> Cc: nouveau@lists.freedesktop.org >>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >>> >>> Reviewed-by: Danilo Krummrich <dakr@redhat.com> >> >> Are you going to pick this up via the nouveau tree, or shall I apply it >> to drm-misc-next? > > We don't maintain a separate tree, hence feel free to apply it to drm-misc-next. Thanks for the review, pushed to drm-misc-next. You do still have T: git https://gitlab.freedesktop.org/drm/nouveau.git MAINTAINERS entry, so I thought that's where you apply patches. BR, Jani.
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c index 5f490fbf1877..83355dbc15ee 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.c +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c @@ -32,6 +32,7 @@ #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> #include <drm/drm_vblank.h> #include "nouveau_connector.h" diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h index a2df4918340c..0608cabed058 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.h +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h @@ -35,7 +35,6 @@ #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_util.h> @@ -44,6 +43,7 @@ struct nvkm_i2c_port; struct dcb_output; +struct edid; #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT struct nouveau_backlight {
Including drm_edid.h from nouveau_connector.h causes the rebuild of 15 files when drm_edid.h is modified, while there are only a few files that actually need to include drm_edid.h. Cc: Karol Herbst <kherbst@redhat.com> Cc: Lyude Paul <lyude@redhat.com> Cc: Danilo Krummrich <dakr@redhat.com> Cc: nouveau@lists.freedesktop.org Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)