Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 6 Nov 2018 23:32:22 +0000 (09:32 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 6 Nov 2018 23:32:30 +0000 (09:32 +1000)
commitd99de699ac034ff1b706496a33f49bd7e1e8ae30
tree43285595fb79e87ef40bf099e193ed9a30b80a51
parent651022382c7f8da46cb4872a545ee1da6d097d2a
parent6fce3a406108ee6c8a61e2a33e52e9198a626ea0
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes

Single etnaviv fence fix for GPU recovery.

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