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>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
index eb0f3eb..cf3bb26 100644 (file)
--- 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;