diff options
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 6904535475de..72d01e873160 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c | |||
| @@ -365,6 +365,7 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) | |||
| 365 | dev_info(gpu->dev, "model: GC%x, revision: %x\n", | 365 | dev_info(gpu->dev, "model: GC%x, revision: %x\n", |
| 366 | gpu->identity.model, gpu->identity.revision); | 366 | gpu->identity.model, gpu->identity.revision); |
| 367 | 367 | ||
| 368 | gpu->idle_mask = ~VIVS_HI_IDLE_STATE_AXI_LP; | ||
| 368 | /* | 369 | /* |
| 369 | * If there is a match in the HWDB, we aren't interested in the | 370 | * If there is a match in the HWDB, we aren't interested in the |
| 370 | * remaining register values, as they might be wrong. | 371 | * remaining register values, as they might be wrong. |
| @@ -412,7 +413,7 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) | |||
| 412 | } | 413 | } |
| 413 | 414 | ||
| 414 | /* GC600 idle register reports zero bits where modules aren't present */ | 415 | /* GC600 idle register reports zero bits where modules aren't present */ |
| 415 | if (gpu->identity.model == chipModel_GC600) { | 416 | if (gpu->identity.model == chipModel_GC600) |
| 416 | gpu->idle_mask = VIVS_HI_IDLE_STATE_TX | | 417 | gpu->idle_mask = VIVS_HI_IDLE_STATE_TX | |
| 417 | VIVS_HI_IDLE_STATE_RA | | 418 | VIVS_HI_IDLE_STATE_RA | |
| 418 | VIVS_HI_IDLE_STATE_SE | | 419 | VIVS_HI_IDLE_STATE_SE | |
| @@ -421,9 +422,6 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) | |||
| 421 | VIVS_HI_IDLE_STATE_PE | | 422 | VIVS_HI_IDLE_STATE_PE | |
| 422 | VIVS_HI_IDLE_STATE_DE | | 423 | VIVS_HI_IDLE_STATE_DE | |
| 423 | VIVS_HI_IDLE_STATE_FE; | 424 | VIVS_HI_IDLE_STATE_FE; |
| 424 | } else { | ||
| 425 | gpu->idle_mask = ~VIVS_HI_IDLE_STATE_AXI_LP; | ||
| 426 | } | ||
| 427 | 425 | ||
| 428 | etnaviv_hw_specs(gpu); | 426 | etnaviv_hw_specs(gpu); |
| 429 | } | 427 | } |
