Skip to content

Commit a273e95

Browse files
committed
drm/i915: Allow switching away via vga-switcheroo if uninitialized
Always allow switching away via vga-switcheroo if the display is uninitalized. Instead prevent switching to i915 if the device has not been initialized. This issue was introduced by commit 5df7bd1 ("drm/i915: skip display initialization when there is no display") protected, which protects code paths from being executed on uninitialized devices. In the case of vga-switcheroo, we want to allow a switch away from i915's device. So run vga_switcheroo_process_delayed_switch() and test in the switcheroo callbacks if the i915 device is available. Fixes: 5df7bd1 ("drm/i915: skip display initialization when there is no display") Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: José Roberto de Souza <jose.souza@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: "Jouni Högander" <jouni.hogander@intel.com> Cc: Uma Shankar <uma.shankar@intel.com> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Ramalingam C <ramalingam.c@intel.com> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Andi Shyti <andi.shyti@linux.intel.com> Cc: Andrzej Hajda <andrzej.hajda@intel.com> Cc: "José Roberto de Souza" <jose.souza@intel.com> Cc: Julia Lawall <Julia.Lawall@inria.fr> Cc: intel-gfx@lists.freedesktop.org Cc: <stable@vger.kernel.org> # v5.14+ Link: https://patchwork.freedesktop.org/patch/msgid/20230116115425.13484-2-tzimmermann@suse.de
1 parent 6437a54 commit a273e95

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/gpu/drm/i915/i915_driver.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,8 +1073,7 @@ static void i915_driver_lastclose(struct drm_device *dev)
10731073

10741074
intel_fbdev_restore_mode(dev);
10751075

1076-
if (HAS_DISPLAY(i915))
1077-
vga_switcheroo_process_delayed_switch();
1076+
vga_switcheroo_process_delayed_switch();
10781077
}
10791078

10801079
static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)

drivers/gpu/drm/i915/i915_switcheroo.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev,
1919
dev_err(&pdev->dev, "DRM not initialized, aborting switch.\n");
2020
return;
2121
}
22+
if (!HAS_DISPLAY(i915)) {
23+
dev_err(&pdev->dev, "Device state not initialized, aborting switch.\n");
24+
return;
25+
}
2226

2327
if (state == VGA_SWITCHEROO_ON) {
2428
drm_info(&i915->drm, "switched on\n");
@@ -44,7 +48,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
4448
* locking inversion with the driver load path. And the access here is
4549
* completely racy anyway. So don't bother with locking for now.
4650
*/
47-
return i915 && atomic_read(&i915->drm.open_count) == 0;
51+
return i915 && HAS_DISPLAY(i915) && atomic_read(&i915->drm.open_count) == 0;
4852
}
4953

5054
static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {

0 commit comments

Comments
 (0)