tree 3a760dff4714dbab24dec693b66fadd380ad09c8
parent 5a3f610877e9d08968ea7237551049581f02b163
parent ad99cb5e783bb03d512092db3387ead9504aad3d
author Dave Airlie <airlied@redhat.com> 1590107059 +1000
committer Dave Airlie <airlied@redhat.com> 1590107111 +1000

Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes

two fixes:
- memory leak fix when userspace passes a invalid softpin address
- off-by-one crashing the kernel in the perfmon domain iteration when
the GPU core has both 2D and 3D capabilities

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/ca7bce5c8aff0fcbbdc3bf2b9723df5f687c8924.camel@pengutronix.de