Skip to content

Commit 40b697e

Browse files
austriancoderlynxeye-dev
authored andcommitted
drm/etnaviv: fix perfmon domain interation
The GC860 has one GPU device which has a 2d and 3d core. In this case we want to expose perfmon information for both cores. The driver has one array which contains all possible perfmon domains with some meta data - doms_meta. Here we can see that for the GC860 two elements of that array are relevant: doms_3d: is at index 0 in the doms_meta array with 8 perfmon domains doms_2d: is at index 1 in the doms_meta array with 1 perfmon domain The userspace driver wants to get a list of all perfmon domains and their perfmon signals. This is done by iterating over all domains and their signals. If the userspace driver wants to access the domain with id 8 the kernel driver fails and returns invalid data from doms_3d with and invalid offset. This results in: Unable to handle kernel paging request at virtual address 00000000 On such a device it is not possible to use the userspace driver at all. The fix for this off-by-one error is quite simple. Reported-by: Paul Cercueil <[email protected]> Tested-by: Paul Cercueil <[email protected]> Fixes: ed1dd89 ("drm/etnaviv: rework perfmon query infrastructure") Cc: [email protected] Signed-off-by: Christian Gmeiner <[email protected]> Signed-off-by: Lucas Stach <[email protected]>
1 parent 8f3d9f3 commit 40b697e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/etnaviv/etnaviv_perfmon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ static const struct etnaviv_pm_domain *pm_domain(const struct etnaviv_gpu *gpu,
453453
if (!(gpu->identity.features & meta->feature))
454454
continue;
455455

456-
if (meta->nr_domains < (index - offset)) {
456+
if (index - offset >= meta->nr_domains) {
457457
offset += meta->nr_domains;
458458
continue;
459459
}

0 commit comments

Comments
 (0)