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

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_driver.c

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index c459eb362c47f7e505c920d6736ee361566f46ed..298ed36f078a8fee225f74d268e532af585ab3ae 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -337,7 +337,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
        if (i915_inject_probe_failure(dev_priv))
                return -ENODEV;
 
-       intel_device_info_subplatform_init(dev_priv);
+       intel_device_info_runtime_init_early(dev_priv);
+
        intel_step_init(dev_priv);
 
        intel_uncore_mmio_debug_init_early(dev_priv);
@@ -353,6 +354,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
        mutex_init(&dev_priv->display.wm.wm_mutex);
        mutex_init(&dev_priv->display.pps.mutex);
        mutex_init(&dev_priv->display.hdcp.comp_mutex);
+       spin_lock_init(&dev_priv->display.dkl.phy_lock);
 
        i915_memcpy_init_early(dev_priv);
        intel_runtime_pm_init_early(&dev_priv->runtime_pm);
@@ -738,7 +740,6 @@ static void i915_driver_hw_remove(struct drm_i915_private *dev_priv)
  */
 static void i915_driver_register(struct drm_i915_private *dev_priv)
 {
-       struct drm_device *dev = &dev_priv->drm;
        struct intel_gt *gt;
        unsigned int i;
 
@@ -748,7 +749,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
        intel_vgpu_register(dev_priv);
 
        /* Reveal our presence to userspace */
-       if (drm_dev_register(dev, 0)) {
+       if (drm_dev_register(&dev_priv->drm, 0)) {
                drm_err(&dev_priv->drm,
                        "Failed to register driver for userspace access!\n");
                return;
@@ -893,10 +894,6 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (IS_ERR(i915))
                return PTR_ERR(i915);
 
-       /* Disable nuclear pageflip by default on pre-ILK */
-       if (!i915->params.nuclear_pageflip && DISPLAY_VER(i915) < 5)
-               i915->drm.driver_features &= ~DRIVER_ATOMIC;
-
        ret = pci_enable_device(pdev);
        if (ret)
                goto out_fini;
@@ -1092,32 +1089,30 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
 
 static void intel_suspend_encoders(struct drm_i915_private *dev_priv)
 {
-       struct drm_device *dev = &dev_priv->drm;
        struct intel_encoder *encoder;
 
        if (!HAS_DISPLAY(dev_priv))
                return;
 
-       drm_modeset_lock_all(dev);
-       for_each_intel_encoder(dev, encoder)
+       drm_modeset_lock_all(&dev_priv->drm);
+       for_each_intel_encoder(&dev_priv->drm, encoder)
                if (encoder->suspend)
                        encoder->suspend(encoder);
-       drm_modeset_unlock_all(dev);
+       drm_modeset_unlock_all(&dev_priv->drm);
 }
 
 static void intel_shutdown_encoders(struct drm_i915_private *dev_priv)
 {
-       struct drm_device *dev = &dev_priv->drm;
        struct intel_encoder *encoder;
 
        if (!HAS_DISPLAY(dev_priv))
                return;
 
-       drm_modeset_lock_all(dev);
-       for_each_intel_encoder(dev, encoder)
+       drm_modeset_lock_all(&dev_priv->drm);
+       for_each_intel_encoder(&dev_priv->drm, encoder)
                if (encoder->shutdown)
                        encoder->shutdown(encoder);
-       drm_modeset_unlock_all(dev);
+       drm_modeset_unlock_all(&dev_priv->drm);
 }
 
 void i915_driver_shutdown(struct drm_i915_private *i915)