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

Configure Feed

Select the types of activity you want to include in your feed.

drm/amdkfd: Adjust CWSR trap handler for gfx950

In gfx950, the SQ_WAVE_LDS_ALLOC.LDS_SIZE field is extended to bits 12
to 22. The LDS_SIZE granularity remains unchanged (units of 64 dwords,
or 256 bytes). This patch adjusts the CWSR trap handler to read the
full extent of LDS_SIZE.

Signed-off-by: Lancelot SIX <lancelot.six@amd.com>
Reviewed-by: Jay Cornwall <jay.cornwall@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Lancelot SIX and committed by
Alex Deucher 549120ed ccca9964

+509 -3
+497
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
··· 4122 4122 0xbf9f0000, 0xbf9f0000, 4123 4123 0xbf9f0000, 0x00000000, 4124 4124 }; 4125 + 4126 + static const uint32_t cwsr_trap_gfx9_5_0_hex[] = { 4127 + 0xbf820001, 0xbf8202ea, 4128 + 0xb8f8f802, 0x8978ff78, 4129 + 0x00020006, 0xb8fbf803, 4130 + 0x866eff78, 0x00002000, 4131 + 0xbf840008, 0xbf0d986d, 4132 + 0xbf85001f, 0x866eff7b, 4133 + 0x00000400, 0xbf850061, 4134 + 0xbf8e0010, 0xb8fbf803, 4135 + 0xbf82fffa, 0x866eff7b, 4136 + 0x03800900, 0xbf850015, 4137 + 0x866eff7b, 0x000071ff, 4138 + 0xbf840008, 0x866fff7b, 4139 + 0x00007080, 0xbf840001, 4140 + 0xbeee1a87, 0xb8eff801, 4141 + 0x8e6e8c6e, 0x866e6f6e, 4142 + 0xbf85000a, 0xbf0d986d, 4143 + 0xbf850003, 0x866eff6d, 4144 + 0x00ff0000, 0xbf850005, 4145 + 0xbf0d986d, 0xbf850004, 4146 + 0x866eff7b, 0x00000400, 4147 + 0xbf850046, 0xbeed1a9d, 4148 + 0xb8faf807, 0x867aff7a, 4149 + 0x001f8000, 0x8e7a8b7a, 4150 + 0x8979ff79, 0xfc000000, 4151 + 0x87797a79, 0xba7ff807, 4152 + 0x00000000, 0xb8faf812, 4153 + 0xb8fbf813, 0x8efa887a, 4154 + 0xbf0d8f7b, 0xbf840002, 4155 + 0x877bff7b, 0xffff0000, 4156 + 0xc0031cfd, 0x00000010, 4157 + 0xc0071bbd, 0x00000000, 4158 + 0xc0071ebd, 0x00000008, 4159 + 0xbf8cc07f, 0x8e739773, 4160 + 0x8979ff79, 0x01800000, 4161 + 0x87797379, 0xbf0d986d, 4162 + 0xbf840009, 0xbf0d9879, 4163 + 0xbf850007, 0x896dff6d, 4164 + 0x01ff0000, 0xba7f0583, 4165 + 0x00000000, 0xbf0d9d6d, 4166 + 0xbeed189d, 0xbf840012, 4167 + 0xbef91898, 0xbeed189d, 4168 + 0x86ee6e6e, 0xbf840001, 4169 + 0xbe801d6e, 0x866eff6d, 4170 + 0x01ff0000, 0xbf850005, 4171 + 0x8778ff78, 0x00002000, 4172 + 0x80ec886c, 0x82ed806d, 4173 + 0xbf820005, 0x866eff6d, 4174 + 0x01000000, 0xbf850002, 4175 + 0x806c846c, 0x826d806d, 4176 + 0x866dff6d, 0x0000ffff, 4177 + 0x8f7a8b79, 0x867aff7a, 4178 + 0x001f8000, 0xb97af807, 4179 + 0x86fe7e7e, 0x86ea6a6a, 4180 + 0x8f6e8378, 0xb96ee0c2, 4181 + 0xbf800002, 0xb9780002, 4182 + 0xbe801f6c, 0x866dff6d, 4183 + 0x0000ffff, 0xbefa0080, 4184 + 0xb97a0283, 0xb8faf807, 4185 + 0x867aff7a, 0x001f8000, 4186 + 0x8e7a8b7a, 0x8979ff79, 4187 + 0xfc000000, 0x87797a79, 4188 + 0xba7ff807, 0x00000000, 4189 + 0xbeee007e, 0xbeef007f, 4190 + 0xbefe0180, 0xbf900004, 4191 + 0x877a8478, 0xb97af802, 4192 + 0xbf8e0002, 0xbf88fffe, 4193 + 0xb8fa2985, 0x807a817a, 4194 + 0x8e7a8a7a, 0x8e7a817a, 4195 + 0xb8fb1605, 0x807b817b, 4196 + 0x8e7b867b, 0x807a7b7a, 4197 + 0x807a7e7a, 0x827b807f, 4198 + 0x867bff7b, 0x0000ffff, 4199 + 0xc04b1c3d, 0x00000050, 4200 + 0xbf8cc07f, 0xc04b1d3d, 4201 + 0x00000060, 0xbf8cc07f, 4202 + 0xc0431e7d, 0x00000074, 4203 + 0xbf8cc07f, 0xbef4007e, 4204 + 0x8675ff7f, 0x0000ffff, 4205 + 0x8775ff75, 0x00040000, 4206 + 0xbef60080, 0xbef700ff, 4207 + 0x00807fac, 0xbef1007c, 4208 + 0xbef00080, 0xb8f02985, 4209 + 0x80708170, 0x8e708a70, 4210 + 0x8e708170, 0xb8fa1605, 4211 + 0x807a817a, 0x8e7a867a, 4212 + 0x80707a70, 0xbef60084, 4213 + 0xbef600ff, 0x01000000, 4214 + 0xbefe007c, 0xbefc0070, 4215 + 0xc0611c7a, 0x0000007c, 4216 + 0xbf8cc07f, 0x80708470, 4217 + 0xbefc007e, 0xbefe007c, 4218 + 0xbefc0070, 0xc0611b3a, 4219 + 0x0000007c, 0xbf8cc07f, 4220 + 0x80708470, 0xbefc007e, 4221 + 0xbefe007c, 0xbefc0070, 4222 + 0xc0611b7a, 0x0000007c, 4223 + 0xbf8cc07f, 0x80708470, 4224 + 0xbefc007e, 0xbefe007c, 4225 + 0xbefc0070, 0xc0611bba, 4226 + 0x0000007c, 0xbf8cc07f, 4227 + 0x80708470, 0xbefc007e, 4228 + 0xbefe007c, 0xbefc0070, 4229 + 0xc0611bfa, 0x0000007c, 4230 + 0xbf8cc07f, 0x80708470, 4231 + 0xbefc007e, 0xbefe007c, 4232 + 0xbefc0070, 0xc0611e3a, 4233 + 0x0000007c, 0xbf8cc07f, 4234 + 0x80708470, 0xbefc007e, 4235 + 0xb8fbf803, 0xbefe007c, 4236 + 0xbefc0070, 0xc0611efa, 4237 + 0x0000007c, 0xbf8cc07f, 4238 + 0x80708470, 0xbefc007e, 4239 + 0xbefe007c, 0xbefc0070, 4240 + 0xc0611a3a, 0x0000007c, 4241 + 0xbf8cc07f, 0x80708470, 4242 + 0xbefc007e, 0xbefe007c, 4243 + 0xbefc0070, 0xc0611a7a, 4244 + 0x0000007c, 0xbf8cc07f, 4245 + 0x80708470, 0xbefc007e, 4246 + 0xb8f1f801, 0xbefe007c, 4247 + 0xbefc0070, 0xc0611c7a, 4248 + 0x0000007c, 0xbf8cc07f, 4249 + 0x80708470, 0xbefc007e, 4250 + 0x867aff7f, 0x04000000, 4251 + 0xbeef0080, 0x876f6f7a, 4252 + 0xb8f02985, 0x80708170, 4253 + 0x8e708a70, 0x8e708170, 4254 + 0xb8fb1605, 0x807b817b, 4255 + 0x8e7b847b, 0x8e76827b, 4256 + 0xbef600ff, 0x01000000, 4257 + 0xbef20174, 0x80747074, 4258 + 0x82758075, 0xbefc0080, 4259 + 0xbf800000, 0xbe802b00, 4260 + 0xbe822b02, 0xbe842b04, 4261 + 0xbe862b06, 0xbe882b08, 4262 + 0xbe8a2b0a, 0xbe8c2b0c, 4263 + 0xbe8e2b0e, 0xc06b003a, 4264 + 0x00000000, 0xbf8cc07f, 4265 + 0xc06b013a, 0x00000010, 4266 + 0xbf8cc07f, 0xc06b023a, 4267 + 0x00000020, 0xbf8cc07f, 4268 + 0xc06b033a, 0x00000030, 4269 + 0xbf8cc07f, 0x8074c074, 4270 + 0x82758075, 0x807c907c, 4271 + 0xbf0a7b7c, 0xbf85ffe7, 4272 + 0xbef40172, 0xbef00080, 4273 + 0xbefe00c1, 0xbeff00c1, 4274 + 0xbee80080, 0xbee90080, 4275 + 0xbef600ff, 0x01000000, 4276 + 0x867aff78, 0x00400000, 4277 + 0xbf850003, 0xb8faf803, 4278 + 0x897a7aff, 0x10000000, 4279 + 0xbf85004d, 0xbe840080, 4280 + 0xd2890000, 0x00000900, 4281 + 0x80048104, 0xd2890001, 4282 + 0x00000900, 0x80048104, 4283 + 0xd2890002, 0x00000900, 4284 + 0x80048104, 0xd2890003, 4285 + 0x00000900, 0x80048104, 4286 + 0xc069003a, 0x00000070, 4287 + 0xbf8cc07f, 0x80709070, 4288 + 0xbf06c004, 0xbf84ffee, 4289 + 0xbe840080, 0xd2890000, 4290 + 0x00000901, 0x80048104, 4291 + 0xd2890001, 0x00000901, 4292 + 0x80048104, 0xd2890002, 4293 + 0x00000901, 0x80048104, 4294 + 0xd2890003, 0x00000901, 4295 + 0x80048104, 0xc069003a, 4296 + 0x00000070, 0xbf8cc07f, 4297 + 0x80709070, 0xbf06c004, 4298 + 0xbf84ffee, 0xbe840080, 4299 + 0xd2890000, 0x00000902, 4300 + 0x80048104, 0xd2890001, 4301 + 0x00000902, 0x80048104, 4302 + 0xd2890002, 0x00000902, 4303 + 0x80048104, 0xd2890003, 4304 + 0x00000902, 0x80048104, 4305 + 0xc069003a, 0x00000070, 4306 + 0xbf8cc07f, 0x80709070, 4307 + 0xbf06c004, 0xbf84ffee, 4308 + 0xbe840080, 0xd2890000, 4309 + 0x00000903, 0x80048104, 4310 + 0xd2890001, 0x00000903, 4311 + 0x80048104, 0xd2890002, 4312 + 0x00000903, 0x80048104, 4313 + 0xd2890003, 0x00000903, 4314 + 0x80048104, 0xc069003a, 4315 + 0x00000070, 0xbf8cc07f, 4316 + 0x80709070, 0xbf06c004, 4317 + 0xbf84ffee, 0xbf820008, 4318 + 0xe0724000, 0x701d0000, 4319 + 0xe0724100, 0x701d0100, 4320 + 0xe0724200, 0x701d0200, 4321 + 0xe0724300, 0x701d0300, 4322 + 0xbefe00c1, 0xbeff00c1, 4323 + 0xb8fb5306, 0x867bc17b, 4324 + 0xbf840064, 0xbf8a0000, 4325 + 0x867aff6f, 0x04000000, 4326 + 0xbf840060, 0x8e7b867b, 4327 + 0x8e7b827b, 0xbef6007b, 4328 + 0xb8f02985, 0x80708170, 4329 + 0x8e708a70, 0x8e708170, 4330 + 0xb8fa1605, 0x807a817a, 4331 + 0x8e7a867a, 0x80707a70, 4332 + 0x8070ff70, 0x00000080, 4333 + 0xbef600ff, 0x01000000, 4334 + 0xbefc0080, 0xd28c0002, 4335 + 0x000100c1, 0xd28d0003, 4336 + 0x000204c1, 0x867aff78, 4337 + 0x00400000, 0xbf850003, 4338 + 0xb8faf803, 0x897a7aff, 4339 + 0x10000000, 0xbf850030, 4340 + 0x24040682, 0xd86e4000, 4341 + 0x00000002, 0xbf8cc07f, 4342 + 0xbe840080, 0xd2890000, 4343 + 0x00000900, 0x80048104, 4344 + 0xd2890001, 0x00000900, 4345 + 0x80048104, 0xd2890002, 4346 + 0x00000900, 0x80048104, 4347 + 0xd2890003, 0x00000900, 4348 + 0x80048104, 0xc069003a, 4349 + 0x00000070, 0xbf8cc07f, 4350 + 0x80709070, 0xbf06c004, 4351 + 0xbf84ffee, 0xbe840080, 4352 + 0xd2890000, 0x00000901, 4353 + 0x80048104, 0xd2890001, 4354 + 0x00000901, 0x80048104, 4355 + 0xd2890002, 0x00000901, 4356 + 0x80048104, 0xd2890003, 4357 + 0x00000901, 0x80048104, 4358 + 0xc069003a, 0x00000070, 4359 + 0xbf8cc07f, 0x80709070, 4360 + 0xbf06c004, 0xbf84ffee, 4361 + 0x680404ff, 0x00000200, 4362 + 0xd0c9006a, 0x0000f702, 4363 + 0xbf87ffd2, 0xbf820015, 4364 + 0xd1060002, 0x00011103, 4365 + 0x7e0602ff, 0x00000200, 4366 + 0xbefc00ff, 0x00010000, 4367 + 0xbe800077, 0x8677ff77, 4368 + 0xff7fffff, 0x8777ff77, 4369 + 0x00058000, 0xd8ec0000, 4370 + 0x00000002, 0xbf8cc07f, 4371 + 0xe0765000, 0x701d0002, 4372 + 0x68040702, 0xd0c9006a, 4373 + 0x0000f702, 0xbf87fff7, 4374 + 0xbef70000, 0xbef000ff, 4375 + 0x00000400, 0xbefe00c1, 4376 + 0xbeff00c1, 0xb8fb2b05, 4377 + 0x807b817b, 0x8e7b827b, 4378 + 0xbef600ff, 0x01000000, 4379 + 0xbefc0084, 0xbf0a7b7c, 4380 + 0xbf84006d, 0xbf11017c, 4381 + 0x807bff7b, 0x00001000, 4382 + 0x867aff78, 0x00400000, 4383 + 0xbf850003, 0xb8faf803, 4384 + 0x897a7aff, 0x10000000, 4385 + 0xbf850051, 0xbe840080, 4386 + 0xd2890000, 0x00000900, 4387 + 0x80048104, 0xd2890001, 4388 + 0x00000900, 0x80048104, 4389 + 0xd2890002, 0x00000900, 4390 + 0x80048104, 0xd2890003, 4391 + 0x00000900, 0x80048104, 4392 + 0xc069003a, 0x00000070, 4393 + 0xbf8cc07f, 0x80709070, 4394 + 0xbf06c004, 0xbf84ffee, 4395 + 0xbe840080, 0xd2890000, 4396 + 0x00000901, 0x80048104, 4397 + 0xd2890001, 0x00000901, 4398 + 0x80048104, 0xd2890002, 4399 + 0x00000901, 0x80048104, 4400 + 0xd2890003, 0x00000901, 4401 + 0x80048104, 0xc069003a, 4402 + 0x00000070, 0xbf8cc07f, 4403 + 0x80709070, 0xbf06c004, 4404 + 0xbf84ffee, 0xbe840080, 4405 + 0xd2890000, 0x00000902, 4406 + 0x80048104, 0xd2890001, 4407 + 0x00000902, 0x80048104, 4408 + 0xd2890002, 0x00000902, 4409 + 0x80048104, 0xd2890003, 4410 + 0x00000902, 0x80048104, 4411 + 0xc069003a, 0x00000070, 4412 + 0xbf8cc07f, 0x80709070, 4413 + 0xbf06c004, 0xbf84ffee, 4414 + 0xbe840080, 0xd2890000, 4415 + 0x00000903, 0x80048104, 4416 + 0xd2890001, 0x00000903, 4417 + 0x80048104, 0xd2890002, 4418 + 0x00000903, 0x80048104, 4419 + 0xd2890003, 0x00000903, 4420 + 0x80048104, 0xc069003a, 4421 + 0x00000070, 0xbf8cc07f, 4422 + 0x80709070, 0xbf06c004, 4423 + 0xbf84ffee, 0x807c847c, 4424 + 0xbf0a7b7c, 0xbf85ffb1, 4425 + 0xbf9c0000, 0xbf820012, 4426 + 0x7e000300, 0x7e020301, 4427 + 0x7e040302, 0x7e060303, 4428 + 0xe0724000, 0x701d0000, 4429 + 0xe0724100, 0x701d0100, 4430 + 0xe0724200, 0x701d0200, 4431 + 0xe0724300, 0x701d0300, 4432 + 0x807c847c, 0x8070ff70, 4433 + 0x00000400, 0xbf0a7b7c, 4434 + 0xbf85ffef, 0xbf9c0000, 4435 + 0xb8fb2985, 0x807b817b, 4436 + 0x8e7b837b, 0xb8fa2b05, 4437 + 0x807a817a, 0x8e7a827a, 4438 + 0x80fb7a7b, 0x867b7b7b, 4439 + 0xbf84007a, 0x807bff7b, 4440 + 0x00001000, 0xbefc0080, 4441 + 0xbf11017c, 0x867aff78, 4442 + 0x00400000, 0xbf850003, 4443 + 0xb8faf803, 0x897a7aff, 4444 + 0x10000000, 0xbf850059, 4445 + 0xd3d84000, 0x18000100, 4446 + 0xd3d84001, 0x18000101, 4447 + 0xd3d84002, 0x18000102, 4448 + 0xd3d84003, 0x18000103, 4449 + 0xbe840080, 0xd2890000, 4450 + 0x00000900, 0x80048104, 4451 + 0xd2890001, 0x00000900, 4452 + 0x80048104, 0xd2890002, 4453 + 0x00000900, 0x80048104, 4454 + 0xd2890003, 0x00000900, 4455 + 0x80048104, 0xc069003a, 4456 + 0x00000070, 0xbf8cc07f, 4457 + 0x80709070, 0xbf06c004, 4458 + 0xbf84ffee, 0xbe840080, 4459 + 0xd2890000, 0x00000901, 4460 + 0x80048104, 0xd2890001, 4461 + 0x00000901, 0x80048104, 4462 + 0xd2890002, 0x00000901, 4463 + 0x80048104, 0xd2890003, 4464 + 0x00000901, 0x80048104, 4465 + 0xc069003a, 0x00000070, 4466 + 0xbf8cc07f, 0x80709070, 4467 + 0xbf06c004, 0xbf84ffee, 4468 + 0xbe840080, 0xd2890000, 4469 + 0x00000902, 0x80048104, 4470 + 0xd2890001, 0x00000902, 4471 + 0x80048104, 0xd2890002, 4472 + 0x00000902, 0x80048104, 4473 + 0xd2890003, 0x00000902, 4474 + 0x80048104, 0xc069003a, 4475 + 0x00000070, 0xbf8cc07f, 4476 + 0x80709070, 0xbf06c004, 4477 + 0xbf84ffee, 0xbe840080, 4478 + 0xd2890000, 0x00000903, 4479 + 0x80048104, 0xd2890001, 4480 + 0x00000903, 0x80048104, 4481 + 0xd2890002, 0x00000903, 4482 + 0x80048104, 0xd2890003, 4483 + 0x00000903, 0x80048104, 4484 + 0xc069003a, 0x00000070, 4485 + 0xbf8cc07f, 0x80709070, 4486 + 0xbf06c004, 0xbf84ffee, 4487 + 0x807c847c, 0xbf0a7b7c, 4488 + 0xbf85ffa9, 0xbf9c0000, 4489 + 0xbf820016, 0xd3d84000, 4490 + 0x18000100, 0xd3d84001, 4491 + 0x18000101, 0xd3d84002, 4492 + 0x18000102, 0xd3d84003, 4493 + 0x18000103, 0xe0724000, 4494 + 0x701d0000, 0xe0724100, 4495 + 0x701d0100, 0xe0724200, 4496 + 0x701d0200, 0xe0724300, 4497 + 0x701d0300, 0x807c847c, 4498 + 0x8070ff70, 0x00000400, 4499 + 0xbf0a7b7c, 0xbf85ffeb, 4500 + 0xbf9c0000, 0xbf8200ee, 4501 + 0xbef4007e, 0x8675ff7f, 4502 + 0x0000ffff, 0x8775ff75, 4503 + 0x00040000, 0xbef60080, 4504 + 0xbef700ff, 0x00807fac, 4505 + 0x866eff7f, 0x04000000, 4506 + 0xbf84001f, 0xbefe00c1, 4507 + 0xbeff00c1, 0xb8ef5306, 4508 + 0x866fc16f, 0xbf84001a, 4509 + 0x8e6f866f, 0x8e6f826f, 4510 + 0xbef6006f, 0xb8f82985, 4511 + 0x80788178, 0x8e788a78, 4512 + 0x8e788178, 0xb8ee1605, 4513 + 0x806e816e, 0x8e6e866e, 4514 + 0x80786e78, 0x8078ff78, 4515 + 0x00000080, 0xbef600ff, 4516 + 0x01000000, 0xbefc0080, 4517 + 0xe0510000, 0x781d0000, 4518 + 0xe0510100, 0x781d0000, 4519 + 0x807cff7c, 0x00000200, 4520 + 0x8078ff78, 0x00000200, 4521 + 0xbf0a6f7c, 0xbf85fff6, 4522 + 0xbefe00c1, 0xbeff00c1, 4523 + 0xbef600ff, 0x01000000, 4524 + 0xb8ef2b05, 0x806f816f, 4525 + 0x8e6f826f, 0x806fff6f, 4526 + 0x00008000, 0xbef80080, 4527 + 0xbeee0078, 0x8078ff78, 4528 + 0x00000400, 0xbefc0084, 4529 + 0xbf11087c, 0xe0524000, 4530 + 0x781d0000, 0xe0524100, 4531 + 0x781d0100, 0xe0524200, 4532 + 0x781d0200, 0xe0524300, 4533 + 0x781d0300, 0xbf8c0f70, 4534 + 0x7e000300, 0x7e020301, 4535 + 0x7e040302, 0x7e060303, 4536 + 0x807c847c, 0x8078ff78, 4537 + 0x00000400, 0xbf0a6f7c, 4538 + 0xbf85ffee, 0xb8ef2985, 4539 + 0x806f816f, 0x8e6f836f, 4540 + 0xb8f92b05, 0x80798179, 4541 + 0x8e798279, 0x80ef796f, 4542 + 0x866f6f6f, 0xbf84001a, 4543 + 0x806fff6f, 0x00008000, 4544 + 0xbefc0080, 0xbf11087c, 4545 + 0xe0524000, 0x781d0000, 4546 + 0xe0524100, 0x781d0100, 4547 + 0xe0524200, 0x781d0200, 4548 + 0xe0524300, 0x781d0300, 4549 + 0xbf8c0f70, 0xd3d94000, 4550 + 0x18000100, 0xd3d94001, 4551 + 0x18000101, 0xd3d94002, 4552 + 0x18000102, 0xd3d94003, 4553 + 0x18000103, 0x807c847c, 4554 + 0x8078ff78, 0x00000400, 4555 + 0xbf0a6f7c, 0xbf85ffea, 4556 + 0xbf9c0000, 0xe0524000, 4557 + 0x6e1d0000, 0xe0524100, 4558 + 0x6e1d0100, 0xe0524200, 4559 + 0x6e1d0200, 0xe0524300, 4560 + 0x6e1d0300, 0xbf8c0f70, 4561 + 0xb8f82985, 0x80788178, 4562 + 0x8e788a78, 0x8e788178, 4563 + 0xb8ee1605, 0x806e816e, 4564 + 0x8e6e866e, 0x80786e78, 4565 + 0x80f8c078, 0xb8ef1605, 4566 + 0x806f816f, 0x8e6f846f, 4567 + 0x8e76826f, 0xbef600ff, 4568 + 0x01000000, 0xbefc006f, 4569 + 0xc031003a, 0x00000078, 4570 + 0x80f8c078, 0xbf8cc07f, 4571 + 0x80fc907c, 0xbf800000, 4572 + 0xbe802d00, 0xbe822d02, 4573 + 0xbe842d04, 0xbe862d06, 4574 + 0xbe882d08, 0xbe8a2d0a, 4575 + 0xbe8c2d0c, 0xbe8e2d0e, 4576 + 0xbf06807c, 0xbf84fff0, 4577 + 0xb8f82985, 0x80788178, 4578 + 0x8e788a78, 0x8e788178, 4579 + 0xb8ee1605, 0x806e816e, 4580 + 0x8e6e866e, 0x80786e78, 4581 + 0xbef60084, 0xbef600ff, 4582 + 0x01000000, 0xc0211bfa, 4583 + 0x00000078, 0x80788478, 4584 + 0xc0211b3a, 0x00000078, 4585 + 0x80788478, 0xc0211b7a, 4586 + 0x00000078, 0x80788478, 4587 + 0xc0211c3a, 0x00000078, 4588 + 0x80788478, 0xc0211c7a, 4589 + 0x00000078, 0x80788478, 4590 + 0xc0211eba, 0x00000078, 4591 + 0x80788478, 0xc0211efa, 4592 + 0x00000078, 0x80788478, 4593 + 0xc0211a3a, 0x00000078, 4594 + 0x80788478, 0xc0211a7a, 4595 + 0x00000078, 0x80788478, 4596 + 0xc0211cfa, 0x00000078, 4597 + 0x80788478, 0xbf8cc07f, 4598 + 0xbefc006f, 0xbefe0070, 4599 + 0xbeff0071, 0x866f7bff, 4600 + 0x000003ff, 0xb96f4803, 4601 + 0x866f7bff, 0xfffff800, 4602 + 0x8f6f8b6f, 0xb96fa2c3, 4603 + 0xb973f801, 0xb8ee2985, 4604 + 0x806e816e, 0x8e6e8a6e, 4605 + 0x8e6e816e, 0xb8ef1605, 4606 + 0x806f816f, 0x8e6f866f, 4607 + 0x806e6f6e, 0x806e746e, 4608 + 0x826f8075, 0x866fff6f, 4609 + 0x0000ffff, 0xc00b1c37, 4610 + 0x00000050, 0xc00b1d37, 4611 + 0x00000060, 0xc0031e77, 4612 + 0x00000074, 0xbf8cc07f, 4613 + 0x8f6e8b79, 0x866eff6e, 4614 + 0x001f8000, 0xb96ef807, 4615 + 0x866dff6d, 0x0000ffff, 4616 + 0x86fe7e7e, 0x86ea6a6a, 4617 + 0x8f6e837a, 0xb96ee0c2, 4618 + 0xbf800002, 0xb97a0002, 4619 + 0xbf8a0000, 0xbe801f6c, 4620 + 0xbf9b0000, 0x00000000, 4621 + };
+9
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
··· 37 37 * gc_9_4_3: 38 38 * cpp -DASIC_FAMILY=GC_9_4_3 cwsr_trap_handler_gfx9.asm -P -o gc_9_4_3.sp3 39 39 * sp3 gc_9_4_3.sp3 -hex gc_9_4_3.hex 40 + * 41 + * gc_9_5_0: 42 + * cpp -DASIC_FAMILY=GC_9_5_0 cwsr_trap_handler_gfx9.asm -P -o gc_9_5_0.sp3 43 + * sp3 gc_9_5_0.sp3 -hex gc_9_5_0.hex 40 44 */ 41 45 42 46 #define CHIP_VEGAM 18 43 47 #define CHIP_ARCTURUS 23 44 48 #define CHIP_ALDEBARAN 25 45 49 #define CHIP_GC_9_4_3 26 50 + #define CHIP_GC_9_5_0 27 46 51 47 52 var ACK_SQC_STORE = 1 //workaround for suspected SQC store bug causing incorrect stores under concurrency 48 53 var SAVE_AFTER_XNACK_ERROR = 1 //workaround for TCP store failure after XNACK error when ALLOW_REPLAY=0, for debugger ··· 73 68 var SQ_WAVE_STATUS_ECC_ERR_MASK = 0x20000 74 69 75 70 var SQ_WAVE_LDS_ALLOC_LDS_SIZE_SHIFT = 12 71 + #if ASIC_FAMILY >= CHIP_GC_9_5_0 72 + var SQ_WAVE_LDS_ALLOC_LDS_SIZE_SIZE = 11 73 + #else 76 74 var SQ_WAVE_LDS_ALLOC_LDS_SIZE_SIZE = 9 75 + #endif 77 76 var SQ_WAVE_GPR_ALLOC_VGPR_SIZE_SIZE = 6 78 77 var SQ_WAVE_GPR_ALLOC_SGPR_SIZE_SIZE = 3 //FIXME sq.blk still has 4 bits at this time while SQ programming guide has 3 bits 79 78 var SQ_WAVE_GPR_ALLOC_SGPR_SIZE_SHIFT = 24
+3 -3
drivers/gpu/drm/amd/amdkfd/kfd_device.c
··· 522 522 kfd->cwsr_isa = cwsr_trap_gfx9_4_3_hex; 523 523 kfd->cwsr_isa_size = sizeof(cwsr_trap_gfx9_4_3_hex); 524 524 } else if (KFD_GC_VERSION(kfd) == IP_VERSION(9, 5, 0)) { 525 - BUILD_BUG_ON(sizeof(cwsr_trap_gfx9_4_3_hex) > PAGE_SIZE); 526 - kfd->cwsr_isa = cwsr_trap_gfx9_4_3_hex; 527 - kfd->cwsr_isa_size = sizeof(cwsr_trap_gfx9_4_3_hex); 525 + BUILD_BUG_ON(sizeof(cwsr_trap_gfx9_5_0_hex) > PAGE_SIZE); 526 + kfd->cwsr_isa = cwsr_trap_gfx9_5_0_hex; 527 + kfd->cwsr_isa_size = sizeof(cwsr_trap_gfx9_5_0_hex); 528 528 } else if (KFD_GC_VERSION(kfd) < IP_VERSION(10, 1, 1)) { 529 529 BUILD_BUG_ON(sizeof(cwsr_trap_gfx9_hex) 530 530 > KFD_CWSR_TMA_OFFSET);