drm/i915: Move drm_vblank_init() to i915_load_modeset_init() (8d3bf1a3) · Commits · 戴 / test

i915_load_modeset_init() is a more suitable place than i915_driver_load() as vblank is part of modeset. Cc: Jani Nikula <jani.nikula@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by:

José Roberto de Souza <jose.souza@intel.com> Reviewed-by:

Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181108001647.11276-1-jose.souza@intel.com

drivers/gpu/drm/i915/i915_drv.c

+7 −12

Original line number	Diff line number	Diff line
		@@ -645,6 +645,13 @@ static int i915_load_modeset_init(struct drm_device *dev)
		if (i915_inject_load_failure())
		return -ENODEV;

		if (INTEL_INFO(dev_priv)->num_pipes) {
		ret = drm_vblank_init(&dev_priv->drm,
		INTEL_INFO(dev_priv)->num_pipes);
		if (ret)
		goto out;
		}

		intel_bios_init(dev_priv);

		/* If we have > 1 VGA cards, then we need to arbitrate access
		@@ -1712,18 +1719,6 @@ int i915_driver_load(struct pci_dev pdev, const struct pci_device_id ent)
		if (ret < 0)
		goto out_cleanup_mmio;

		/*
		* TODO: move the vblank init and parts of modeset init steps into one
		* of the i915_driver_init_/i915_driver_register functions according
		* to the role/effect of the given init step.
		*/
		if (INTEL_INFO(dev_priv)->num_pipes) {
		ret = drm_vblank_init(&dev_priv->drm,
		INTEL_INFO(dev_priv)->num_pipes);
		if (ret)
		goto out_cleanup_hw;
		}

		ret = i915_load_modeset_init(&dev_priv->drm);
		if (ret < 0)
		goto out_cleanup_hw;

Admin message