Oops, I missed cc'ing the dri-devel list.

Tomi

On 02/04/15 13:50, Tomi Valkeinen wrote:

Hi Dave,

Please pull changes for omapdrm. These are based on drm-next branch as there were a few patches in drm-next from Laurent needed by these omapdrm changes.

Tomi

The following changes since commit 6b94aea01d4f96235e947892f6c39f837045e741:

Merge branch 'drm_next' of https://github.com/markyzq/kernel-drm-rockchip into drm-next (2015-03-19 14:05:53 +1000)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/omapdrm-4.1

for you to fetch changes up to 1d601da27b052be84eb49854ddbc7c1046d6702d:

drm/omap: tiler: add hibernation callback (2015-03-24 14:09:43 +0200)

---

omapdrm changes for 4.1

• universal plane support
• refactoring to prepare work atomic modesetting work
• a lot of small fixes

---

Grygorii Strashko (2): drm/omap: add hibernation callbacks drm/omap: tiler: add hibernation callback

Laurent Pinchart (14): drm: omapdrm: Fix indentation of structure and array initializers drm: omapdrm: Refactor CRTC creation code drm: omapdrm: Remove unused variables drm: omapdrm: Switch to the universal plane API drm: omapdrm: Rename omap_plane_dpms() to omap_plane_set_enable() drm: omapdrm: Reset the zorder property when disabling a plane drm: omapdrm: Fix race condition between GO and vblank IRQ drm: omapdrm: Remove manual update display support drm: omapdrm: Remove omap_crtc->full_update field drm: omapdrm: Avoid function forward declaration in omap_crtc.c drm: omapdrm: Prefix all plane functions with omap_plane_ drm: omapdrm: Pass integer source coordinates to omap_plane_mode_set() drm: omapdrm: Planes are already disabled when destroyed drm: omapdrm: Reorder CRTC functions

Tomi Valkeinen (20): drm/omap: fix encoder-crtc mapping drm/omap: page_flip: return -EBUSY if flip pending drm/omap: clear omap_obj->paddr in omap_gem_put_paddr() drm/omap: add pin refcounting to omap_framebuffer drm/omap: add a comment why locking is missing drm/omap: fix operation without fbdev drm/omap: fix error handling in omap_framebuffer_create() drm/omap: handle incompatible buffer stride and pixel size drm/omap: fix TILER on OMAP5 drm/omap: fix plane's channel selection drm/omap: tiler: fix race condition with engine->async drm/omap: remove dummy PM functions drm/omap: stop connector polling during suspend drm/omap: use DRM_ERROR_RATELIMITED() for error irqs drm/omap: fix race with error_irq drm/omap: only ignore DIGIT SYNC LOST for TV output drm/omap: do not use BUG_ON(!spin_is_locked(x)) drm/omap: fix race condition with dev->obj_list drm/omap: fix race conditon in DMM drm/omap: keep ref to old_fb

drivers/gpu/drm/omapdrm/omap_connector.c | 12 - drivers/gpu/drm/omapdrm/omap_crtc.c | 622 +++++++++++++++--------------- drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 8 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 80 ++-- drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 1 + drivers/gpu/drm/omapdrm/omap_drv.c | 241 ++++++------ drivers/gpu/drm/omapdrm/omap_drv.h | 23 +- drivers/gpu/drm/omapdrm/omap_fb.c | 66 ++-- drivers/gpu/drm/omapdrm/omap_fbdev.c | 57 +-- drivers/gpu/drm/omapdrm/omap_gem.c | 10 +- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 20 +- drivers/gpu/drm/omapdrm/omap_irq.c | 2 +- drivers/gpu/drm/omapdrm/omap_plane.c | 146 +++---- 13 files changed, 642 insertions(+), 646 deletions(-)