Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 3 Dec 2020 03:25:09 +0000 (13:25 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 3 Dec 2020 03:25:23 +0000 (13:25 +1000)
commit5eb3c85e343ae62ed47fa3c9816d79f95809fe27
tree856e789d37033223529cc35bd5af87244ed06983
parente6c7c9d01f5b1ca3141dca43159a909a596a60a2
parent4612bad5701e158f3c40951f2c7aa8e64b3445eb
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next

Again, nothing big this time. Mostly a new performance counter from
Christian, some more lockdep annotations from Guido and removal of
functionality that duplicates driver core from Robin.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/81367a99b8949584e5becd334ac001b9ad3dc37a.camel@pengutronix.de
drivers/gpu/drm/etnaviv/etnaviv_drv.c
drivers/gpu/drm/etnaviv/etnaviv_drv.h
drivers/gpu/drm/etnaviv/etnaviv_mmu.c