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

airlied · airlied · commit 68a14137fa68 · 2018-06-08T15:52:54.000+10:00
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: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/12faab25-e809-e73c-409c-5e9c08aa351c@linux.intel.com
diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig
@@ -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
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -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 = {

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ static void vc4_close(struct drm_device dev, struct drm_file file)`
`130`	`130`	`struct vc4_file *vc4file = file->driver_priv;`
`131`	`131`
`132`	`132`	`vc4_perfmon_close_file(vc4file);`
	`133`	`+ kfree(vc4file);`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`static const struct vm_operations_struct vc4_vm_ops = {`