tree e3447e6b6f884e2821e66a9ecfe123af2a384b3c
parent 6e4a61cd39685476f7ea74e75fb66666d541050b
parent 7b1d6924f27ba24b9e47abb9bd53d0bbc430a835
author Dave Airlie <airlied@redhat.com> 1653076848 +1000
committer Dave Airlie <airlied@redhat.com> 1653076917 +1000

Merge tag 'drm-intel-fixes-2022-05-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

- fix for #5806: GPU hangs and display artifacts on 5.18-rc3 on Intel GM45
- reject DMC with out-of-spec MMIO (Cc: stable)
- correctly mark guilty contexts on GuC reset.

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