diff options
author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:45 -0800 |
---|---|---|
committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:45 -0800 |
commit | 443c053f51f9173042a2b45d0db7271cebe78198 (patch) | |
tree | 15828d5741b6704b21dbce435d09d283310e2ad4 /drivers/gpu/drm/i915/display/intel_plane_initial.c | |
parent | ae00c6637cfe613a17953beb99c181360ff379d6 (diff) | |
parent | cdeea858d8df9891ed75415f377b3564f899a659 (diff) |
Merge remote-tracking branch 'drm-intel/drm-intel-gt-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/i915/display/intel_fbc.c
# drivers/gpu/drm/i915/gt/intel_gt.c
# drivers/gpu/drm/i915/i915_driver.c
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_plane_initial.c')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c index 01ce1d72297f..e4186a0b8edb 100644 --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c @@ -94,7 +94,7 @@ initial_plane_vma(struct drm_i915_private *i915, goto err_obj; } - vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL); + vma = i915_vma_instance(obj, &to_gt(i915)->ggtt->vm, NULL); if (IS_ERR(vma)) goto err_obj; |