github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/ast: Move Gen6 device initialization into separate helper

Browse Source 
Split off device initialization for Gen6 hardware into the helpers
ast_2500_device_create() and ast_2500_detect_wide_screen(). The new
functions are duplicates of their counterparts in ast_main.c, but
stripped from most non-Gen6 support.

Simplifies maintenance as the driver's number of supported hardware
generations grows.

v2:
- simplify widescreen-detection logic

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20250922083708.45564-11-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2025-09-22 10:36:10 +02:00
parent 0125a7c3ae
commit 7b6665147a
3 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/gpu/drm/ast/ast_2500.c
View File

@ -27,7 +27,9 @@
*/
#include <linux/delay.h>
#include <linux/pci.h>
#include <drm/drm_drv.h>
#include <drm/drm_print.h>
#include "ast_drv.h"
@ -601,3 +603,65 @@ const struct ast_vbios_dclk_info ast_2500_dclk_table[] = {
{0x6a, 0x6d, 0x80}, /* 19: VCLK97_75 */
{0x44, 0x20, 0x43}, /* 1a: VCLK118_25 */
};
/*
* Device initialization
*/
static void ast_2500_detect_widescreen(struct ast_device *ast)
{
if (__ast_2100_detect_wsxga_p(ast) || ast->chip == AST2510) {
ast->support_wsxga_p = true;
ast->support_fullhd = true;
}
if (__ast_2100_detect_wuxga(ast))
ast->support_wuxga = true;
}
struct drm_device *ast_2500_device_create(struct pci_dev *pdev,
const struct drm_driver *drv,
enum ast_chip chip,
enum ast_config_mode config_mode,
void __iomem *regs,
void __iomem *ioregs,
bool need_post)
{
struct drm_device *dev;
struct ast_device *ast;
int ret;
ast = devm_drm_dev_alloc(&pdev->dev, drv, struct ast_device, base);
if (IS_ERR(ast))
return ERR_CAST(ast);
dev = &ast->base;
ast_device_init(ast, chip, config_mode, regs, ioregs);
ast_2300_detect_tx_chip(ast);
if (need_post) {
ret = ast_post_gpu(ast);
if (ret)
return ERR_PTR(ret);
}
ret = ast_mm_init(ast);
if (ret)
return ERR_PTR(ret);
/* map reserved buffer */
ast->dp501_fw_buf = NULL;
if (ast->vram_size < pci_resource_len(pdev, 0)) {
ast->dp501_fw_buf = pci_iomap_range(pdev, 0, ast->vram_size, 0);
if (!ast->dp501_fw_buf)
drm_info(dev, "failed to map reserved buffer!\n");
}
ast_2500_detect_widescreen(ast);
ret = ast_mode_config_init(ast);
if (ret)
return ERR_PTR(ret);
return dev;
}

4
drivers/gpu/drm/ast/ast_drv.c
View File

@ -402,6 +402,10 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
drm = ast_2400_device_create(pdev, &ast_driver, chip, config_mode,
regs, ioregs, need_post);
break;
case 6:
drm = ast_2500_device_create(pdev, &ast_driver, chip, config_mode,
regs, ioregs, need_post);
break;
default:
drm = ast_device_create(pdev, &ast_driver, chip, config_mode, regs, ioregs,
need_post);

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

@ -480,6 +480,13 @@ struct drm_device *ast_2400_device_create(struct pci_dev *pdev,
void ast_2500_patch_ahb(void __iomem *regs);
int ast_2500_post(struct ast_device *ast);
extern const struct ast_vbios_dclk_info ast_2500_dclk_table[];
struct drm_device *ast_2500_device_create(struct pci_dev *pdev,
const struct drm_driver *drv,
enum ast_chip chip,
enum ast_config_mode config_mode,
void __iomem *regs,
void __iomem *ioregs,
bool need_post);
/* ast_2600.c */
int ast_2600_post(struct ast_device *ast);