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

drm/ast: Move VRAM size detection to ast_mm.c

Browse Source 
VRAM size detection is only relevant to the memory management. Move
the code into ast_mm.c.

While at it, rename the function to ast_get_vram_size(). The function
argument's type is now struct ast_private. The result is stored in a
local variable and not in struct ast_private any longer.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200716125353.31512-5-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann
2020-07-16 14:53:51 +02:00
parent 8e46dc5853
commit 0149e7805b
3 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/ast/ast_drv.h
View File

@@ -110,7 +110,6 @@ struct ast_private {
uint32_t dram_bus_width; uint32_t dram_bus_width;
uint32_t dram_type; uint32_t dram_type;
uint32_t mclk; uint32_t mclk;
uint32_t vram_size;
int fb_mtrr; int fb_mtrr;

38
drivers/gpu/drm/ast/ast_main.c
View File

@@ -378,38 +378,6 @@ static int ast_get_dram_info(struct drm_device *dev)
return 0; return 0;
} }
static u32 ast_get_vram_info(struct drm_device *dev)
{
struct ast_private *ast = to_ast_private(dev);
u8 jreg;
u32 vram_size;
ast_open_key(ast);
vram_size = AST_VIDMEM_DEFAULT_SIZE;
jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xaa, 0xff);
switch (jreg & 3) {
case 0: vram_size = AST_VIDMEM_SIZE_8M; break;
case 1: vram_size = AST_VIDMEM_SIZE_16M; break;
case 2: vram_size = AST_VIDMEM_SIZE_32M; break;
case 3: vram_size = AST_VIDMEM_SIZE_64M; break;
}
jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x99, 0xff);
switch (jreg & 0x03) {
case 1:
vram_size -= 0x100000;
break;
case 2:
vram_size -= 0x200000;
break;
case 3:
vram_size -= 0x400000;
break;
}
return vram_size;
}
int ast_driver_load(struct drm_device *dev, unsigned long flags) int ast_driver_load(struct drm_device *dev, unsigned long flags)
{ {
struct ast_private *ast; struct ast_private *ast;
@@ -456,10 +424,8 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
ret = ast_get_dram_info(dev); ret = ast_get_dram_info(dev);
if (ret) if (ret)
goto out_free; goto out_free;
ast->vram_size = ast_get_vram_info(dev); drm_info(dev, "dram MCLK=%u Mhz type=%d bus_width=%d\n",
drm_info(dev, "dram MCLK=%u Mhz type=%d bus_width=%d size=%08x\n", ast->mclk, ast->dram_type, ast->dram_bus_width);
ast->mclk, ast->dram_type,
ast->dram_bus_width, ast->vram_size);
ret = ast_mm_init(ast); ret = ast_mm_init(ast);
if (ret) if (ret)

45
drivers/gpu/drm/ast/ast_mm.c
View File

@@ -33,13 +33,56 @@
#include "ast_drv.h" #include "ast_drv.h"
static u32 ast_get_vram_size(struct ast_private *ast)
{
u8 jreg;
u32 vram_size;
ast_open_key(ast);
vram_size = AST_VIDMEM_DEFAULT_SIZE;
jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xaa, 0xff);
switch (jreg & 3) {
case 0:
vram_size = AST_VIDMEM_SIZE_8M;
break;
case 1:
vram_size = AST_VIDMEM_SIZE_16M;
break;
case 2:
vram_size = AST_VIDMEM_SIZE_32M;
break;
case 3:
vram_size = AST_VIDMEM_SIZE_64M;
break;
}
jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x99, 0xff);
switch (jreg & 0x03) {
case 1:
vram_size -= 0x100000;
break;
case 2:
vram_size -= 0x200000;
break;
case 3:
vram_size -= 0x400000;
break;
}
return vram_size;
}
int ast_mm_init(struct ast_private *ast) int ast_mm_init(struct ast_private *ast)
{ {
u32 vram_size;
int ret; int ret;
struct drm_device *dev = ast->dev; struct drm_device *dev = ast->dev;
vram_size = ast_get_vram_size(ast);
ret = drmm_vram_helper_init(dev, pci_resource_start(dev->pdev, 0), ret = drmm_vram_helper_init(dev, pci_resource_start(dev->pdev, 0),
ast->vram_size); vram_size);
if (ret) { if (ret) {
drm_err(dev, "Error initializing VRAM MM; %d\n", ret); drm_err(dev, "Error initializing VRAM MM; %d\n", ret);
return ret; return ret;