[Intel-gfx] [PATCH 3/6] drm/i915: Move out non-modeset calls from modeset init and cleanup

Chris Wilson chris at chris-wilson.co.uk
Tue Jul 17 07:27:27 UTC 2018


Quoting José Roberto de Souza (2018-07-16 23:38:38)
> @@ -1395,9 +1379,22 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
>                         goto out_cleanup_hw;
>         }
>  
> +       ret = intel_irq_install(dev_priv);
> +       if (ret)
> +               goto out_cleanup_hw;
> +
> +       /* i915_gem_init() call chain will call
> +        * intel_display_power_put(i915, POWER_DOMAIN_GT_IRQ);
> +        */
> +       intel_power_domains_init_hw(dev_priv, false);
> +
> +       ret = i915_gem_init(dev_priv);
> +       if (ret)
> +               goto cleanup_irq;
> +
>         ret = i915_load_modeset_init(&dev_priv->drm);
>         if (ret < 0)
> -               goto out_cleanup_hw;
> +               goto cleanup_gem;

Bzzt. Order is extremely important. e.g. modeset init needs to reserve
portions of the GTT still in use by the BIOS before we wipe it.
-Chris


More information about the Intel-gfx mailing list