diff mbox series

[v3] drm/ast: Fix ARM compatibility

Message ID 20230421003354.27767-1-jammy_huang@aspeedtech.com
State New
Headers
Series [v3] drm/ast: Fix ARM compatibility |

Commit Message

Jammy Huang April 21, 2023, 12:33 a.m. UTC 
  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>
---
 v2 changes:
  - Use MMIO after AST2500 which enable MMIO by default.
 v3 changes:
  - Correct comments
---
 drivers/gpu/drm/ast/ast_main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


base-commit: e62252bc55b6d4eddc6c2bdbf95a448180d6a08d

Comments

Thomas Zimmermann April 21, 2023, 8:08 a.m. UTC | #1 
Hi

Am 21.04.23 um 02:33 schrieb Jammy Huang:
> ARM architecture only has 'memory', so all devices are accessed by
> MMIO if possible.

Merged into drm-misc-fixes. Thanks for the patch.

Best regards
Thomas

> 
> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   v2 changes:
>    - Use MMIO after AST2500 which enable MMIO by default.
>   v3 changes:
>    - Correct comments
> ---
>   drivers/gpu/drm/ast/ast_main.c | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
> index f83ce77127cb..a6d0ee4da2b8 100644
> --- a/drivers/gpu/drm/ast/ast_main.c
> +++ b/drivers/gpu/drm/ast/ast_main.c
> @@ -425,11 +425,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;
>   	}
> 
> base-commit: e62252bc55b6d4eddc6c2bdbf95a448180d6a08d

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index f83ce77127cb..a6d0ee4da2b8 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -425,11 +425,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;
 	}