Merge branch 'display' into merge

Conflicts:
	arch/arm/configs/omap2plus_defconfig

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
WIP: add DCE plugin v2

v2 add support to properly abort a txn

Conflicts:

	drivers/staging/Makefile
omapdce: add support for decoding into a single buffer object

XDM_MEMTYPE_BO_OFFSET can be used in VIDDEC3_process outBufs to
signal that a buffer descriptor denotes an offset to the bo
passed in the first descriptor. Useful for example to decode NV12
into a single bo.
omapdce: simplify the logic a bit

Signed-off-by: Rob Clark <rob@ti.com>
omapdce: synchronize with GPU

If a buffer is passed in which is still being read by the GPU,
wait for it to become writable.  If userspace takes care not
to pass in an in-use buffer, this will have no effect, but if
userspace does not know to synchronize with the GPU this will
prevent rendering artifacts resulting from writing a future
frame into a buffer the GPU is still reading.

Signed-off-by: Rob Clark <rob@ti.com>
omapdce: workaround for a codec bug in vc1vdec and mpeg2vdec

vc1vdec and mpeg2vdec want XDM_MEMTYPE_RAW instead of XDM_MEMTYPE_TILEDPAGE as
the memType for outbufs.
omapdce: simplify the code to set mem_type on buffer descriptors

Simplify the code to set mem_type by adding an explicit mem_type
argument to handle_buf_desc(). Needed for videnc2_*.
omapdce: add support for encoders
omapdce: handle in_args->input_id == 0 correctly

in_args->input_id == 0 is a valid value which can be used to
signal that no buffers are being passed in out_bufs. This is
usually done during flushing.

In codec_process and the code that tracks locked/unlocked
buffers, we were assuming input_id to always be non-zero though,
and codec_unlockbuf treats 0 as "unlock everything".

So special case input_id == 0 and as it means that no out_bufs
are being passed, avoid calling codec_lockbuf as there's nothing
to lock. This fixes buffer leaks/buffers being left pinned
forever.
omapdce: add a separate ioctl for getting version string

The version call uses a separate buffer to return the version string,
and this address needs to be translated and sent via RPC.
To avoid breaking backwards compatibility, a new ioctl is used.
Fix DCE compilation

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
Config for DCE

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>