Merge tag 'drm-intel-fixes-2020-10-29' into gvt-fixes
authorZhenyu Wang <zhenyuw@linux.intel.com>
Fri, 30 Oct 2020 03:48:17 +0000 (11:48 +0800)
committerZhenyu Wang <zhenyuw@linux.intel.com>
Fri, 30 Oct 2020 03:48:17 +0000 (11:48 +0800)
commit4a95857a875e887cc958c92fe9d2cde6184d2ec0
tree8d67b681d582ba7ee11a359be7af82ed77bd6620
parentbaec997285e63ad3e03d8b8d45e14776cd737f62
parent61334ed227a5852100115180f5535b1396ed5227
Merge tag 'drm-intel-fixes-2020-10-29' into gvt-fixes

Backmerge for 5.10-rc1 to apply one extra APL fix.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
drivers/gpu/drm/i915/gvt/handlers.c
drivers/gpu/drm/i915/gvt/scheduler.c