Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a90f5831 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2016-11-29' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

Big thing is that drm-misc is now officially a group maintainer/committer
model thing, with MAINTAINERS suitably updated. Otherwise just the usual
pile of misc things all over, nothing that stands out this time around.

* tag 'drm-misc-next-2016-11-29' of git://anongit.freedesktop.org/git/drm-misc: (33 commits)
  drm: Introduce drm_framebuffer_assign()
  drm/bridge: adv7511: Enable the audio data and clock pads on adv7533
  drm/bridge: adv7511: Add Audio support
  drm/edid: Consider alternate cea timings to be the same VIC
  drm/atomic: Constify drm_atomic_crtc_needs_modeset()
  drm: bridge: dw-hdmi: add ASoC dependency
  drm: Fix shift operations for drm_fb_helper::drm_target_preferred()
  drm: Avoid NULL dereference for DRM_LEGACY debug message
  drm: Use u64_to_user_ptr() helper for blob ioctls
  drm: Fix conflicting macro parameter in drm_mm_for_each_node_in_range()
  drm: Fixup kernel doc for driver->gem_create_object
  drm/hisilicon/hibmc: mark PM functions __maybe_unused
  drm/hisilicon/hibmc: Checking for NULL instead of IS_ERR()
  drm: bridge: add DesignWare HDMI I2S audio support
  drm: Check against color expansion in drm_mm_reserve_node()
  drm: Define drm_mm_for_each_node_in_range()
  drm/doc: Fix links in drm_property.c
  MAINTAINERS: Add link to drm-misc documentation
  vgaarb: use valid dev pointer in vgaarb_info()
  drm/atomic: Unconfuse the old_state mess in commmit_tail
  ...
parents 35838b47 389f78b3

Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ graph bindings specified in Documentation/devicetree/bindings/graph.txt. 
- Video port 0 for RGB input

- Video port 1 for VGA output



Optional properties:

- vdd-supply: Power supply for DAC



Example

-------

Documentation/gpu/drm-kms-helpers.rst

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ Atomic State Reset and Initialization 
.. kernel-doc:: drivers/gpu/drm/drm_atomic_helper.c

   :doc: atomic state reset and initialization



Helper Functions Reference

--------------------------



.. kernel-doc:: include/drm/drm_atomic_helper.h

   :internal:

Documentation/gpu/drm-kms.rst

+12 −0
Original line number Diff line number Diff line
@@ -260,6 +260,12 @@ Property Types and Blob Property Support 
.. kernel-doc:: drivers/gpu/drm/drm_property.c

   :export:



Standard Connector Properties

-----------------------------



.. kernel-doc:: drivers/gpu/drm/drm_connector.c

   :doc: standard connector properties



Plane Composition Properties

----------------------------
@@ -287,6 +293,12 @@ Tile Group Property 
.. kernel-doc:: drivers/gpu/drm/drm_connector.c

   :doc: Tile group



Explicit Fencing Properties

---------------------------



.. kernel-doc:: drivers/gpu/drm/drm_atomic.c

   :doc: explicit fencing properties



Existing KMS Properties

-----------------------

MAINTAINERS

+21 −2
Original line number Diff line number Diff line
@@ -3911,7 +3911,7 @@ F: include/linux/dma-buf* 
F:	include/linux/reservation.h

F:	include/linux/*fence.h

F:	Documentation/dma-buf-sharing.txt

T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git

T:	git git://anongit.freedesktop.org/drm/drm-misc



SYNC FILE FRAMEWORK

M:	Sumit Semwal <sumit.semwal@linaro.org>
@@ -3924,7 +3924,7 @@ F: drivers/dma-buf/sw_sync.c 
F:	include/linux/sync_file.h

F:	include/uapi/linux/sync_file.h

F:	Documentation/sync_file.txt

T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git

T:	git git://anongit.freedesktop.org/drm/drm-misc



DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Vinod Koul <vinod.koul@intel.com>
@@ -4022,11 +4022,30 @@ F: Documentation/gpu/ 
F:	include/drm/

F:	include/uapi/drm/



DRM DRIVERS AND MISC GPU PATCHES

M:	Daniel Vetter <daniel.vetter@intel.com>

M:	Jani Nikula <jani.nikula@linux.intel.com>

M:	Sean Paul <seanpaul@chromium.org>

W:	https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html

S:	Maintained

T:	git git://anongit.freedesktop.org/drm/drm-misc

F:	Documentation/gpu/

F:	drivers/gpu/vga/

F:	drivers/gpu/drm/*

F:	include/drm/drm*

F:	include/uapi/drm/drm*



DRM DRIVER FOR AST SERVER GRAPHICS CHIPS

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

F:	drivers/gpu/drm/ast/



DRM DRIVERS FOR BRIDGE CHIPS

M:	Archit Taneja <architt@codeaurora.org>

S:	Maintained

T:	git git://anongit.freedesktop.org/drm/drm-misc

F:	drivers/gpu/drm/bridge/



DRM DRIVER FOR BOCHS VIRTUAL GPU

M:	Gerd Hoffmann <kraxel@redhat.com>

S:	Odd Fixes

drivers/dma-buf/sync_file.c

+1 −2
Original line number Diff line number Diff line
@@ -308,8 +308,7 @@ static unsigned int sync_file_poll(struct file *file, poll_table *wait) 


	poll_wait(file, &sync_file->wq, wait);



	if (!poll_does_not_wait(wait) &&

	    !test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {

	if (!test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {

		if (dma_fence_add_callback(sync_file->fence, &sync_file->cb,

					   fence_check_cb_func) < 0)

			wake_up_all(&sync_file->wq);