diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-01-15 15:14:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-01-15 15:14:39 +1000 |
| commit | 1777b185f5cc0c6470f429b5a3f5f2766dc62f7a (patch) | |
| tree | 26f77d2297057936583ec7ba1ea081dc36d25b1e | |
| parent | fb5cfcaa2efbb4c71abb1dfbc8f4da727e0bfd89 (diff) | |
| parent | 82581fcf070b68a91fb3a3ade08d9a76380a4789 (diff) | |
| download | linux-1777b185f5cc0c6470f429b5a3f5f2766dc62f7a.tar.gz linux-1777b185f5cc0c6470f429b5a3f5f2766dc62f7a.tar.bz2 linux-1777b185f5cc0c6470f429b5a3f5f2766dc62f7a.zip | |
Merge tag 'imx-drm-next-2021-01-08' of git://git.pengutronix.de/git/pza/linux into drm-next
drm/imx: compile test fixes
- Fix COMPILE_TEST builds with CONFIG_OF disabled.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/8c048f3677f706de306c19ecf6868c4109c1c40d.camel@pengutronix.de
| -rw-r--r-- | drivers/gpu/drm/imx/Kconfig | 2 | ||||
| -rw-r--r-- | include/drm/drm_modes.h | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig index 73fe2bc5633c..b5fa0e45a839 100644 --- a/drivers/gpu/drm/imx/Kconfig +++ b/drivers/gpu/drm/imx/Kconfig @@ -37,7 +37,7 @@ config DRM_IMX_LDB config DRM_IMX_HDMI tristate "Freescale i.MX DRM HDMI" select DRM_DW_HDMI - depends on DRM_IMX + depends on DRM_IMX && OF help Choose this if you want to use HDMI on i.MX6. diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index a0d79d1c51e2..29ba4adf0c53 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h @@ -461,9 +461,19 @@ void drm_display_mode_from_videomode(const struct videomode *vm, void drm_display_mode_to_videomode(const struct drm_display_mode *dmode, struct videomode *vm); void drm_bus_flags_from_videomode(const struct videomode *vm, u32 *bus_flags); + +#if defined(CONFIG_OF) int of_get_drm_display_mode(struct device_node *np, struct drm_display_mode *dmode, u32 *bus_flags, int index); +#else +static inline int of_get_drm_display_mode(struct device_node *np, + struct drm_display_mode *dmode, + u32 *bus_flags, int index) +{ + return -EINVAL; +} +#endif void drm_mode_set_name(struct drm_display_mode *mode); int drm_mode_vrefresh(const struct drm_display_mode *mode); |