Commit 2b76f5be authored by Lucas Stach's avatar Lucas Stach
Browse files

drm/etnaviv: initialize idle mask before querying the HW db 



If there is a match in the HW DB, the function is left early, before
inititalizing the idle mask. Fix this by doing the init earlier, as
only old GPUs, not present in the HW DB need a different idle mask.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent fd2450a7

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+2 −4
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) 
	dev_info(gpu->dev, "model: GC%x, revision: %x\n",

		 gpu->identity.model, gpu->identity.revision);



	gpu->idle_mask = ~VIVS_HI_IDLE_STATE_AXI_LP;

	/*

	 * If there is a match in the HWDB, we aren't interested in the

	 * remaining register values, as they might be wrong.
@@ -412,7 +413,7 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) 
	}



	/* GC600 idle register reports zero bits where modules aren't present */

	if (gpu->identity.model == chipModel_GC600) {

	if (gpu->identity.model == chipModel_GC600)

		gpu->idle_mask = VIVS_HI_IDLE_STATE_TX |

				 VIVS_HI_IDLE_STATE_RA |

				 VIVS_HI_IDLE_STATE_SE |
@@ -421,9 +422,6 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) 
				 VIVS_HI_IDLE_STATE_PE |

				 VIVS_HI_IDLE_STATE_DE |

				 VIVS_HI_IDLE_STATE_FE;

	} else {

		gpu->idle_mask = ~VIVS_HI_IDLE_STATE_AXI_LP;

	}



	etnaviv_hw_specs(gpu);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE