Message ID | 20240115092434.41695-2-knaerzche@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/rockchip: inno_hdmi: Explicitly include drm_atomic.h | expand |
On Mon, 15 Jan 2024 10:24:35 +0100, Alex Bee wrote: > 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
Hi Maxime, Am Mittwoch, 17. Januar 2024, 10:46:57 CET schrieb Maxime Ripard: > On Mon, 15 Jan 2024 10:24:35 +0100, Alex Bee wrote: > > 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
On Wed, Jan 17, 2024 at 10:52:04AM +0100, Heiko Stübner wrote: > Hi Maxime, > > Am Mittwoch, 17. Januar 2024, 10:46:57 CET schrieb Maxime Ripard: > > On Mon, 15 Jan 2024 10:24:35 +0100, Alex Bee wrote: > > > 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? AFAIK, the offending commit is in drm-misc-next only Maxime
Am Mittwoch, 17. Januar 2024, 14:47:48 CET schrieb Maxime Ripard: > On Wed, Jan 17, 2024 at 10:52:04AM +0100, Heiko Stübner wrote: > > Hi Maxime, > > > > Am Mittwoch, 17. Januar 2024, 10:46:57 CET schrieb Maxime Ripard: > > > On Mon, 15 Jan 2024 10:24:35 +0100, Alex Bee wrote: > > > > 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? > > 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
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index 925320fef0a8..3bb8f1382612 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -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>
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. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202401100949.ZVRr0pIa-lkp@intel.com/ Closes: https://lore.kernel.org/oe-kbuild-all/202401081720.UtgAZgba-lkp@intel.com/ Fixes: d3e040f450ec ("drm/rockchip: inno_hdmi: Get rid of mode_set") Signed-off-by: Alex Bee <knaerzche@gmail.com> --- drivers/gpu/drm/rockchip/inno_hdmi.c | 1 + 1 file changed, 1 insertion(+)