Hi Dave,
Please pull omapdrm changes for v4.5.
Tomi
The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/omapdrm-4.5
for you to fetch changes up to 49d274e110d185dbbacabc601b55fd7b9b0e91d6:
drm/omap: remove obsolete manager assignment (2015-12-18 11:08:20 +0200)
---------------------------------------------------------------- omapdrm changes for v4.5
* enable DRIVER_ATOMIC * improved TILER performance * cleanups preparing for DMAbuf import * fbdev emulation is now optional * minor fixes
---------------------------------------------------------------- Andy Gross (1): drm/omap: Use bitmaps for TILER placement
Laurent Pinchart (12): drm: omapdrm: Fix plane state free in plane reset handler drm: omapdrm: Make fbdev emulation optional drm: omapdrm: gem: Remove unused function prototypes drm: omapdrm: gem: Remove forward declarations drm: omapdrm: gem: Group functions by purpose drm: omapdrm: gem: Move global usergart variable to omap_drm_private drm: omapdrm: gem: Mask out private flags passed from userspace drm: omapdrm: gem: Free the correct memory object drm: omapdrm: gem: Fix GEM object destroy in error path drm: omapdrm: gem: Don't free mmap offset twice drm: omapdrm: gem: Simplify error handling when creating GEM object drm: omapdrm: gem: Remove check for impossible condition
Luis de Bethencourt (1): drm: omapdrm: tiler: Remove unneded module alias for tiler
Thierry Reding (1): drm/omap: Use platform_register/unregister_drivers()
Tomi Valkeinen (4): drm: omapdrm: move omap_plane_reset() drm/omap: remove unused plugin defines drm/omap: set DRIVER_ATOMIC for omapdrm drm/omap: remove obsolete manager assignment
drivers/gpu/drm/omapdrm/Makefile | 3 +- drivers/gpu/drm/omapdrm/omap_debugfs.c | 4 + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 15 +- drivers/gpu/drm/omapdrm/omap_drv.c | 44 +- drivers/gpu/drm/omapdrm/omap_drv.h | 17 +- drivers/gpu/drm/omapdrm/omap_encoder.c | 2 - drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 + drivers/gpu/drm/omapdrm/omap_gem.c | 304 +++++++----- drivers/gpu/drm/omapdrm/omap_plane.c | 53 +- drivers/gpu/drm/omapdrm/tcm-sita.c | 804 +++++++------------------------ drivers/gpu/drm/omapdrm/tcm.h | 26 +- include/uapi/drm/omap_drm.h | 6 - 12 files changed, 440 insertions(+), 842 deletions(-)
Hi Dave,
On 18/12/15 11:16, Tomi Valkeinen wrote:
Hi Dave,
Please pull omapdrm changes for v4.5.
Tomi
The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/omapdrm-4.5
for you to fetch changes up to 49d274e110d185dbbacabc601b55fd7b9b0e91d6:
drm/omap: remove obsolete manager assignment (2015-12-18 11:08:20 +0200)
I see there's a conflict with my tag and drm-next.
Commit 07a6dc19a36912a1bea7ce1d5856c5616c30839a ("drm/omap: use kzalloc in sita_init()") in drm-next makes a change to tcm-sita.c, which was pretty much re-written in my branch. I hadn't noticed that patch on the list.
The conflict looks a bit messy, but can be resolved easily by just taking tcm-sita.c from my tag, as the change in 07a6dc19a36912a is no longer needed.
So you can just do:
git merge -s recursive -X theirs omapdrm-4.5
Or you can merge a new tag I made 'omapdrm-4.5-resolved' which has the same patches, rebased (with -s recursive -X theirs) on top of drm-next.
Tomi
dri-devel@lists.freedesktop.org