]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 22 May 2020 00:24:19 +0000 (10:24 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 22 May 2020 00:25:11 +0000 (10:25 +1000)
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

Trivial merge