Skip to contentSkip to conversation

drm/rockchip: inno_hdmi: Explicitly include drm_atomic.h

PATCH Applied Alex Bee 3 participants 5 messages Jan 15, 2024 – Jan 17, 2024

Subsystems (4)
lore
Share & tools
lore

Alex Bee

author
#0 lore raw

PATCH 1/1 drm/rockchip: inno_hdmi: Explicitly include drm_atomic.h

Commit d3e040f450ec ("drm/rockchip: inno_hdmi: Get rid of mode_set") started using drm_atomic_get_new_connector_state and drm_atomic_get_new_crtc_state which are defined in drm_atomic.h Building does currently only work if CONFIG_OF and CONFIG_DRM_PANEL_BRIDGE are enabled since this will include drm_atomic.h via drm_bridge.h (see drm_of.h).

Explicitly include drm_atomic.h in inno_hdmi.c to fix this.

---
 drivers/gpu/drm/rockchip/inno_hdmi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/rockchip/inno_hdmi.c +1 -0
index 925320fef0a8..3bb8f1382612 100644
@@ -15,6 +15,7 @@
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 
+#include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_of.h>
Signature · 1 line
2.43.0
maintainer Applied
#1 lore raw

Re: (subset) [PATCH] drm/rockchip: inno_hdmi: Explicitly include drm_atomic.h

Quoted 8 lines · Alex Bee

Commit d3e040f450ec ("drm/rockchip: inno_hdmi: Get rid of mode_set") started using drm_atomic_get_new_connector_state and drm_atomic_get_new_crtc_state which are defined in drm_atomic.h Building does currently only work if CONFIG_OF and CONFIG_DRM_PANEL_BRIDGE are enabled since this will include drm_atomic.h via drm_bridge.h (see drm_of.h).

[...]

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime

maintainer
#2 lore raw

Re: (subset) [PATCH] drm/rockchip: inno_hdmi: Explicitly include drm_atomic.h

Hi Maxime,

Am Mittwoch, 17. Januar 2024, 10:46:57 CET schrieb Maxime Ripard:

Quoted 11 lines · Alex Bee
Quoted 8 lines

Commit d3e040f450ec ("drm/rockchip: inno_hdmi: Get rid of mode_set") started using drm_atomic_get_new_connector_state and drm_atomic_get_new_crtc_state which are defined in drm_atomic.h Building does currently only work if CONFIG_OF and CONFIG_DRM_PANEL_BRIDGE are enabled since this will include drm_atomic.h via drm_bridge.h (see drm_of.h).

[...]

Applied to drm/drm-misc (drm-misc-next).

wouldn't have drm-misc-next-fixes been more appropriate? Because I _think_ the change causing the issue made it in during the current merge-window?

Heiko

maintainer
#3 lore raw

Re: Re: (subset) [PATCH] drm/rockchip: inno_hdmi: Explicitly include drm_atomic.h

Quoted 11 lines · Heiko Stübner

Hi Maxime,

Am Mittwoch, 17. Januar 2024, 10:46:57 CET schrieb Maxime Ripard:

Quoted 8 lines · Alex Bee
Quoted 7 lines

Commit d3e040f450ec ("drm/rockchip: inno_hdmi: Get rid of mode_set") started using drm_atomic_get_new_connector_state and drm_atomic_get_new_crtc_state which are defined in drm_atomic.h Building does currently only work if CONFIG_OF and CONFIG_DRM_PANEL_BRIDGE are enabled since this will include drm_atomic.h via drm_bridge.h (see drm_of.h).

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

[...]

Applied to drm/drm-misc (drm-misc-next).

wouldn't have drm-misc-next-fixes been more appropriate? Because I _think_ the change causing the issue made it in during the current merge-window?

AFAIK, the offending commit is in drm-misc-next only

Maxime

maintainer
#4 lore raw

Re: (subset) [PATCH] drm/rockchip: inno_hdmi: Explicitly include drm_atomic.h

Am Mittwoch, 17. Januar 2024, 14:47:48 CET schrieb Maxime Ripard:

Quoted 14 lines · Heiko Stübner
Quoted 13 lines

Hi Maxime,

Am Mittwoch, 17. Januar 2024, 10:46:57 CET schrieb Maxime Ripard:

Quoted 10 lines · Alex Bee
Quoted 8 lines

Commit d3e040f450ec ("drm/rockchip: inno_hdmi: Get rid of mode_set") started using drm_atomic_get_new_connector_state and drm_atomic_get_new_crtc_state which are defined in drm_atomic.h Building does currently only work if CONFIG_OF and CONFIG_DRM_PANEL_BRIDGE are enabled since this will include drm_atomic.h via drm_bridge.h (see drm_of.h).

[...]

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Applied to drm/drm-misc (drm-misc-next).

wouldn't have drm-misc-next-fixes been more appropriate? Because I _think_ the change causing the issue made it in during the current merge-window?

AFAIK, the offending commit is in drm-misc-next only

ah, you're of course right. Mistook that for the one in the rk3066_hdmi but that was fixed back in november already.

So all is well.

Heiko