diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2016-08-15 12:16:59 -0400 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2016-09-15 09:29:44 -0400 |
commit | 12ff4bdef1a015945e4b19ed80dd9e50626cd3bc (patch) | |
tree | 9ea58f649569f2435a6f34a4a433b0661d55853d | |
parent | afb7b3b1deb471698f54e04a1815bc803ec9a161 (diff) |
drm/etnaviv: fix up model and revision for GC2000+
GC2000+ on the i.MX6QP is just a re-branded GC3000, lets call it by
its real name to avoid confusion in other parts of the driver.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
-rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 39b5be3916d5..40ceb22d0442 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c | |||
@@ -327,6 +327,18 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) | |||
327 | gpu->identity.revision = 0x1051; | 327 | gpu->identity.revision = 0x1051; |
328 | } | 328 | } |
329 | } | 329 | } |
330 | |||
331 | /* | ||
332 | * NXP likes to call the GPU on the i.MX6QP GC2000+, but in | ||
333 | * reality it's just a re-branded GC3000. We can identify this | ||
334 | * core by the upper half of the revision register being all 1. | ||
335 | * Fix model/rev here, so all other places can refer to this | ||
336 | * core by its real identity. | ||
337 | */ | ||
338 | if (etnaviv_is_model_rev(gpu, GC2000, 0xffff5450)) { | ||
339 | gpu->identity.model = chipModel_GC3000; | ||
340 | gpu->identity.revision &= 0xffff; | ||
341 | } | ||
330 | } | 342 | } |
331 | 343 | ||
332 | dev_info(gpu->dev, "model: GC%x, revision: %x\n", | 344 | dev_info(gpu->dev, "model: GC%x, revision: %x\n", |