Commit a9386bb0 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-next-fixes-2017-11-08' of...

Merge tag 'drm-misc-next-fixes-2017-11-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

4.15 merge window fixes, round 2:

randconfig fix from Arnd, plus the vblank WARN_ON fix from Ville.

* tag 'drm-misc-next-fixes-2017-11-08' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/vblank: Tune drm_crtc_accurate_vblank_count() WARN down to a debug
  drm/rockchip: add CONFIG_OF dependency for lvds
parents 08671170 a111fbc4
...@@ -299,7 +299,7 @@ u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) ...@@ -299,7 +299,7 @@ u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)
u32 vblank; u32 vblank;
unsigned long flags; unsigned long flags;
WARN(!dev->driver->get_vblank_timestamp, WARN_ONCE(drm_debug & DRM_UT_VBL && !dev->driver->get_vblank_timestamp,
"This function requires support for accurate vblank timestamps."); "This function requires support for accurate vblank timestamps.");
spin_lock_irqsave(&dev->vblank_time_lock, flags); spin_lock_irqsave(&dev->vblank_time_lock, flags);
......
...@@ -60,7 +60,7 @@ config ROCKCHIP_INNO_HDMI ...@@ -60,7 +60,7 @@ config ROCKCHIP_INNO_HDMI
config ROCKCHIP_LVDS config ROCKCHIP_LVDS
bool "Rockchip LVDS support" bool "Rockchip LVDS support"
depends on DRM_ROCKCHIP depends on DRM_ROCKCHIP
depends on PINCTRL depends on PINCTRL && OF
help help
Choose this option to enable support for Rockchip LVDS controllers. Choose this option to enable support for Rockchip LVDS controllers.
Rockchip rk3288 SoC has LVDS TX Controller can be used, and it Rockchip rk3288 SoC has LVDS TX Controller can be used, and it
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment