Merge tag 'drm-intel-next-2022-10-28' of git://anongit.freedesktop.org/drm/drm-intel...

[thirdparty/linux.git] / drivers / gpu / drm / i915 / display / intel_display.c

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 0691b49f38f1f0ce044bec8a78b70cb22dd2d646..b9393f9fc764699a9460d52ae9948409770fafc9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -675,7 +675,7 @@ bool intel_plane_uses_fence(const struct intel_plane_state *plane_state)
 
        return DISPLAY_VER(dev_priv) < 4 ||
                (plane->fbc &&
-                plane_state->view.gtt.type == I915_GGTT_VIEW_NORMAL);
+                plane_state->view.gtt.type == I915_GTT_VIEW_NORMAL);
 }
 
 /*
@@ -9051,7 +9051,7 @@ void intel_display_driver_register(struct drm_i915_private *i915)
 
        /* Must be done after probing outputs */
        intel_opregion_register(i915);
-       acpi_video_register();
+       intel_acpi_video_register(i915);
 
        intel_audio_init(i915);