From 2a76b63264112b26a253817d637158fcd234612d Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Wed, 20 Feb 2019 15:40:12 +0100
Subject: [PATCH] fixup: drm/panfrost: Expose raw GPU ID to userspace
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
drivers/gpu/drm/panfrost/panfrost_drv.c | 12 +-----------
include/uapi/drm/panfrost_drm.h | 3 ---
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index c7088bff6e4e4..7092e5b5b633f 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -23,17 +23,7 @@ static int panfrost_ioctl_get_param(struct drm_device *ddev, void *data, struct
switch(param->param) {
case PANFROST_PARAM_GPU_ID:
- switch (pfdev->features.id) {
- case 0x0750:
- param->value = PANFROST_PARAM_GPU_ID_MALI_T760;
- break;
- case 0x0860:
- case 0x0880:
- param->value = PANFROST_PARAM_GPU_ID_MALI_T860;
- break;
- default:
- return -ENODEV;
- }
+ param->value = pfdev->features.id;
break;
default:
return -EINVAL;
diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h
index 93592c2de03d1..cd3bb30175f8d 100644
--- a/include/uapi/drm/panfrost_drm.h
+++ b/include/uapi/drm/panfrost_drm.h
@@ -19,9 +19,6 @@ struct drm_panfrost_timespec {
__s64 tv_nsec; /* nanoseconds */
};
-#define PANFROST_PARAM_GPU_ID_MALI_T760 0x00
-#define PANFROST_PARAM_GPU_ID_MALI_T860 0x01
-
#define PANFROST_PARAM_GPU_ID 0x01
struct drm_panfrost_get_param {
--
GitLab