diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2026-06-29 11:32:44 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2026-06-29 11:32:44 -0400 |
| commit | a13905ac604cfd28fbda0815da16127bd4069bbe (patch) | |
| tree | 81c6504a0aae2c7d7ea118c7aff71ec943035ca7 /drivers/gpu/drm/hyperv/hyperv_drm_drv.c | |
| parent | 56ece2fce5c00f577d92a376ba5dc4a2aa15925d (diff) | |
| parent | c35eb77a67515d4201bc91294f40761591f43bbd (diff) | |
| download | linux-next-a13905ac604cfd28fbda0815da16127bd4069bbe.tar.gz linux-next-a13905ac604cfd28fbda0815da16127bd4069bbe.zip | |
Merge tools/for-next
Diffstat (limited to 'drivers/gpu/drm/hyperv/hyperv_drm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c index 06b5d96e6eaf..b6bf6412ae34 100644 --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c @@ -150,6 +150,10 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, goto err_free_mmio; } + /* If DRM panic path is stubbed out VMBus code must do the unload */ + if (IS_ENABLED(CONFIG_DRM_PANIC)) + vmbus_set_skip_unload(true); + drm_client_setup(dev, NULL); return 0; @@ -169,6 +173,7 @@ static void hyperv_vmbus_remove(struct hv_device *hdev) struct drm_device *dev = hv_get_drvdata(hdev); struct hyperv_drm_device *hv = to_hv(dev); + vmbus_set_skip_unload(false); drm_dev_unplug(dev); drm_atomic_helper_shutdown(dev); vmbus_close(hdev->channel); |