drm/etnaviv: fix some off by one bugs

BugLink: https://bugs.launchpad.net/bugs/1863019
[ Upstream commit f5fd9fd4000984f19db689282054953981a50534 ]

The ->nr_signal is the supposed to be the number of elements in the
->signal array.  There was one place where it was 5 but it was supposed
to be 4.  That looks like a copy and paste bug.  There were also two
checks that were off by one.

Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf counter")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Tested-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
index 768f5aafdd186f8fb97b5b0d1f957128f98e8e36..3c4e13299011f0d880f3898480ad3c0d28f39057 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
@@ -124,7 +124,7 @@ static const struct etnaviv_pm_domain doms_3d[] = {
                .name = "PE",
                .profile_read = VIVS_MC_PROFILE_PE_READ,
                .profile_config = VIVS_MC_PROFILE_CONFIG0,
-               .nr_signals = 5,
+               .nr_signals = 4,
                .signal = (const struct etnaviv_pm_signal[]) {
                        {
                                "PIXEL_COUNT_KILLED_BY_COLOR_PIPE",
@@ -446,7 +446,7 @@ int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu,
 
        dom = meta->domains + signal->domain;
 
-       if (signal->iter > dom->nr_signals)
+       if (signal->iter >= dom->nr_signals)
                return -EINVAL;
 
        sig = &dom->signal[signal->iter];
@@ -472,7 +472,7 @@ int etnaviv_pm_req_validate(const struct drm_etnaviv_gem_submit_pmr *r,
 
        dom = meta->domains + r->domain;
 
-       if (r->signal > dom->nr_signals)
+       if (r->signal >= dom->nr_signals)
                return -EINVAL;
 
        return 0;