Commit 93caca6a authored by Jani Nikula's avatar Jani Nikula

drm/i915: move intel_display_device_probe() one level higher

Don't hide display probe in device info code.

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230912120537.2158209-3-jani.nikula@intel.com
parent a2c57575
...@@ -735,6 +735,8 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -735,6 +735,8 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Set up device info and initial runtime info. */ /* Set up device info and initial runtime info. */
intel_device_info_driver_create(i915, pdev->device, match_info); intel_device_info_driver_create(i915, pdev->device, match_info);
intel_display_device_probe(i915);
return i915; return i915;
} }
......
...@@ -432,8 +432,6 @@ void intel_device_info_driver_create(struct drm_i915_private *i915, ...@@ -432,8 +432,6 @@ void intel_device_info_driver_create(struct drm_i915_private *i915,
runtime = RUNTIME_INFO(i915); runtime = RUNTIME_INFO(i915);
memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime)); memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime));
intel_display_device_probe(i915);
runtime->device_id = device_id; runtime->device_id = device_id;
} }
......
...@@ -181,6 +181,8 @@ struct drm_i915_private *mock_gem_device(void) ...@@ -181,6 +181,8 @@ struct drm_i915_private *mock_gem_device(void)
/* Set up device info and initial runtime info. */ /* Set up device info and initial runtime info. */
intel_device_info_driver_create(i915, pdev->device, &mock_info); intel_device_info_driver_create(i915, pdev->device, &mock_info);
intel_display_device_probe(i915);
dev_pm_domain_set(&pdev->dev, &pm_domain); dev_pm_domain_set(&pdev->dev, &pm_domain);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment