Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9386bb0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

drivers/gpu/drm/drm_vblank.c

+2 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) 
	u32 vblank;

	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.");



	spin_lock_irqsave(&dev->vblank_time_lock, flags);

drivers/gpu/drm/rockchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ config ROCKCHIP_INNO_HDMI 
config ROCKCHIP_LVDS

	bool "Rockchip LVDS support"

	depends on DRM_ROCKCHIP

	depends on PINCTRL

	depends on PINCTRL && OF

	help

	  Choose this option to enable support for Rockchip LVDS controllers.

	  Rockchip rk3288 SoC has LVDS TX Controller can be used, and it