hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
....@@ -408,6 +408,12 @@
408408 if (gpu->identity.model == chipModel_GC700)
409409 gpu->identity.features &= ~chipFeatures_FAST_CLEAR;
410410
411
+ /* These models/revisions don't have the 2D pipe bit */
412
+ if ((gpu->identity.model == chipModel_GC500 &&
413
+ gpu->identity.revision <= 2) ||
414
+ gpu->identity.model == chipModel_GC300)
415
+ gpu->identity.features |= chipFeatures_PIPE_2D;
416
+
411417 if ((gpu->identity.model == chipModel_GC500 &&
412418 gpu->identity.revision < 2) ||
413419 (gpu->identity.model == chipModel_GC300 &&
....@@ -441,8 +447,9 @@
441447 gpu_read(gpu, VIVS_HI_CHIP_MINOR_FEATURE_5);
442448 }
443449
444
- /* GC600 idle register reports zero bits where modules aren't present */
445
- if (gpu->identity.model == chipModel_GC600)
450
+ /* GC600/300 idle register reports zero bits where modules aren't present */
451
+ if (gpu->identity.model == chipModel_GC600 ||
452
+ gpu->identity.model == chipModel_GC300)
446453 gpu->idle_mask = VIVS_HI_IDLE_STATE_TX |
447454 VIVS_HI_IDLE_STATE_RA |
448455 VIVS_HI_IDLE_STATE_SE |