On Tue, 3 Mar 2020 at 17:19, Lucas Stach <l.stach@xxxxxxxxxxxxxx> 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 <dan.carpenter@xxxxxxxxxx> > > Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf counter") > > Cc: stable@xxxxxxxxxxxxxxx > > Signed-off-by: Christian Gmeiner <christian.gmeiner@xxxxxxxxx> > > 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel