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

Commit 6c181c82 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-07-14' of git://anongit.freedesktop.org/drm-intel into drm-next 

I recovered dri-devel backlog from my vacation, more misc stuff:
- of_put_node fixes from Peter Chen (not all yet)
- more patches from Gustavo to use kms-native drm_crtc_vblank_* funcs
- docs sphinxification from Lukas Wunner
- bunch of fixes all over from Dan Carpenter
- more follow up work from Chris register/unregister rework in various
  places
- vgem dma-buf export (for writing testcases)
- small things all over from tons of different people

* tag 'topic/drm-misc-2016-07-14' of git://anongit.freedesktop.org/drm-intel: (52 commits)
  drm: Don't overwrite user ioctl arg unless requested
  dma-buf/sync_file: improve Kconfig description for Sync Files
  MAINTAINERS: add entry for the Sync File Framework
  drm: Resurrect atomic rmfb code
  drm/vgem: Use PAGE_KERNEL in place of x86-specific PAGE_KERNEL_IO
  qxl: silence uninitialized variable warning
  qxl: check for kmap failures
  vga_switcheroo: Sphinxify docs
  drm: Restore double clflush on the last partial cacheline
  gpu: drm: rockchip_drm_drv: add missing of_node_put after calling of_parse_phandle
  gpu: drm: sti_vtg: add missing of_node_put after calling of_parse_phandle
  gpu: drm: sti_hqvdp: add missing of_node_put after calling of_parse_phandle
  gpu: drm: sti_vdo: add missing of_node_put after calling of_parse_phandle
  gpu: drm: sti_compositor: add missing of_node_put after calling of_parse_phandle
  drm/tilcdc: use drm_crtc_handle_vblank()
  drm/rcar-du: use drm_crtc_handle_vblank()
  drm/nouveau: use drm_crtc_handle_vblank()
  drm/atmel: use drm_crtc_handle_vblank()
  drm/armada: use drm_crtc_handle_vblank()
  drm: make drm_vblank_count_and_time() static
  ...
parents 1640142b 01d3434a

Documentation/gpu/drm-internals.rst

+2 −2
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ private data in the open method should free it here. 
The lastclose method should restore CRTC and plane properties to default

value, so that a subsequent open of the device will not inherit state

from the previous user. It can also be used to execute delayed power

switching state changes, e.g. in conjunction with the vga_switcheroo

infrastructure (see ?). Beyond that KMS drivers should not do any

switching state changes, e.g. in conjunction with the :ref:`vga_switcheroo`

infrastructure. Beyond that KMS drivers should not do any

further cleanup. Only legacy UMS drivers might need to clean up device

state so that the vga console or an independent fbdev driver could take

over.

Documentation/gpu/vga-switcheroo.rst

+2 −6
Original line number Diff line number Diff line 
.. _vga_switcheroo:



==============

VGA Switcheroo

==============
@@ -94,9 +96,3 @@ Public functions 


.. kernel-doc:: include/linux/apple-gmux.h

   :internal:
 


.. WARNING: DOCPROC directive not supported: !Cdrivers/gpu/vga/vga_switcheroo.c



.. WARNING: DOCPROC directive not supported: !Cinclude/linux/vga_switcheroo.h



.. WARNING: DOCPROC directive not supported: !Cdrivers/platform/x86/apple-gmux.c

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -3779,6 +3779,17 @@ F: include/linux/*fence.h 
F:	Documentation/dma-buf-sharing.txt

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



SYNC FILE FRAMEWORK

M:	Sumit Semwal <sumit.semwal@linaro.org>

R:	Gustavo Padovan <gustavo@padovan.org>

S:	Maintained

L:	linux-media@vger.kernel.org

L:	dri-devel@lists.freedesktop.org

F:	drivers/dma-buf/sync_file.c

F:	include/linux/sync_file.h

F:	Documentation/sync_file.txt

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



DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Vinod Koul <vinod.koul@intel.com>

L:	dmaengine@vger.kernel.org

drivers/dma-buf/Kconfig

+12 −3
Original line number Diff line number Diff line 
menu "DMABUF options"



config SYNC_FILE

	bool "sync_file support for fences"

	bool "Explicit Synchronization Framework"

	default n

	select ANON_INODES

	select DMA_SHARED_BUFFER

	---help---

	  This option enables the fence framework synchronization to export

	  sync_files to userspace that can represent one or more fences.

	  The Sync File Framework adds explicit syncronization via

	  userspace. It enables send/receive 'struct fence' objects to/from

	  userspace via Sync File fds for synchronization between drivers via

	  userspace components. It has been ported from Android.



	  The first and main user for this is graphics in which a fence is

	  associated with a buffer. When a job is submitted to the GPU a fence

	  is attached to the buffer and is transferred via userspace, using Sync

	  Files fds, to the DRM driver for example. More details at

	  Documentation/sync_file.txt.



endmenu

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −0
Original line number Diff line number Diff line
@@ -1712,6 +1712,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
	amdgpu_bo_evict_vram(adev);

	amdgpu_ib_pool_fini(adev);

	amdgpu_fence_driver_fini(adev);

	drm_crtc_force_disable_all(adev->ddev);

	amdgpu_fbdev_fini(adev);

	r = amdgpu_fini(adev);

	kfree(adev->ip_block_status);