Commit 03ba7e00 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/ast: Use managed MM initialization

Cleaning up ast's MM code with ast_mm_fini() resets the write-combine
flags on the VRAM I/O memory. Drop ast_mm_fini() in favor of an auto-
release callback. Releasing the device also executes the callback.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200716125353.31512-7-tzimmermann@suse.de
parent 244d0128
...@@ -291,7 +291,6 @@ int ast_mode_config_init(struct ast_private *ast); ...@@ -291,7 +291,6 @@ int ast_mode_config_init(struct ast_private *ast);
#define AST_MM_ALIGN_MASK ((1 << AST_MM_ALIGN_SHIFT) - 1) #define AST_MM_ALIGN_MASK ((1 << AST_MM_ALIGN_SHIFT) - 1)
int ast_mm_init(struct ast_private *ast); int ast_mm_init(struct ast_private *ast);
void ast_mm_fini(struct ast_private *ast);
/* ast post */ /* ast post */
void ast_enable_vga(struct drm_device *dev); void ast_enable_vga(struct drm_device *dev);
......
...@@ -452,6 +452,5 @@ void ast_driver_unload(struct drm_device *dev) ...@@ -452,6 +452,5 @@ void ast_driver_unload(struct drm_device *dev)
ast_release_firmware(dev); ast_release_firmware(dev);
kfree(ast->dp501_fw_addr); kfree(ast->dp501_fw_addr);
ast_mm_fini(ast);
kfree(ast); kfree(ast);
} }
...@@ -28,8 +28,9 @@ ...@@ -28,8 +28,9 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <drm/drm_print.h>
#include <drm/drm_gem_vram_helper.h> #include <drm/drm_gem_vram_helper.h>
#include <drm/drm_managed.h>
#include <drm/drm_print.h>
#include "ast_drv.h" #include "ast_drv.h"
...@@ -73,6 +74,15 @@ static u32 ast_get_vram_size(struct ast_private *ast) ...@@ -73,6 +74,15 @@ static u32 ast_get_vram_size(struct ast_private *ast)
return vram_size; return vram_size;
} }
static void ast_mm_release(struct drm_device *dev, void *ptr)
{
struct ast_private *ast = to_ast_private(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));
}
int ast_mm_init(struct ast_private *ast) int ast_mm_init(struct ast_private *ast)
{ {
u32 vram_size; u32 vram_size;
...@@ -93,14 +103,5 @@ int ast_mm_init(struct ast_private *ast) ...@@ -93,14 +103,5 @@ int ast_mm_init(struct ast_private *ast)
ast->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0), ast->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0),
pci_resource_len(dev->pdev, 0)); pci_resource_len(dev->pdev, 0));
return 0; return drmm_add_action_or_reset(dev, ast_mm_release, NULL);
}
void ast_mm_fini(struct ast_private *ast)
{
struct drm_device *dev = ast->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));
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment