tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "drm/etnaviv: Expose a few more chipspecs to userspace"

This reverts commit 1dccdba084897443d116508a8ed71e0ac8a031a4.

In userspace a different approach was choosen - hwdb. As a result, there
is no need for these values.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

authored by

Christian Gmeiner and committed by
Lucas Stach e877d705 d7a5c9de

-71
-20
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
··· 164 164 *value = gpu->identity.eco_id; 165 165 break; 166 166 167 - case ETNAVIV_PARAM_GPU_NN_CORE_COUNT: 168 - *value = gpu->identity.nn_core_count; 169 - break; 170 - 171 - case ETNAVIV_PARAM_GPU_NN_MAD_PER_CORE: 172 - *value = gpu->identity.nn_mad_per_core; 173 - break; 174 - 175 - case ETNAVIV_PARAM_GPU_TP_CORE_COUNT: 176 - *value = gpu->identity.tp_core_count; 177 - break; 178 - 179 - case ETNAVIV_PARAM_GPU_ON_CHIP_SRAM_SIZE: 180 - *value = gpu->identity.on_chip_sram_size; 181 - break; 182 - 183 - case ETNAVIV_PARAM_GPU_AXI_SRAM_SIZE: 184 - *value = gpu->identity.axi_sram_size; 185 - break; 186 - 187 167 default: 188 168 DBG("%s: invalid param: %u", dev_name(gpu->dev), param); 189 169 return -EINVAL;
-12
drivers/gpu/drm/etnaviv/etnaviv_gpu.h
··· 54 54 /* Number of Neural Network cores. */ 55 55 u32 nn_core_count; 56 56 57 - /* Number of MAD units per Neural Network core. */ 58 - u32 nn_mad_per_core; 59 - 60 - /* Number of Tensor Processing cores. */ 61 - u32 tp_core_count; 62 - 63 - /* Size in bytes of the SRAM inside the NPU. */ 64 - u32 on_chip_sram_size; 65 - 66 - /* Size in bytes of the SRAM across the AXI bus. */ 67 - u32 axi_sram_size; 68 - 69 57 /* Size of the vertex cache. */ 70 58 u32 vertex_cache_size; 71 59
-34
drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
··· 17 17 .thread_count = 128, 18 18 .shader_core_count = 1, 19 19 .nn_core_count = 0, 20 - .nn_mad_per_core = 0, 21 - .tp_core_count = 0, 22 - .on_chip_sram_size = 0, 23 - .axi_sram_size = 0, 24 20 .vertex_cache_size = 8, 25 21 .vertex_output_buffer_size = 1024, 26 22 .pixel_pipes = 1, ··· 48 52 .register_max = 64, 49 53 .thread_count = 256, 50 54 .shader_core_count = 1, 51 - .nn_core_count = 0, 52 - .nn_mad_per_core = 0, 53 - .tp_core_count = 0, 54 - .on_chip_sram_size = 0, 55 - .axi_sram_size = 0, 56 55 .vertex_cache_size = 8, 57 56 .vertex_output_buffer_size = 512, 58 57 .pixel_pipes = 1, ··· 80 89 .thread_count = 512, 81 90 .shader_core_count = 2, 82 91 .nn_core_count = 0, 83 - .nn_mad_per_core = 0, 84 - .tp_core_count = 0, 85 - .on_chip_sram_size = 0, 86 - .axi_sram_size = 0, 87 92 .vertex_cache_size = 16, 88 93 .vertex_output_buffer_size = 1024, 89 94 .pixel_pipes = 1, ··· 112 125 .thread_count = 512, 113 126 .shader_core_count = 2, 114 127 .nn_core_count = 0, 115 - .nn_mad_per_core = 0, 116 - .tp_core_count = 0, 117 - .on_chip_sram_size = 0, 118 - .axi_sram_size = 0, 119 128 .vertex_cache_size = 16, 120 129 .vertex_output_buffer_size = 1024, 121 130 .pixel_pipes = 1, ··· 143 160 .register_max = 64, 144 161 .thread_count = 512, 145 162 .shader_core_count = 2, 146 - .nn_core_count = 0, 147 - .nn_mad_per_core = 0, 148 - .tp_core_count = 0, 149 - .on_chip_sram_size = 0, 150 - .axi_sram_size = 0, 151 163 .vertex_cache_size = 16, 152 164 .vertex_output_buffer_size = 1024, 153 165 .pixel_pipes = 1, ··· 175 197 .thread_count = 1024, 176 198 .shader_core_count = 4, 177 199 .nn_core_count = 0, 178 - .nn_mad_per_core = 0, 179 - .tp_core_count = 0, 180 - .on_chip_sram_size = 0, 181 - .axi_sram_size = 0, 182 200 .vertex_cache_size = 16, 183 201 .vertex_output_buffer_size = 1024, 184 202 .pixel_pipes = 2, ··· 207 233 .thread_count = 256, 208 234 .shader_core_count = 1, 209 235 .nn_core_count = 8, 210 - .nn_mad_per_core = 64, 211 - .tp_core_count = 4, 212 - .on_chip_sram_size = 524288, 213 - .axi_sram_size = 1048576, 214 236 .vertex_cache_size = 16, 215 237 .vertex_output_buffer_size = 1024, 216 238 .pixel_pipes = 1, ··· 239 269 .thread_count = 256, 240 270 .shader_core_count = 1, 241 271 .nn_core_count = 6, 242 - .nn_mad_per_core = 64, 243 - .tp_core_count = 3, 244 - .on_chip_sram_size = 262144, 245 - .axi_sram_size = 0, 246 272 .vertex_cache_size = 16, 247 273 .vertex_output_buffer_size = 1024, 248 274 .pixel_pipes = 1,
-5
include/uapi/drm/etnaviv_drm.h
··· 77 77 #define ETNAVIV_PARAM_GPU_PRODUCT_ID 0x1c 78 78 #define ETNAVIV_PARAM_GPU_CUSTOMER_ID 0x1d 79 79 #define ETNAVIV_PARAM_GPU_ECO_ID 0x1e 80 - #define ETNAVIV_PARAM_GPU_NN_CORE_COUNT 0x1f 81 - #define ETNAVIV_PARAM_GPU_NN_MAD_PER_CORE 0x20 82 - #define ETNAVIV_PARAM_GPU_TP_CORE_COUNT 0x21 83 - #define ETNAVIV_PARAM_GPU_ON_CHIP_SRAM_SIZE 0x22 84 - #define ETNAVIV_PARAM_GPU_AXI_SRAM_SIZE 0x23 85 80 86 81 #define ETNA_MAX_PIPES 4 87 82