diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2020-01-06 16:16:50 +0100 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2020-02-26 16:20:04 +0100 |
| commit | 4078a1186dd35e0e5732450beeadc7175ddbb302 (patch) | |
| tree | 018ffd731ccf76c860f18f5f8e74dbc9cc7576eb | |
| parent | a51d1f37dfca484833a8e88f3302104b458a007b (diff) | |
| download | linux-4078a1186dd35e0e5732450beeadc7175ddbb302.tar.gz linux-4078a1186dd35e0e5732450beeadc7175ddbb302.tar.xz | |
drm/etnaviv: update hwdb selection logic
Take product id, customer id and eco id into account. If that
delivers no match try a search for model and revision.
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c index eb0f3eb87ced..cf3bb26e2e43 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c @@ -46,7 +46,13 @@ bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu) for (i = 0; i < ARRAY_SIZE(etnaviv_chip_identities); i++) { if (etnaviv_chip_identities[i].model == ident->model && - etnaviv_chip_identities[i].revision == ident->revision) { + etnaviv_chip_identities[i].revision == ident->revision && + (etnaviv_chip_identities[i].product_id == ident->product_id || + etnaviv_chip_identities[i].product_id == ~0U) && + (etnaviv_chip_identities[i].customer_id == ident->customer_id || + etnaviv_chip_identities[i].customer_id == ~0U) && + (etnaviv_chip_identities[i].eco_id == ident->eco_id || + etnaviv_chip_identities[i].eco_id == ~0U)) { memcpy(ident, &etnaviv_chip_identities[i], sizeof(*ident)); return true; |