Skip to content

Commit

Permalink
drm/hyperv: Fix an error handling path in hyperv_vmbus_probe()
Browse files Browse the repository at this point in the history
hyperv_setup_vram() calls vmbus_allocate_mmio(). This must be undone in
the error handling path of the probe, as already done in the remove
function.

Fixes: a0ab5ab ("drm/hyperv : Removing the restruction of VRAM allocation with PCI bar size")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/7dfa372af3e35fbb1d6f157183dfef2e4512d3be.1659297696.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Wei Liu <wei.liu@kernel.org>
  • Loading branch information
Christophe JAILLET authored and Wei Liu committed Aug 15, 2022
1 parent 568035b commit f1f63cb
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/gpu/drm/hyperv/hyperv_drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ static int hyperv_vmbus_probe(struct hv_device *hdev,
}

ret = hyperv_setup_vram(hv, hdev);

if (ret)
goto err_vmbus_close;

Expand All @@ -150,18 +149,20 @@ static int hyperv_vmbus_probe(struct hv_device *hdev,

ret = hyperv_mode_config_init(hv);
if (ret)
goto err_vmbus_close;
goto err_free_mmio;

ret = drm_dev_register(dev, 0);
if (ret) {
drm_err(dev, "Failed to register drm driver.\n");
goto err_vmbus_close;
goto err_free_mmio;
}

drm_fbdev_generic_setup(dev, 0);

return 0;

err_free_mmio:
vmbus_free_mmio(hv->mem->start, hv->fb_size);
err_vmbus_close:
vmbus_close(hdev->channel);
err_hv_set_drv_data:
Expand Down

0 comments on commit f1f63cb

Please sign in to comment.