leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/vboxvideo: Use devm_gen_pool_create

Browse Source 
Aside from deleting all the cleanup code we're now also setting a name
for the pool

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-7-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2020-04-15 09:39:41 +02:00
parent 8558de401b
commit 4cc9b56545
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/vboxvideo/vbox_main.c
View File

@ -121,7 +121,8 @@ int vbox_hw_init(struct vbox_private *vbox)
return -ENOMEM; return -ENOMEM;
/* Create guest-heap mem-pool use 2^4 = 16 byte chunks */ /* Create guest-heap mem-pool use 2^4 = 16 byte chunks */
vbox->guest_pool = gen_pool_create(4, -1); vbox->guest_pool = devm_gen_pool_create(vbox->ddev.dev, 4, -1,
"vboxvideo-accel");
if (!vbox->guest_pool) if (!vbox->guest_pool)
return -ENOMEM; return -ENOMEM;
@ -130,12 +131,12 @@ int vbox_hw_init(struct vbox_private *vbox)
GUEST_HEAP_OFFSET(vbox), GUEST_HEAP_OFFSET(vbox),
GUEST_HEAP_USABLE_SIZE, -1); GUEST_HEAP_USABLE_SIZE, -1);
if (ret) if (ret)
goto err_destroy_guest_pool; return ret;
ret = hgsmi_test_query_conf(vbox->guest_pool); ret = hgsmi_test_query_conf(vbox->guest_pool);
if (ret) { if (ret) {
DRM_ERROR("vboxvideo: hgsmi_test_query_conf failed\n"); DRM_ERROR("vboxvideo: hgsmi_test_query_conf failed\n");
goto err_destroy_guest_pool; return ret;
} }
/* Reduce available VRAM size to reflect the guest heap. */ /* Reduce available VRAM size to reflect the guest heap. */
@ -147,30 +148,23 @@ int vbox_hw_init(struct vbox_private *vbox)
if (!have_hgsmi_mode_hints(vbox)) { if (!have_hgsmi_mode_hints(vbox)) {
ret = -ENOTSUPP; ret = -ENOTSUPP;
goto err_destroy_guest_pool; return ret;
} }
vbox->last_mode_hints = devm_kcalloc(vbox->ddev.dev, vbox->num_crtcs, vbox->last_mode_hints = devm_kcalloc(vbox->ddev.dev, vbox->num_crtcs,
sizeof(struct vbva_modehint), sizeof(struct vbva_modehint),
GFP_KERNEL); GFP_KERNEL);
if (!vbox->last_mode_hints) { if (!vbox->last_mode_hints)
ret = -ENOMEM; return -ENOMEM;
goto err_destroy_guest_pool;
}
ret = vbox_accel_init(vbox); ret = vbox_accel_init(vbox);
if (ret) if (ret)
goto err_destroy_guest_pool; return ret;
return 0; return 0;
err_destroy_guest_pool:
gen_pool_destroy(vbox->guest_pool);
return ret;
} }
void vbox_hw_fini(struct vbox_private *vbox) void vbox_hw_fini(struct vbox_private *vbox)
{ {
vbox_accel_fini(vbox); vbox_accel_fini(vbox);
gen_pool_destroy(vbox->guest_pool);
} }