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

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

diff --cc drivers/gpu/drm/etnaviv/etnaviv_drv.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_drv.h
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_mmu.c
Simple merge