Re: [PATCH v2] drm/etnaviv: rework perfmon query infrastructure

2020-04-16 Thread Naresh Kamboju 
On Tue, 3 Mar 2020 at 17:19, Lucas Stach  wrote:
>
> On Fr, 2020-02-28 at 11:37 +0100, Christian Gmeiner wrote:
> > Report the correct perfmon domains and signals depending
> > on the supported feature flags.
> >
> > Reported-by: Dan Carpenter 
> > Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf 
> > counter")
> > Cc: sta...@vger.kernel.org
> > Signed-off-by: Christian Gmeiner 
>
> Thanks, applied to etnaviv/next.
>
> Regards,
> Lucas
>
> >
> > ---
> > Changes V1 -> V2:
> >   - Handle domain == NULL case better to get rid of BUG_ON(..) usage.
> > ---
> >  drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 59 ---
> >  1 file changed, 52 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c 
> > b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> > index 8adbf2861bff..e6795bafcbb9 100644
> > --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> > +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> > @@ -32,6 +32,7 @@ struct etnaviv_pm_domain {
> >  };
> >
> >  struct etnaviv_pm_domain_meta {
> > + unsigned int feature;
> >   const struct etnaviv_pm_domain *domains;
> >   u32 nr_domains;
> >  };
> > @@ -410,36 +411,78 @@ static const struct etnaviv_pm_domain doms_vg[] = {
> >
> >  static const struct etnaviv_pm_domain_meta doms_meta[] = {
> >   {
> > + .feature = chipFeatures_PIPE_3D,

make modules failed for arm architecture on stable rc 4.19 branch.

drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:392:14: error:
'chipFeatures_PIPE_3D' undeclared here (not in a function)
   .feature = chipFeatures_PIPE_3D,
  ^~~~
drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:397:14: error:
'chipFeatures_PIPE_2D' undeclared here (not in a function); did you
mean 'chipFeatures_PIPE_3D'?
   .feature = chipFeatures_PIPE_2D,
  ^~~~
  chipFeatures_PIPE_3D
drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:402:14: error:
'chipFeatures_PIPE_VG' undeclared here (not in a function); did you
mean 'chipFeatures_PIPE_2D'?
   .feature = chipFeatures_PIPE_VG,
  ^~~~
  chipFeatures_PIPE_2D


ref:
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.19/DISTRO=lkft,MACHINE=am57xx-evm,label=docker-lkft/511/consoleText
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2] drm/etnaviv: rework perfmon query infrastructure

2020-04-15 Thread Greg Kroah-Hartman 
On Wed, Apr 15, 2020 at 11:08:13PM +0530, Naresh Kamboju wrote:
> On Tue, 3 Mar 2020 at 17:19, Lucas Stach  wrote:
> >
> > On Fr, 2020-02-28 at 11:37 +0100, Christian Gmeiner wrote:
> > > Report the correct perfmon domains and signals depending
> > > on the supported feature flags.
> > >
> > > Reported-by: Dan Carpenter 
> > > Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf 
> > > counter")
> > > Cc: sta...@vger.kernel.org
> > > Signed-off-by: Christian Gmeiner 
> >
> > Thanks, applied to etnaviv/next.
> >
> > Regards,
> > Lucas
> >
> > >
> > > ---
> > > Changes V1 -> V2:
> > >   - Handle domain == NULL case better to get rid of BUG_ON(..) usage.
> > > ---
> > >  drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 59 ---
> > >  1 file changed, 52 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c 
> > > b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> > > index 8adbf2861bff..e6795bafcbb9 100644
> > > --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> > > +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> > > @@ -32,6 +32,7 @@ struct etnaviv_pm_domain {
> > >  };
> > >
> > >  struct etnaviv_pm_domain_meta {
> > > + unsigned int feature;
> > >   const struct etnaviv_pm_domain *domains;
> > >   u32 nr_domains;
> > >  };
> > > @@ -410,36 +411,78 @@ static const struct etnaviv_pm_domain doms_vg[] = {
> > >
> > >  static const struct etnaviv_pm_domain_meta doms_meta[] = {
> > >   {
> > > + .feature = chipFeatures_PIPE_3D,
> 
> make modules failed for arm architecture on stable rc 4.19 branch.
> 
> drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:392:14: error:
> 'chipFeatures_PIPE_3D' undeclared here (not in a function)
>.feature = chipFeatures_PIPE_3D,
>   ^~~~
> drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:397:14: error:
> 'chipFeatures_PIPE_2D' undeclared here (not in a function); did you
> mean 'chipFeatures_PIPE_3D'?
>.feature = chipFeatures_PIPE_2D,
>   ^~~~
>   chipFeatures_PIPE_3D
> drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:402:14: error:
> 'chipFeatures_PIPE_VG' undeclared here (not in a function); did you
> mean 'chipFeatures_PIPE_2D'?
>.feature = chipFeatures_PIPE_VG,
>   ^~~~
>   chipFeatures_PIPE_2D

Looks like I need to include a .h file for this backport, I'll go do
that now, thanks.

greg k-h
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2] drm/etnaviv: rework perfmon query infrastructure

2020-03-03 Thread Lucas Stach 
On Fr, 2020-02-28 at 11:37 +0100, Christian Gmeiner wrote:
> Report the correct perfmon domains and signals depending
> on the supported feature flags.
> 
> Reported-by: Dan Carpenter 
> Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf counter")
> Cc: sta...@vger.kernel.org
> Signed-off-by: Christian Gmeiner 

Thanks, applied to etnaviv/next.

Regards,
Lucas

> 
> ---
> Changes V1 -> V2:
>   - Handle domain == NULL case better to get rid of BUG_ON(..) usage.
> ---
>  drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 59 ---
>  1 file changed, 52 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c 
> b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> index 8adbf2861bff..e6795bafcbb9 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
> @@ -32,6 +32,7 @@ struct etnaviv_pm_domain {
>  };
>  
>  struct etnaviv_pm_domain_meta {
> + unsigned int feature;
>   const struct etnaviv_pm_domain *domains;
>   u32 nr_domains;
>  };
> @@ -410,36 +411,78 @@ static const struct etnaviv_pm_domain doms_vg[] = {
>  
>  static const struct etnaviv_pm_domain_meta doms_meta[] = {
>   {
> + .feature = chipFeatures_PIPE_3D,
>   .nr_domains = ARRAY_SIZE(doms_3d),
>   .domains = _3d[0]
>   },
>   {
> + .feature = chipFeatures_PIPE_2D,
>   .nr_domains = ARRAY_SIZE(doms_2d),
>   .domains = _2d[0]
>   },
>   {
> + .feature = chipFeatures_PIPE_VG,
>   .nr_domains = ARRAY_SIZE(doms_vg),
>   .domains = _vg[0]
>   }
>  };
>  
> +static unsigned int num_pm_domains(const struct etnaviv_gpu *gpu)
> +{
> + unsigned int num = 0, i;
> +
> + for (i = 0; i < ARRAY_SIZE(doms_meta); i++) {
> + const struct etnaviv_pm_domain_meta *meta = _meta[i];
> +
> + if (gpu->identity.features & meta->feature)
> + num += meta->nr_domains;
> + }
> +
> + return num;
> +}
> +
> +static const struct etnaviv_pm_domain *pm_domain(const struct etnaviv_gpu 
> *gpu,
> + unsigned int index)
> +{
> + const struct etnaviv_pm_domain *domain = NULL;
> + unsigned int offset = 0, i;
> +
> + for (i = 0; i < ARRAY_SIZE(doms_meta); i++) {
> + const struct etnaviv_pm_domain_meta *meta = _meta[i];
> +
> + if (!(gpu->identity.features & meta->feature))
> + continue;
> +
> + if (meta->nr_domains < (index - offset)) {
> + offset += meta->nr_domains;
> + continue;
> + }
> +
> + domain = meta->domains + (index - offset);
> + }
> +
> + return domain;
> +}
> +
>  int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu,
>   struct drm_etnaviv_pm_domain *domain)
>  {
> - const struct etnaviv_pm_domain_meta *meta = _meta[domain->pipe];
> + const unsigned int nr_domains = num_pm_domains(gpu);
>   const struct etnaviv_pm_domain *dom;
>  
> - if (domain->iter >= meta->nr_domains)
> + if (domain->iter >= nr_domains)
>   return -EINVAL;
>  
> - dom = meta->domains + domain->iter;
> + dom = pm_domain(gpu, domain->iter);
> + if (!dom)
> + return -EINVAL;
>  
>   domain->id = domain->iter;
>   domain->nr_signals = dom->nr_signals;
>   strncpy(domain->name, dom->name, sizeof(domain->name));
>  
>   domain->iter++;
> - if (domain->iter == meta->nr_domains)
> + if (domain->iter == nr_domains)
>   domain->iter = 0xff;
>  
>   return 0;
> @@ -448,14 +491,16 @@ int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu,
>  int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu,
>   struct drm_etnaviv_pm_signal *signal)
>  {
> - const struct etnaviv_pm_domain_meta *meta = _meta[signal->pipe];
> + const unsigned int nr_domains = num_pm_domains(gpu);
>   const struct etnaviv_pm_domain *dom;
>   const struct etnaviv_pm_signal *sig;
>  
> - if (signal->domain >= meta->nr_domains)
> + if (signal->domain >= nr_domains)
>   return -EINVAL;
>  
> - dom = meta->domains + signal->domain;
> + dom = pm_domain(gpu, signal->domain);
> + if (!dom)
> + return -EINVAL;
>  
>   if (signal->iter >= dom->nr_signals)
>   return -EINVAL;

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2] drm/etnaviv: rework perfmon query infrastructure

2020-02-28 Thread Christian Gmeiner 
Report the correct perfmon domains and signals depending
on the supported feature flags.

Reported-by: Dan Carpenter 
Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf counter")
Cc: sta...@vger.kernel.org
Signed-off-by: Christian Gmeiner 

---
Changes V1 -> V2:
  - Handle domain == NULL case better to get rid of BUG_ON(..) usage.
---
 drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 59 ---
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c 
b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
index 8adbf2861bff..e6795bafcbb9 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
@@ -32,6 +32,7 @@ struct etnaviv_pm_domain {
 };
 
 struct etnaviv_pm_domain_meta {
+   unsigned int feature;
const struct etnaviv_pm_domain *domains;
u32 nr_domains;
 };
@@ -410,36 +411,78 @@ static const struct etnaviv_pm_domain doms_vg[] = {
 
 static const struct etnaviv_pm_domain_meta doms_meta[] = {
{
+   .feature = chipFeatures_PIPE_3D,
.nr_domains = ARRAY_SIZE(doms_3d),
.domains = _3d[0]
},
{
+   .feature = chipFeatures_PIPE_2D,
.nr_domains = ARRAY_SIZE(doms_2d),
.domains = _2d[0]
},
{
+   .feature = chipFeatures_PIPE_VG,
.nr_domains = ARRAY_SIZE(doms_vg),
.domains = _vg[0]
}
 };
 
+static unsigned int num_pm_domains(const struct etnaviv_gpu *gpu)
+{
+   unsigned int num = 0, i;
+
+   for (i = 0; i < ARRAY_SIZE(doms_meta); i++) {
+   const struct etnaviv_pm_domain_meta *meta = _meta[i];
+
+   if (gpu->identity.features & meta->feature)
+   num += meta->nr_domains;
+   }
+
+   return num;
+}
+
+static const struct etnaviv_pm_domain *pm_domain(const struct etnaviv_gpu *gpu,
+   unsigned int index)
+{
+   const struct etnaviv_pm_domain *domain = NULL;
+   unsigned int offset = 0, i;
+
+   for (i = 0; i < ARRAY_SIZE(doms_meta); i++) {
+   const struct etnaviv_pm_domain_meta *meta = _meta[i];
+
+   if (!(gpu->identity.features & meta->feature))
+   continue;
+
+   if (meta->nr_domains < (index - offset)) {
+   offset += meta->nr_domains;
+   continue;
+   }
+
+   domain = meta->domains + (index - offset);
+   }
+
+   return domain;
+}
+
 int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu,
struct drm_etnaviv_pm_domain *domain)
 {
-   const struct etnaviv_pm_domain_meta *meta = _meta[domain->pipe];
+   const unsigned int nr_domains = num_pm_domains(gpu);
const struct etnaviv_pm_domain *dom;
 
-   if (domain->iter >= meta->nr_domains)
+   if (domain->iter >= nr_domains)
return -EINVAL;
 
-   dom = meta->domains + domain->iter;
+   dom = pm_domain(gpu, domain->iter);
+   if (!dom)
+   return -EINVAL;
 
domain->id = domain->iter;
domain->nr_signals = dom->nr_signals;
strncpy(domain->name, dom->name, sizeof(domain->name));
 
domain->iter++;
-   if (domain->iter == meta->nr_domains)
+   if (domain->iter == nr_domains)
domain->iter = 0xff;
 
return 0;
@@ -448,14 +491,16 @@ int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu,
 int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu,
struct drm_etnaviv_pm_signal *signal)
 {
-   const struct etnaviv_pm_domain_meta *meta = _meta[signal->pipe];
+   const unsigned int nr_domains = num_pm_domains(gpu);
const struct etnaviv_pm_domain *dom;
const struct etnaviv_pm_signal *sig;
 
-   if (signal->domain >= meta->nr_domains)
+   if (signal->domain >= nr_domains)
return -EINVAL;
 
-   dom = meta->domains + signal->domain;
+   dom = pm_domain(gpu, signal->domain);
+   if (!dom)
+   return -EINVAL;
 
if (signal->iter >= dom->nr_signals)
return -EINVAL;
-- 
2.24.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel