Merge tag 'drm-intel-fixes-2018-12-12-1' of git://anongit.freedesktop.org/drm/drm...
authorDave Airlie <airlied@redhat.com>
Wed, 12 Dec 2018 21:22:47 +0000 (07:22 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 12 Dec 2018 21:22:47 +0000 (07:22 +1000)
commitce07fe9e1cec520d343e31f1bf61949fe1b4411e
tree51ccf68744dba9345827dfd500cc4f982dbe8449
parent71fb553974556e29ebf6fa3cf6bd73342e7dbc5d
parent5b2e31201c268c2331a209af799d667619216d40
Merge tag 'drm-intel-fixes-2018-12-12-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

- Two fixes to avoid GPU hangs (on Braswell and Gen3)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212134010.GA18900@jlahtine-desk.ger.corp.intel.com