diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-06-08 15:52:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-06-08 15:52:54 +1000 |
| commit | 68a14137fa68b798766c43b25d3e4de5e8d27a0f (patch) | |
| tree | 2d6fad0156fcb6dedf416a799eae9919d2de8731 | |
| parent | 8c7eac58775e55be79201ed285a822b5d0132bef (diff) | |
| parent | fbecef131676c1d18e8e6b42c04e10dc49725e96 (diff) | |
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: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/12faab25-e809-e73c-409c-5e9c08aa351c@linux.intel.com
| -rw-r--r-- | drivers/gpu/drm/v3d/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig index a0c0259355bd..1552bf552c94 100644 --- 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 index d9b8b701d2ce..466d0a27b415 100644 --- 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 = { |