On Mon, 08 Jan 2024, Danilo Krummrich <dakr@xxxxxxxxxx> 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@xxxxxxxxxx>
>> Cc: Lyude Paul <lyude@xxxxxxxxxx>
>> Cc: Danilo Krummrich <dakr@xxxxxxxxxx>
>> Cc: nouveau@xxxxxxxxxxxxxxxxxxxxx
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> Reviewed-by: Danilo Krummrich <dakr@xxxxxxxxxx>
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 {
>
--
Jani Nikula, Intel
