diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-05-21 10:44:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-21 10:44:33 +1000 |
| commit | c41219fda6e04255c44d37fd2c0d898c1c46abf1 (patch) | |
| tree | 490a37d36cdd72b854a58da33fde0324f2e5f677 /drivers/gpu/drm/i915/gvt/scheduler.c | |
| parent | e20bb857dea2f620ff37ae541ed8aee70e3c89f1 (diff) | |
| parent | d96536f0fe699729a0974eb5b65eb0d87cc747e1 (diff) | |
Merge tag 'drm-intel-next-fixes-2020-05-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Fix for TypeC power domain toggling on resets (Cc: stable).
Two compile time warning fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200520123227.GA21104@jlahtine-desk.ger.corp.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/scheduler.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/scheduler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index c00189432b58..3a9bd8e4d8db 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -876,7 +876,7 @@ static void update_guest_pdps(struct intel_vgpu *vgpu, gpa + i * 8, &pdp[7 - i], 4); } -static bool +static __maybe_unused bool check_shadow_context_ppgtt(struct execlist_ring_context *c, struct intel_vgpu_mm *m) { if (m->ppgtt_mm.root_entry_type == GTT_TYPE_PPGTT_ROOT_L4_ENTRY) { |