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

Commit 68a14137 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2018-05-31' of... 

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

 into drm-next

drm-misc-next-fixes for v4.18:

Driver changes:
- Plug small memory leak in vc4. (anholt)
- Depend on MMU in v3d. (arnd)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/12faab25-e809-e73c-409c-5e9c08aa351c@linux.intel.com
parents 8c7eac58 fbecef13

drivers/gpu/drm/v3d/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config DRM_V3D 
	depends on ARCH_BCM || ARCH_BCMSTB || COMPILE_TEST

	depends on DRM

	depends on COMMON_CLK

	depends on MMU

	select DRM_SCHED

	help

	  Choose this option if you have a system that has a Broadcom

drivers/gpu/drm/vc4/vc4_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static void vc4_close(struct drm_device *dev, struct drm_file *file) 
	struct vc4_file *vc4file = file->driver_priv;



	vc4_perfmon_close_file(vc4file);

	kfree(vc4file);

}



static const struct vm_operations_struct vc4_vm_ops = {