mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
drm/ast: Move Gen3 device initialization into separate helper
Split off device initialization for Gen3 hardware into the helpers ast_2200_device_create() and ast_2200_detect_wide_screen(). The new functions are duplicates of their counterparts in ast_main.c, but stripped from most non-Gen3 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-8-tzimmermann@suse.de
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
ast-y := \
|
||||
ast_2000.o \
|
||||
ast_2100.o \
|
||||
ast_2200.o \
|
||||
ast_2300.o \
|
||||
ast_2500.o \
|
||||
ast_2600.o \
|
||||
|
||||
85
drivers/gpu/drm/ast/ast_2200.c
Normal file
85
drivers/gpu/drm/ast/ast_2200.c
Normal file
@@ -0,0 +1,85 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
/*
|
||||
* Copyright 2012 Red Hat Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
|
||||
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*/
|
||||
/*
|
||||
* Authors: Dave Airlie <airlied@redhat.com>
|
||||
*/
|
||||
|
||||
#include <linux/pci.h>
|
||||
|
||||
#include <drm/drm_drv.h>
|
||||
|
||||
#include "ast_drv.h"
|
||||
|
||||
static void ast_2200_detect_widescreen(struct ast_device *ast)
|
||||
{
|
||||
if (__ast_2100_detect_wsxga_p(ast)) {
|
||||
ast->support_wsxga_p = true;
|
||||
if (ast->chip == AST2200)
|
||||
ast->support_fullhd = true;
|
||||
}
|
||||
if (__ast_2100_detect_wuxga(ast))
|
||||
ast->support_wuxga = true;
|
||||
}
|
||||
|
||||
struct drm_device *ast_2200_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_2000_detect_tx_chip(ast, need_post);
|
||||
|
||||
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);
|
||||
|
||||
ast_2200_detect_widescreen(ast);
|
||||
|
||||
ret = ast_mode_config_init(ast);
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
|
||||
return dev;
|
||||
}
|
||||
|
||||
@@ -390,6 +390,10 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
drm = ast_2100_device_create(pdev, &ast_driver, chip, config_mode,
|
||||
regs, ioregs, need_post);
|
||||
break;
|
||||
case 3:
|
||||
drm = ast_2200_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);
|
||||
|
||||
@@ -447,6 +447,15 @@ struct drm_device *ast_2100_device_create(struct pci_dev *pdev,
|
||||
void __iomem *ioregs,
|
||||
bool need_post);
|
||||
|
||||
/* ast_2200.c */
|
||||
struct drm_device *ast_2200_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_2300.c */
|
||||
int ast_2300_post(struct ast_device *ast);
|
||||
void ast_2300_detect_tx_chip(struct ast_device *ast);
|
||||
|
||||
Reference in New Issue
Block a user