]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-rockchip-next-fixes-2016-01-22' of https://github.com/markyzq/kerne...
authorDave Airlie <airlied@redhat.com>
Fri, 29 Jan 2016 00:04:29 +0000 (10:04 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 29 Jan 2016 00:04:29 +0000 (10:04 +1000)
commitf8f2c04725c85e82ba3af248a7785b729b298ac5
tree5ea13e4496d54f52878b8d32a655e91478b98115
parentedd47046fa591b81a3c08adfbcbf215f7a6fade4
parentc51ae368b54be98007123406c834351ae9701b8d
Merge branch 'drm-rockchip-next-fixes-2016-01-22' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes

Here are some fixes for drm/rockchip, these fixes base on drm-next.

These fixes works on my popmetal(rk3288) board.

About patch: drm/atomic-helper: Export framebuffer_changed()
Daniel Vetter ack for merging it through rockchip git trees, so framebuffer_changed() can be reused by drm/rockchip.

All others looks good, so I'd like you can land them.

* 'drm-rockchip-next-fixes-2016-01-22' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION
  drm/rockchip: fix wrong pitch/size using on gem
  drm/rockchip: explain why we can't wait_for_vblanks
  drm/rockchip: don't wait for vblank if fb hasn't changed
  drm/atomic-helper: Export framebuffer_changed()
  drm/rockchip/dsi: fix handling mipi_dsi_pixel_format_to_bpp result
  drm/rockchip: vop: fix mask when updating interrupts
  drm/rockchip: cleanup unnecessary export symbol
  drm/rockchip: Don't build rockchip_drm_vop as modules