| Message ID | 20231122221838.3164349-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/rockchip: rk3066_hdmi: include drm/drm_atomic.h | expand |
On 11/22/23 14:18, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Without this header, the newly added code fails to build: > > drivers/gpu/drm/rockchip/rk3066_hdmi.c: In function 'rk3066_hdmi_encoder_enable': > drivers/gpu/drm/rockchip/rk3066_hdmi.c:397:22: error: implicit declaration of function 'drm_atomic_get_new_connector_state'; did you mean 'drm_atomic_helper_connector_reset'? [-Werror=implicit-function-declaration] > 397 | conn_state = drm_atomic_get_new_connector_state(state, &hdmi->connector); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | drm_atomic_helper_connector_reset > drivers/gpu/drm/rockchip/rk3066_hdmi.c:397:20: error: assignment to 'struct drm_connector_state *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] > 397 | conn_state = drm_atomic_get_new_connector_state(state, &hdmi->connector); > | ^ > drivers/gpu/drm/rockchip/rk3066_hdmi.c:401:22: error: implicit declaration of function 'drm_atomic_get_new_crtc_state'; did you mean 'drm_atomic_helper_swap_state'? [-Werror=implicit-function-declaration] > 401 | crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | drm_atomic_helper_swap_state > drivers/gpu/drm/rockchip/rk3066_hdmi.c:401:20: error: assignment to 'struct drm_crtc_state *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] > 401 | crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); > | ^ > > Fixes: ae3436a5e7c2 ("drm/rockchip: rk3066_hdmi: Switch encoder hooks to atomic") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Thanks. > --- > drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c > index 0e7aae341960..7d561c5a650f 100644 > --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c > +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c > @@ -4,6 +4,7 @@ > * Zheng Yang <zhengyang@rock-chips.com> > */ > > +#include <drm/drm_atomic.h> > #include <drm/drm_edid.h> > #include <drm/drm_of.h> > #include <drm/drm_probe_helper.h>
On Wed, 22 Nov 2023 23:18:29 +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Without this header, the newly added code fails to build: > > drivers/gpu/drm/rockchip/rk3066_hdmi.c: In function 'rk3066_hdmi_encoder_enable': > drivers/gpu/drm/rockchip/rk3066_hdmi.c:397:22: error: implicit declaration of function 'drm_atomic_get_new_connector_state'; did you mean 'drm_atomic_helper_connector_reset'? [-Werror=implicit-function-declaration] > 397 | conn_state = drm_atomic_get_new_connector_state(state, &hdmi->connector); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | drm_atomic_helper_connector_reset > drivers/gpu/drm/rockchip/rk3066_hdmi.c:397:20: error: assignment to 'struct drm_connector_state *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] > 397 | conn_state = drm_atomic_get_new_connector_state(state, &hdmi->connector); > | ^ > drivers/gpu/drm/rockchip/rk3066_hdmi.c:401:22: error: implicit declaration of function 'drm_atomic_get_new_crtc_state'; did you mean 'drm_atomic_helper_swap_state'? [-Werror=implicit-function-declaration] > 401 | crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | drm_atomic_helper_swap_state > drivers/gpu/drm/rockchip/rk3066_hdmi.c:401:20: error: assignment to 'struct drm_crtc_state *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] > 401 | crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); > | ^ > > [...] Applied, thanks! [1/1] drm/rockchip: rk3066_hdmi: include drm/drm_atomic.h commit: f4814c20d14ca168382e8887c768f290e4a2a861 Very puzzling, I did testbuild with the atomic conversion in place and also re-did it again to before applying this patch and didn't get the mentioned error - not sure what I might have done differently to create a dufferent reszkt, In any case, I applied the fix. Best regards,
diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c index 0e7aae341960..7d561c5a650f 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -4,6 +4,7 @@ * Zheng Yang <zhengyang@rock-chips.com> */ +#include <drm/drm_atomic.h> #include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h>