Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp725119ybz; Wed, 15 Apr 2020 17:34:37 -0700 (PDT) X-Google-Smtp-Source: APiQypKuiQSzmYeybIBOBltW+kAYPsX46R4SMBG6R8g4A3lUqmItQ+46NiK+ZVv5qGs/YBqKACj4 X-Received: by 2002:a17:906:66c1:: with SMTP id k1mr7620308ejp.208.1586997276919; Wed, 15 Apr 2020 17:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586997276; cv=none; d=google.com; s=arc-20160816; b=LNdb2M/obmXoSCTYOcf+dVS/Z3Cwrh3W3uAxmnCzzTH3gpUciyUgOwtHVuLZkc/4HX wD2NCkZ431y0PkVcoWY86lYXIlmmg29T82a00brN384v+gLuWc51TLTXG7jbWAkjiF7A lTiib/83bFdahJevTlRxDMvVlawMP9lh3M0/gu8eLvIiQGrsCgjK2ynEh18e7D8MWekr b6p70X27PDIafm5NXzqITWgA3bQpOtMMO8UPAC2958fgoO23OjMpV97ujMqYVLJO1DIq 5BH7CO5Ne7msWu4Nxc7XWTXURy+UDfnWSZwY7O8qhM3HkBkcu5V5mkXwYG+2H7Gr+W4s +ZLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=GDsc20CA3+prGxPwUyW33TG5C8RVdXRTHSWKVides+0=; b=lIYiMKBmhh6svcalXKTxlwkVQkOy/MWkRStt+8YVG5rWXBUM1oVb9SC1DdoLPI50tc g35sNH4yBf+93YfI7jkeSUbAo1iYAH9qvdVHbyAqfv4JgdLJ5MB1U224yLOwSJQ11DL1 2kSQi0LPbaJjAC7wc/LYNxl9czOZFPSSfnUqv5TNfO7ft+YQgORtrl8/67/2CYnisugy n1FZvwdkMpuyGZkMldSyLBW0XdD6RL/e7tD6Dpev8qkU0sqsc7tm09qKaEayQttR7/De BFWP+XN/V1q3i48I2ZpMSTSPAP4F3cfoD/+ym7DU1xzQDSfxMUtlCqWhkFLdpKac70UG kRog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WuP7E8ug; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e13si4069127ejx.393.2020.04.15.17.34.13; Wed, 15 Apr 2020 17:34:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WuP7E8ug; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2411459AbgDORoh (ORCPT + 99 others); Wed, 15 Apr 2020 13:44:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:60716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2411453AbgDORod (ORCPT ); Wed, 15 Apr 2020 13:44:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B8A472051A; Wed, 15 Apr 2020 17:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586972672; bh=ar+BseC/NUaksDxsNT8Js037zkG7MGCUU7MyLp15PF0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WuP7E8ug4V4q3A4Wg8x0XzHqcW34rw7cTsV2U3f59ayerrH6TXzUJ2k62aOz9KZDF ctWUPcHDLB8wmwcuVOAVqcB6D4brPBrycDzLN7nhJcsyGmcXp6ZxcPFPK6daEnd/XO m0fzm/ee2QVsCtBGOWQCKXkOz6Yp6rHWjvQIjhfQ= Date: Wed, 15 Apr 2020 19:44:30 +0200 From: Greg Kroah-Hartman To: Naresh Kamboju Cc: Lucas Stach , Christian Gmeiner , Sasha Levin , open list , Dan Carpenter , linux- stable , Russell King , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, lkft-triage@lists.linaro.org Subject: Re: [PATCH v2] drm/etnaviv: rework perfmon query infrastructure Message-ID: <20200415174430.GA3665836@kroah.com> References: <20200228103752.1944629-1-christian.gmeiner@gmail.com> <4a5436201ff4345194f64aac1553f9656887203a.camel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: stable@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