Commit 21daaeee authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Ofc I promise just a few leftovers for drm-misc and somehow it's the
biggest pull. But really mostly trivial stuff:
- MAINTAINERS updates from Emil
- rename async to nonblock in atomic_commit to avoid the confusion between
  nonblocking ioctl and async flip (= not vblank synced), from Maarten.
  Needs to be regened with newer drivers, but probably only after -rc1 to
  catch them all.
- actually lockless gem_object_free, plus acked driver conversion patches.
  All the trickier prep stuff already is in drm-next.
- Noralf's nice work for generic defio support in our fbdev emulation.
  Keeps the udl hack, and qxl is tested by Gerd.

* tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel: (47 commits)
  drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked
  drm/etnaviv: Use lockless gem BO free callback
  drm/imx: Use lockless gem BO free callback
  drm/radeon: Use lockless gem BO free callback
  drm/amdgpu: Use lockless gem BO free callback
  drm/gem: support BO freeing without dev->struct_mutex
  MAINTAINERS: Add myself for the new VC4 (RPi GPU) graphics driver.
  MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers
  MAINTAINERS: Add a few DRM drivers by Dave Airlie
  MAINTAINERS: List the correct git repo for the Renesas DRM drivers
  MAINTAINERS: Update the files list for the Renesas DRM drivers
  MAINTAINERS: Update the files list for the Armada DRM driver
  MAINTAINERS: Update the files list for the Rockchip DRM driver
  MAINTAINERS: Update the files list for the Exynos DRM driver
  MAINTAINERS: Add maintainer entry for the VMWGFX DRM driver
  MAINTAINERS: Add maintainer entry for the MSM DRM driver
  MAINTAINERS: Add maintainer entry for the Nouveau DRM driver
  MAINTAINERS: Update the files list for the Etnaviv DRM driver
  MAINTAINERS: Remove unneded wildcard for the i915 DRM driver
  drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
  ...
parents 4946dd2e 6d3e7fdd

Documentation/DocBook/gpu.tmpl

+10 −12
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ void intel_crt_init(struct drm_device *dev) 
	</tr>

	<tr>

	<td rowspan="42" valign="top" >DRM</td>

	<td valign="top" >Generic</td>

	<td rowspan="2" valign="top" >Generic</td>

	<td valign="top" >“rotation”</td>

	<td valign="top" >BITMASK</td>

	<td valign="top" >{ 0, "rotate-0" },
@@ -1832,6 +1832,13 @@ void intel_crt_init(struct drm_device *dev) 
	image along the specified axis prior to rotation</td>

	</tr>

	<tr>

	<td valign="top" >“scaling mode”</td>

	<td valign="top" >ENUM</td>

	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>

	<td valign="top" >Connector</td>

	<td valign="top" >Supported by: amdgpu, gma500, i915, nouveau and radeon.</td>

	</tr>

	<tr>

	<td rowspan="5" valign="top" >Connector</td>

	<td valign="top" >“EDID”</td>

	<td valign="top" >BLOB | IMMUTABLE</td>
@@ -2068,21 +2075,12 @@ void intel_crt_init(struct drm_device *dev) 
	<td valign="top" >property to suggest an Y offset for a connector</td>

	</tr>

	<tr>

	<td rowspan="8" valign="top" >Optional</td>

	<td valign="top" >“scaling mode”</td>

	<td valign="top" >ENUM</td>

	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>

	<td valign="top" >Connector</td>

	<td valign="top" >TBD</td>

	</tr>

	<tr>

	<td rowspan="7" valign="top" >Optional</td>

	<td valign="top" >"aspect ratio"</td>

	<td valign="top" >ENUM</td>

	<td valign="top" >{ "None", "4:3", "16:9" }</td>

	<td valign="top" >Connector</td>

	<td valign="top" >DRM property to set aspect ratio from user space app.

		This enum is made generic to allow addition of custom aspect

		ratios.</td>

	<td valign="top" >TDB</td>

	</tr>

	<tr>

	<td valign="top" >“dirty”</td>

MAINTAINERS

+110 −7
Original line number Diff line number Diff line
@@ -3768,6 +3768,21 @@ F: drivers/gpu/vga/ 
F:	include/drm/

F:	include/uapi/drm/



DRM DRIVER FOR AST SERVER GRAPHICS CHIPS

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

F:	drivers/gpu/drm/ast/



DRM DRIVER FOR BOCHS VIRTUAL GPU

M:	Gerd Hoffmann <kraxel@redhat.com>

S:	Odd Fixes

F:	drivers/gpu/drm/bochs/



DRM DRIVER FOR QEMU'S CIRRUS DEVICE

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

F:	drivers/gpu/drm/cirrus/



RADEON and AMDGPU DRM DRIVERS

M:	Alex Deucher <alexander.deucher@amd.com>

M:	Christian König <christian.koenig@amd.com>
@@ -3800,7 +3815,7 @@ T: git git://anongit.freedesktop.org/drm-intel 
S:	Supported

F:	drivers/gpu/drm/i915/

F:	include/drm/i915*

F:	include/uapi/drm/i915*

F:	include/uapi/drm/i915_drm.h



DRM DRIVERS FOR ATMEL HLCDC

M:	Boris Brezillon <boris.brezillon@free-electrons.com>
@@ -3825,8 +3840,8 @@ L: dri-devel@lists.freedesktop.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git

S:	Supported

F:	drivers/gpu/drm/exynos/

F:	include/drm/exynos*

F:	include/uapi/drm/exynos*

F:	include/uapi/drm/exynos_drm.h

F:	Documentation/devicetree/bindings/display/exynos/



DRM DRIVERS FOR FREESCALE DCU

M:	Stefan Agner <stefan@agner.ch>
@@ -3863,6 +3878,31 @@ S: Maintained 
F:	drivers/gpu/drm/hisilicon/

F:	Documentation/devicetree/bindings/display/hisilicon/



DRM DRIVER FOR INTEL I810 VIDEO CARDS

S:	Orphan / Obsolete

F:	drivers/gpu/drm/i810/

F:	include/uapi/drm/i810_drm.h



DRM DRIVER FOR MSM ADRENO GPU

M:	Rob Clark <robdclark@gmail.com>

L:	linux-arm-msm@vger.kernel.org

L:	dri-devel@lists.freedesktop.org

L:	freedreno@lists.freedesktop.org

T:	git git://people.freedesktop.org/~robclark/linux

S:	Maintained

F:	drivers/gpu/drm/msm/

F:	include/uapi/drm/msm_drm.h

F:	Documentation/devicetree/bindings/display/msm/



DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS

M:	Ben Skeggs <bskeggs@redhat.com>

L:	dri-devel@lists.freedesktop.org

L:	nouveau@lists.freedesktop.org

T:	git git://github.com/skeggsb/linux

S:	Supported

F:	drivers/gpu/drm/nouveau/

F:	include/uapi/drm/nouveau_drm.h



DRM DRIVERS FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@gmail.com>

M:	Terje Bergström <tbergstrom@nvidia.com>
@@ -3876,22 +3916,54 @@ F: include/linux/host1x.h 
F:	include/uapi/drm/tegra_drm.h

F:	Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt



DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS

S:	Orphan / Obsolete

F:	drivers/gpu/drm/mga/

F:	include/uapi/drm/mga_drm.h



DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

F:	drivers/gpu/drm/mgag200/



DRM DRIVER FOR RAGE 128 VIDEO CARDS

S:	Orphan / Obsolete

F:	drivers/gpu/drm/r128/

F:	include/uapi/drm/r128_drm.h



DRM DRIVERS FOR RENESAS

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

L:	dri-devel@lists.freedesktop.org

L:	linux-renesas-soc@vger.kernel.org

T:	git git://people.freedesktop.org/~airlied/linux

T:	git git://linuxtv.org/pinchartl/fbdev

S:	Supported

F:	drivers/gpu/drm/rcar-du/

F:	drivers/gpu/drm/shmobile/

F:	include/linux/platform_data/shmob_drm.h

F:	Documentation/devicetree/bindings/display/renesas,du.txt



DRM DRIVER FOR QXL VIRTUAL GPU

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

F:	drivers/gpu/drm/qxl/

F:	include/uapi/drm/qxl_drm.h



DRM DRIVERS FOR ROCKCHIP

M:	Mark Yao <mark.yao@rock-chips.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/rockchip/

F:	Documentation/devicetree/bindings/display/rockchip*

F:	Documentation/devicetree/bindings/display/rockchip/



DRM DRIVER FOR SAVAGE VIDEO CARDS

S:	Orphan / Obsolete

F:	drivers/gpu/drm/savage/

F:	include/uapi/drm/savage_drm.h



DRM DRIVER FOR SIS VIDEO CARDS

S:	Orphan / Obsolete

F:	drivers/gpu/drm/sis/

F:	include/uapi/drm/sis_drm.h



DRM DRIVERS FOR STI

M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>
@@ -3902,14 +3974,43 @@ S: Maintained 
F:	drivers/gpu/drm/sti

F:	Documentation/devicetree/bindings/display/st,stih4xx.txt



DRM DRIVER FOR TDFX VIDEO CARDS

S:	Orphan / Obsolete

F:	drivers/gpu/drm/tdfx/



DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

F:	drivers/gpu/drm/udl/



DRM DRIVERS FOR VIVANTE GPU IP

M:	Lucas Stach <l.stach@pengutronix.de>

R:	Russell King <linux+etnaviv@arm.linux.org.uk>

R:	Christian Gmeiner <christian.gmeiner@gmail.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/etnaviv

F:	Documentation/devicetree/bindings/display/etnaviv

F:	drivers/gpu/drm/etnaviv/

F:	include/uapi/drm/etnaviv_drm.h

F:	Documentation/devicetree/bindings/display/etnaviv/



DRM DRIVER FOR VMWARE VIRTUAL GPU

M:	"VMware Graphics" <linux-graphics-maintainer@vmware.com>

M:	Sinclair Yeh <syeh@vmware.com>

M:	Thomas Hellstrom <thellstrom@vmware.com>

L:	dri-devel@lists.freedesktop.org

T:	git git://people.freedesktop.org/~syeh/repos_linux

T:	git git://people.freedesktop.org/~thomash/linux

S:	Supported

F:	drivers/gpu/drm/vmwgfx/

F:	include/uapi/drm/vmwgfx_drm.h



DRM DRIVERS FOR VC4

M:	Eric Anholt <eric@anholt.net>

T:	git git://github.com/anholt/linux

S:	Supported

F:	drivers/gpu/drm/vc4/

F:	include/uapi/drm/vc4_drm.h

F:	Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt



DSBR100 USB FM RADIO DRIVER

M:	Alexey Klimov <klimov.linux@gmail.com>
@@ -6931,6 +7032,8 @@ MARVELL ARMADA DRM SUPPORT 
M:	Russell King <rmk+kernel@arm.linux.org.uk>

S:	Maintained

F:	drivers/gpu/drm/armada/

F:	include/uapi/drm/armada_drm.h

F:	Documentation/devicetree/bindings/display/armada/



MARVELL 88E6352 DSA support

M:	Guenter Roeck <linux@roeck-us.net>

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ config DRM_KMS_FB_HELPER 
	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FB_DEFERRED_IO

	help

	  FBDEV helpers for KMS drivers.

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

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static struct drm_driver kms_driver = { 
	.irq_uninstall = amdgpu_irq_uninstall,

	.irq_handler = amdgpu_irq_handler,

	.ioctls = amdgpu_ioctls_kms,

	.gem_free_object = amdgpu_gem_object_free,

	.gem_free_object_unlocked = amdgpu_gem_object_free,

	.gem_open_object = amdgpu_gem_object_open,

	.gem_close_object = amdgpu_gem_object_close,

	.dumb_create = amdgpu_mode_dumb_create,

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

+1 −1
Original line number Diff line number Diff line
@@ -3370,7 +3370,7 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev, 


	/* wakeup usersapce */

	if (works->event)

		drm_send_vblank_event(adev->ddev, crtc_id, works->event);

		drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);



	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE