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

drm/ast: Retrieve I/O-memory ranges without ast device

Browse Source 
Read the I/O-memory ranges into local variables before setting
them in the ast device instanace. We'll later need this to split
detecting the device type from the creation of the ast device
instance.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231116100240.22975-4-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2023-11-16 10:59:22 +01:00
parent 0ccaa3dde9
commit b45efcfc94
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,6 +432,8 @@ struct ast_device *ast_device_create(const struct drm_driver *drv,
struct ast_device *ast; struct ast_device *ast;
bool need_post = false; bool need_post = false;
int ret = 0; int ret = 0;
void __iomem *regs;
void __iomem *ioregs;
ast = devm_drm_dev_alloc(&pdev->dev, drv, struct ast_device, base); ast = devm_drm_dev_alloc(&pdev->dev, drv, struct ast_device, base);
if (IS_ERR(ast)) if (IS_ERR(ast))
@ -440,8 +442,8 @@ struct ast_device *ast_device_create(const struct drm_driver *drv,
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
ast->regs = pcim_iomap(pdev, 1, 0); regs = pcim_iomap(pdev, 1, 0);
if (!ast->regs) if (!regs)
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
if (pdev->revision >= 0x40) { if (pdev->revision >= 0x40) {
@ -455,7 +457,7 @@ struct ast_device *ast_device_create(const struct drm_driver *drv,
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
if ((len - AST_IO_MM_OFFSET) < AST_IO_MM_LENGTH) if ((len - AST_IO_MM_OFFSET) < AST_IO_MM_LENGTH)
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
ast->ioregs = ast->regs + AST_IO_MM_OFFSET; ioregs = regs + AST_IO_MM_OFFSET;
} else if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) { } else if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
/* /*
* Map I/O registers if we have a PCI BAR for I/O. * Map I/O registers if we have a PCI BAR for I/O.
@ -464,8 +466,8 @@ struct ast_device *ast_device_create(const struct drm_driver *drv,
if (len < AST_IO_MM_LENGTH) if (len < AST_IO_MM_LENGTH)
return -EIO; return -EIO;
ast->ioregs = pcim_iomap(pdev, 2, 0); ioregs = pcim_iomap(pdev, 2, 0);
if (!ast->ioregs) if (!ioregs)
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
} else { } else {
/* /*
@ -477,11 +479,14 @@ struct ast_device *ast_device_create(const struct drm_driver *drv,
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
if ((len - AST_IO_MM_OFFSET) < AST_IO_MM_LENGTH) if ((len - AST_IO_MM_OFFSET) < AST_IO_MM_LENGTH)
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
ast->ioregs = ast->regs + AST_IO_MM_OFFSET; ioregs = regs + AST_IO_MM_OFFSET;
drm_info(dev, "Platform has no I/O space, using MMIO\n"); drm_info(dev, "Platform has no I/O space, using MMIO\n");
} }
ast->regs = regs;
ast->ioregs = ioregs;
if (!ast_is_vga_enabled(dev)) { if (!ast_is_vga_enabled(dev)) {
drm_info(dev, "VGA not enabled on entry, requesting chip POST\n"); drm_info(dev, "VGA not enabled on entry, requesting chip POST\n");
need_post = true; need_post = true;