From 429fc6f9550eb4bd2b012831bafbb64dc318ae4b Mon Sep 17 00:00:00 2001 From: Tian Tao Date: Wed, 3 Mar 2021 09:39:46 +0800 Subject: drm/vboxvideo: Use managed VRAM-helper initialization updated to use drmm_vram_helper_init(). Signed-off-by: Tian Tao Reviewed-by: Hans de Goede Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/1614735587-6621-1-git-send-email-tiantao6@hisilicon.com --- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/drm/vboxvideo') diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c index 0066a3c1dfc9..fd8a53a4d8d6 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c +++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c @@ -12,15 +12,13 @@ int vbox_mm_init(struct vbox_private *vbox) { - struct drm_vram_mm *vmm; int ret; struct drm_device *dev = &vbox->ddev; struct pci_dev *pdev = to_pci_dev(dev->dev); - vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0), + ret = drmm_vram_helper_init(dev, pci_resource_start(pdev, 0), vbox->available_vram_size); - if (IS_ERR(vmm)) { - ret = PTR_ERR(vmm); + if (ret) { DRM_ERROR("Error initializing VRAM MM; %d\n", ret); return ret; } @@ -33,5 +31,4 @@ int vbox_mm_init(struct vbox_private *vbox) void vbox_mm_fini(struct vbox_private *vbox) { arch_phys_wc_del(vbox->fb_mtrr); - drm_vram_helper_release_mm(&vbox->ddev); } -- cgit v1.2.3