Commit 2045b224 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v4.18:

UAPI Changes:
- Fix render node number regression from control node removal.

Driver Changes:
- Small header fix for virgl, used by qemu.
- Use vm_fault_t in qxl.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# gpg: Signature made Tue 15 May 2018 06:16:03 PM AEST
# gpg:                using RSA key FE558C72A67013C3
# gpg: Can't check signature: public key not found
Link: https://patchwork.freedesktop.org/patch/msgid/e63306b9-67a0-74ab-8883-08b3d9db72d2@mblankhorst.nl
parents c76f0b2c 68266f1c

Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
Broadcom V3D GPU



Only the Broadcom V3D 3.x and newer GPUs are covered by this binding.

For V3D 2.x, see brcm,bcm-vc4.txt.



Required properties:

- compatible:	Should be "brcm,7268-v3d" or "brcm,7278-v3d"

- reg:		Physical base addresses and lengths of the register areas

- reg-names:	Names for the register areas.  The "hub", "bridge", and "core0"

		  register areas are always required.  The "gca" register area

		  is required if the GCA cache controller is present.

- interrupts:	The interrupt numbers.  The first interrupt is for the hub,

		  while the following interrupts are for the cores.

		  See bindings/interrupt-controller/interrupts.txt



Optional properties:

- clocks:	The core clock the unit runs on



v3d {

	compatible = "brcm,7268-v3d";

	reg = <0xf1204000 0x100>,

	      <0xf1200000 0x4000>,

	      <0xf1208000 0x4000>,

	      <0xf1204100 0x100>;

	reg-names = "bridge", "hub", "core0", "gca";

	interrupts = <0 78 4>,

		     <0 77 4>;

};

Documentation/gpu/drivers.rst

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ GPU Driver Documentation 
   tegra

   tegra

   tinydrm

   tinydrm

   tve200

   tve200

   v3d

   vc4

   vc4

   bridge/dw-hdmi

   bridge/dw-hdmi

   xen-front

   xen-front

MAINTAINERS

+8 −0
Original line number Original line Diff line number Diff line
@@ -4786,6 +4786,14 @@ S: Maintained 
F:	drivers/gpu/drm/omapdrm/

F:	drivers/gpu/drm/omapdrm/

F:	Documentation/devicetree/bindings/display/ti/

F:	Documentation/devicetree/bindings/display/ti/





DRM DRIVERS FOR V3D

M:	Eric Anholt <eric@anholt.net>

S:	Supported

F:	drivers/gpu/drm/v3d/

F:	include/uapi/drm/v3d_drm.h

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

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



DRM DRIVERS FOR VC4

DRM DRIVERS FOR VC4

M:	Eric Anholt <eric@anholt.net>

M:	Eric Anholt <eric@anholt.net>

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

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

drivers/dma-buf/sync_debug.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -62,8 +62,6 @@ struct sync_pt { 
	struct rb_node node;

	struct rb_node node;

};

};





#ifdef CONFIG_SW_SYNC



extern const struct file_operations sw_sync_debugfs_fops;

extern const struct file_operations sw_sync_debugfs_fops;





void sync_timeline_debug_add(struct sync_timeline *obj);

void sync_timeline_debug_add(struct sync_timeline *obj);
@@ -72,12 +70,4 @@ void sync_file_debug_add(struct sync_file *fence); 
void sync_file_debug_remove(struct sync_file *fence);

void sync_file_debug_remove(struct sync_file *fence);

void sync_dump(void);

void sync_dump(void);





#else

# define sync_timeline_debug_add(obj)

# define sync_timeline_debug_remove(obj)

# define sync_file_debug_add(fence)

# define sync_file_debug_remove(fence)

# define sync_dump()

#endif



#endif /* _LINUX_SYNC_H */
 
#endif /* _LINUX_SYNC_H */

drivers/gpu/drm/Kconfig

+7 −4
Original line number Original line Diff line number Diff line
@@ -49,16 +49,17 @@ config DRM_DEBUG_MM 




	  If in doubt, say "N".

	  If in doubt, say "N".





config DRM_DEBUG_MM_SELFTEST

config DRM_DEBUG_SELFTEST

	tristate "kselftests for DRM range manager (struct drm_mm)"

	tristate "kselftests for DRM"

	depends on DRM

	depends on DRM

	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL

	select PRIME_NUMBERS

	select PRIME_NUMBERS

	select DRM_LIB_RANDOM

	select DRM_LIB_RANDOM

	select DRM_KMS_HELPER

	default n

	default n

	help

	help

	  This option provides a kernel module that can be used to test

	  This option provides kernel modules that can be used to run

	  the DRM range manager (drm_mm) and its API. This option is not

	  various selftests on parts of the DRM api. This option is not

	  useful for distributions or general kernels, but only for kernel

	  useful for distributions or general kernels, but only for kernel

	  developers working on DRM and associated drivers.

	  developers working on DRM and associated drivers.
@@ -267,6 +268,8 @@ source "drivers/gpu/drm/amd/amdkfd/Kconfig" 




source "drivers/gpu/drm/imx/Kconfig"

source "drivers/gpu/drm/imx/Kconfig"





source "drivers/gpu/drm/v3d/Kconfig"



source "drivers/gpu/drm/vc4/Kconfig"

source "drivers/gpu/drm/vc4/Kconfig"





source "drivers/gpu/drm/etnaviv/Kconfig"

source "drivers/gpu/drm/etnaviv/Kconfig"

CRA Git | Maintained and supported by SUSTech CRA and CCSE