diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-01-29 01:04:29 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-01-29 01:04:29 +0100 |
| commit | d8b8eb829d4c30cd1e41a1ddc308a0e7c22169da (patch) | |
| tree | 5ea13e4496d54f52878b8d32a655e91478b98115 /include | |
| parent | drm/vmwgfx: respect 'nomodeset' (diff) | |
| parent | drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION (diff) | |
| download | linux-d8b8eb829d4c30cd1e41a1ddc308a0e7c22169da.tar.xz linux-d8b8eb829d4c30cd1e41a1ddc308a0e7c22169da.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_atomic_helper.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 89d008dc08e2..fe5efada9d68 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -42,6 +42,10 @@ int drm_atomic_helper_commit(struct drm_device *dev, struct drm_atomic_state *state, bool async); +bool drm_atomic_helper_framebuffer_changed(struct drm_device *dev, + struct drm_atomic_state *old_state, + struct drm_crtc *crtc); + void drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, struct drm_atomic_state *old_state); |