Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Mon, 6 May 2019 22:27:15 +0000 (08:27 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 6 May 2019 22:27:23 +0000 (08:27 +1000)
commitd62bef1016e944a7602d6fade214f28e1f2157de
tree5c33b8dc5000f3385161bd0742b9b71a141b0aa7
parent422449238e9853458283beffed77562d4b40a2fa
parent2b76f5be7c2778ee2f6bacddc19248f6a4a467a0
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next

things are still slow in etnaviv land, so we don't have anything major
to destage. Just a couple of non-critical fixes that I want to land in
5.2.

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