aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_gpu.c36
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_gpu.h16
-rw-r--r--include/uapi/drm/etnaviv_drm.h6
3 files changed, 48 insertions, 10 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 260a73a44e69..42ad286d5ec0 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -84,6 +84,30 @@ int etnaviv_gpu_get_param(struct etnaviv_gpu *gpu, u32 param, u64 *value)
84 *value = gpu->identity.minor_features5; 84 *value = gpu->identity.minor_features5;
85 break; 85 break;
86 86
87 case ETNAVIV_PARAM_GPU_FEATURES_7:
88 *value = gpu->identity.minor_features6;
89 break;
90
91 case ETNAVIV_PARAM_GPU_FEATURES_8:
92 *value = gpu->identity.minor_features7;
93 break;
94
95 case ETNAVIV_PARAM_GPU_FEATURES_9:
96 *value = gpu->identity.minor_features8;
97 break;
98
99 case ETNAVIV_PARAM_GPU_FEATURES_10:
100 *value = gpu->identity.minor_features9;
101 break;
102
103 case ETNAVIV_PARAM_GPU_FEATURES_11:
104 *value = gpu->identity.minor_features10;
105 break;
106
107 case ETNAVIV_PARAM_GPU_FEATURES_12:
108 *value = gpu->identity.minor_features11;
109 break;
110
87 case ETNAVIV_PARAM_GPU_STREAM_COUNT: 111 case ETNAVIV_PARAM_GPU_STREAM_COUNT:
88 *value = gpu->identity.stream_count; 112 *value = gpu->identity.stream_count;
89 break; 113 break;
@@ -823,6 +847,18 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m)
823 gpu->identity.minor_features4); 847 gpu->identity.minor_features4);
824 seq_printf(m, "\t minor_features5: 0x%08x\n", 848 seq_printf(m, "\t minor_features5: 0x%08x\n",
825 gpu->identity.minor_features5); 849 gpu->identity.minor_features5);
850 seq_printf(m, "\t minor_features6: 0x%08x\n",
851 gpu->identity.minor_features6);
852 seq_printf(m, "\t minor_features7: 0x%08x\n",
853 gpu->identity.minor_features7);
854 seq_printf(m, "\t minor_features8: 0x%08x\n",
855 gpu->identity.minor_features8);
856 seq_printf(m, "\t minor_features9: 0x%08x\n",
857 gpu->identity.minor_features9);
858 seq_printf(m, "\t minor_features10: 0x%08x\n",
859 gpu->identity.minor_features10);
860 seq_printf(m, "\t minor_features11: 0x%08x\n",
861 gpu->identity.minor_features11);
826 862
827 seq_puts(m, "\tspecs\n"); 863 seq_puts(m, "\tspecs\n");
828 seq_printf(m, "\t stream_count: %d\n", 864 seq_printf(m, "\t stream_count: %d\n",
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index 3b19528330a0..18460df401b7 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -38,21 +38,17 @@ struct etnaviv_chip_identity {
38 38
39 /* Supported minor feature fields. */ 39 /* Supported minor feature fields. */
40 u32 minor_features0; 40 u32 minor_features0;
41
42 /* Supported minor feature 1 fields. */
43 u32 minor_features1; 41 u32 minor_features1;
44
45 /* Supported minor feature 2 fields. */
46 u32 minor_features2; 42 u32 minor_features2;
47
48 /* Supported minor feature 3 fields. */
49 u32 minor_features3; 43 u32 minor_features3;
50
51 /* Supported minor feature 4 fields. */
52 u32 minor_features4; 44 u32 minor_features4;
53
54 /* Supported minor feature 5 fields. */
55 u32 minor_features5; 45 u32 minor_features5;
46 u32 minor_features6;
47 u32 minor_features7;
48 u32 minor_features8;
49 u32 minor_features9;
50 u32 minor_features10;
51 u32 minor_features11;
56 52
57 /* Number of streams supported. */ 53 /* Number of streams supported. */
58 u32 stream_count; 54 u32 stream_count;
diff --git a/include/uapi/drm/etnaviv_drm.h b/include/uapi/drm/etnaviv_drm.h
index e9b997a0ef27..0d5c49dc478c 100644
--- a/include/uapi/drm/etnaviv_drm.h
+++ b/include/uapi/drm/etnaviv_drm.h
@@ -55,6 +55,12 @@ struct drm_etnaviv_timespec {
55#define ETNAVIV_PARAM_GPU_FEATURES_4 0x07 55#define ETNAVIV_PARAM_GPU_FEATURES_4 0x07
56#define ETNAVIV_PARAM_GPU_FEATURES_5 0x08 56#define ETNAVIV_PARAM_GPU_FEATURES_5 0x08
57#define ETNAVIV_PARAM_GPU_FEATURES_6 0x09 57#define ETNAVIV_PARAM_GPU_FEATURES_6 0x09
58#define ETNAVIV_PARAM_GPU_FEATURES_7 0x0a
59#define ETNAVIV_PARAM_GPU_FEATURES_8 0x0b
60#define ETNAVIV_PARAM_GPU_FEATURES_9 0x0c
61#define ETNAVIV_PARAM_GPU_FEATURES_10 0x0d
62#define ETNAVIV_PARAM_GPU_FEATURES_11 0x0e
63#define ETNAVIV_PARAM_GPU_FEATURES_12 0x0f
58 64
59#define ETNAVIV_PARAM_GPU_STREAM_COUNT 0x10 65#define ETNAVIV_PARAM_GPU_STREAM_COUNT 0x10
60#define ETNAVIV_PARAM_GPU_REGISTER_MAX 0x11 66#define ETNAVIV_PARAM_GPU_REGISTER_MAX 0x11