drm: rcar-du: Fix build error
diff mbox series

Message ID 20190118172125.32504-1-natechancellor@gmail.com
State Not Applicable
Delegated to: Kieran Bingham
Headers show
Series
  • drm: rcar-du: Fix build error
Related show

Commit Message

Nathan Chancellor Jan. 18, 2019, 5:21 p.m. UTC
On arm{32,64} allyesconfig builds:

drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:40:1: error: incomplete result type 'enum drm_mode_status' in function definition
drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:47:10: error: incomplete definition of type 'struct drm_display_mode'
drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:48:10: error: use of undeclared identifier 'MODE_CLOCK_HIGH'
drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:50:9: error: use of undeclared identifier 'MODE_OK'

After the removal of drmP.h from this file and its removal from
bridge/dw_hdmi.h, these types are not defined anymore, as they
were implicitly coming into that file through drm_crtc.h.

Fixes: 428747ae5cca ("drm: remove include of drmP.h from bridge/dw_hdmi.h")
Fixes: 9a47db8e7a9d ("drm: rcar-du: Remove inclusion of drmP.h")
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Laurent Pinchart Jan. 22, 2019, 8:33 p.m. UTC | #1
Hi Nathan,

Thank you for the patch.

On Fri, Jan 18, 2019 at 10:21:25AM -0700, Nathan Chancellor wrote:
> On arm{32,64} allyesconfig builds:
> 
> drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:40:1: error: incomplete result type 'enum drm_mode_status' in function definition
> drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:47:10: error: incomplete definition of type 'struct drm_display_mode'
> drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:48:10: error: use of undeclared identifier 'MODE_CLOCK_HIGH'
> drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c:50:9: error: use of undeclared identifier 'MODE_OK'
> 
> After the removal of drmP.h from this file and its removal from
> bridge/dw_hdmi.h, these types are not defined anymore, as they
> were implicitly coming into that file through drm_crtc.h.
> 
> Fixes: 428747ae5cca ("drm: remove include of drmP.h from bridge/dw_hdmi.h")
> Fixes: 9a47db8e7a9d ("drm: rcar-du: Remove inclusion of drmP.h")
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

This was included by Dave in merge commit f164a94c2c87 ("Merge tag
'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc
into drm-next").

> ---
>  drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> index 0fb25113f19c..452461dc96f2 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> @@ -12,6 +12,7 @@
>  #include <linux/platform_device.h>
>  
>  #include <drm/bridge/dw_hdmi.h>
> +#include <drm/drm_modes.h>
>  
>  #define RCAR_HDMI_PHY_OPMODE_PLLCFG	0x06	/* Mode of operation and PLL dividers */
>  #define RCAR_HDMI_PHY_PLLCURRGMPCTRL	0x10	/* PLL current and Gmp (conductance) */

Patch
diff mbox series

diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
index 0fb25113f19c..452461dc96f2 100644
--- a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
+++ b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
@@ -12,6 +12,7 @@ 
 #include <linux/platform_device.h>
 
 #include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_modes.h>
 
 #define RCAR_HDMI_PHY_OPMODE_PLLCFG	0x06	/* Mode of operation and PLL dividers */
 #define RCAR_HDMI_PHY_PLLCURRGMPCTRL	0x10	/* PLL current and Gmp (conductance) */