summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJammy Huang <jammy_huang@aspeedtech.com>2023-04-21 08:33:54 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-09 10:32:20 +0200
commit872a038dd4c914ed37e59acb5b7b61ac4c448bad (patch)
tree30ee091a997748ae755ccaa826a066bc56423c74
parent3291f4a1073ac2822192fdcbe1009901a15dc864 (diff)
downloadlinux-stable-872a038dd4c914ed37e59acb5b7b61ac4c448bad.tar.gz
linux-stable-872a038dd4c914ed37e59acb5b7b61ac4c448bad.tar.bz2
linux-stable-872a038dd4c914ed37e59acb5b7b61ac4c448bad.zip
drm/ast: Fix ARM compatibility
[ Upstream commit 4327a6137ed43a091d900b1ac833345d60f32228 ] ARM architecture only has 'memory', so all devices are accessed by MMIO if possible. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20230421003354.27767-1-jammy_huang@aspeedtech.com Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/gpu/drm/ast/ast_main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index 79a361867955..754a08c92d3d 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -423,11 +423,12 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,
return ERR_PTR(-EIO);
/*
- * If we don't have IO space at all, use MMIO now and
- * assume the chip has MMIO enabled by default (rev 0x20
- * and higher).
+ * After AST2500, MMIO is enabled by default, and it should be adopted
+ * to be compatible with Arm.
*/
- if (!(pci_resource_flags(pdev, 2) & IORESOURCE_IO)) {
+ if (pdev->revision >= 0x40) {
+ ast->ioregs = ast->regs + AST_IO_MM_OFFSET;
+ } else if (!(pci_resource_flags(pdev, 2) & IORESOURCE_IO)) {
drm_info(dev, "platform has no IO space, trying MMIO\n");
ast->ioregs = ast->regs + AST_IO_MM_OFFSET;
}