UPSTREAM: drm: Fix compilation warning caused by static inline forward

The drm_crtc_mask() function used in <drm/drm_encoder.h> is a static
inline defined in <drm/drm_crtc.h>. If the first header is included in a
compilation unit without the second one, the following compilation
warning will be issued.

In file included from <linux>/drivers/gpu/drm/drm_bridge.c:29:0:
<linux>/include/drm/drm_encoder.h:192:95: warning: drm_crtc_mask used but never defined
 static inline uint32_t drm_crtc_mask(const struct drm_crtc *crtc);

Fix this by including the header defining the function instead of using
a forward declaration.

Signed-off-by: Laurent Pinchart <>
Reviewed-by: Daniel Vetter <>
Signed-off-by: Archit Taneja <>

(cherry picked from commit 2407d1dc04789bfb2f39d248644981d2233feb0e)

TEST=build and boot scarlet rev0, display still works

Change-Id: If0a223773661a6373560d8a7382721982805ba26
Signed-off-by: Nickey Yang <>
Commit-Ready: Brian Norris <>
Tested-by: nickey yang <>
Reviewed-by: St├ęphane Marchesin <>
Reviewed-by: Matthias Kaehlcke <>
1 file changed