OSDN Git Service

drm/ast: Use managed VRAM-helper initialization
authorThomas Zimmermann <tzimmermann@suse.de>
Thu, 16 Jul 2020 12:53:50 +0000 (14:53 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Mon, 20 Jul 2020 07:16:08 +0000 (09:16 +0200)
As a first step to managed MM code in ast, switch over VRAM MM helpers.

v2:
* updated to use drmm_vram_helper_init()

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200716125353.31512-4-tzimmermann@suse.de
drivers/gpu/drm/ast/ast_mm.c

index 9c3788a..f0a96ca 100644 (file)
 
 int ast_mm_init(struct ast_private *ast)
 {
-       struct drm_vram_mm *vmm;
        int ret;
        struct drm_device *dev = ast->dev;
 
-       vmm = drm_vram_helper_alloc_mm(
-               dev, pci_resource_start(dev->pdev, 0),
-               ast->vram_size);
-       if (IS_ERR(vmm)) {
-               ret = PTR_ERR(vmm);
+       ret = drmm_vram_helper_init(dev, pci_resource_start(dev->pdev, 0),
+                                   ast->vram_size);
+       if (ret) {
                drm_err(dev, "Error initializing VRAM MM; %d\n", ret);
                return ret;
        }
@@ -60,8 +57,6 @@ void ast_mm_fini(struct ast_private *ast)
 {
        struct drm_device *dev = ast->dev;
 
-       drm_vram_helper_release_mm(dev);
-
        arch_phys_wc_del(ast->fb_mtrr);
        arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),
                                pci_resource_len(dev->pdev, 0));