From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3CD4C43461 for ; Fri, 2 Apr 2021 14:50:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C92A61103 for ; Fri, 2 Apr 2021 14:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234818AbhDBOuI (ORCPT ); Fri, 2 Apr 2021 10:50:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231160AbhDBOuF (ORCPT ); Fri, 2 Apr 2021 10:50:05 -0400 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2650C061788 for ; Fri, 2 Apr 2021 07:50:04 -0700 (PDT) Received: by mail-io1-xd29.google.com with SMTP id k25so5581978iob.6 for ; Fri, 02 Apr 2021 07:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cosmicpenguin-net.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=l0HqcwAEcAzaa2RK+pZE6jtYY7XOgt5sS3E2spUn1Rk=; b=Kmgr8cnyHkBCjw6d098vCcVagqVkv5JmDU91epU9ZWO7suSGeKnYW7wRpQBgsU6Kbs bnC+FC9X9QMvN9rLnz4RSFfLGWy5STRsjKuf79o0DSdeBWwe22pySANiq314cu5fHMsT LwlwRpJetf/3zwEbAAVcYSDBorIDUqEzt963OIKC9cjeW1e5f/iuxmTORJJiwtFhByU/ qDsDk4atEjJxiQaMqqmKjyBomzu8Vp1NXy0A/9nlO7/WGT9hnhIjfe1whBYjBBd6rWwk /m8hrKnQDZT8IrRWrCv5bP7k0gu0lNtpu2yRbt9WN2SqVKz1J5cqLkBPhE+aqq2HAojn OFRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=l0HqcwAEcAzaa2RK+pZE6jtYY7XOgt5sS3E2spUn1Rk=; b=nxICTbqO5QefGOPhA+LDBxVFt4Yz5tmj4OEpoG5SLCyWgPLu6lleI+ZfNBx2DsCSFT sQ/GLfjKhJn+pew3bJpkRpDkWI3JidUG5T4wE785arVdHYM5Un0Z9utLZOqbjjIY9ui0 Bd7SoUUFeany5LdrbHEZrRYGqsXBSmGxWEv0F/Y+i7isxG4niKKzeBe831v/M01JQnHY ZFYD7vNEoyE+VsyjF5ca6W2VBeFFdV8heOErJ4F5OyA70RO84zL36CDJGJxMV2KM81Qs Wwipuwdk5qJSCupHTZsAURzoJ+1stn5s8lIIM1N4zfESr6edh4Y+afYW4dchIxN8hO7H rh5g== X-Gm-Message-State: AOAM530XZe/yuB0KktCP4pXV9LC3IGvSsJrkf3b/TfjN2+qRAplDjpTy Acnp43nuD4gTBRA/RPS0jGgDdQ== X-Google-Smtp-Source: ABdhPJyuvuBtNPl+yzzZ5Hm9a08vW6pett3RP0OPcCwvzWTKuV1JGe7ZTwSlG04ahbRO6oSo90Wecw== X-Received: by 2002:a6b:e20a:: with SMTP id z10mr10979620ioc.99.1617375004119; Fri, 02 Apr 2021 07:50:04 -0700 (PDT) Received: from cosmicpenguin.net (c-71-237-100-236.hsd1.co.comcast.net. [71.237.100.236]) by smtp.gmail.com with ESMTPSA id y15sm3987161ilv.70.2021.04.02.07.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 07:50:03 -0700 (PDT) Date: Fri, 2 Apr 2021 08:50:01 -0600 From: Jordan Crouse To: Rob Clark Cc: dri-devel@lists.freedesktop.org, Rob Clark , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Sai Prakash Ranjan , "Gustavo A. R. Silva" , Jonathan Marek , David Airlie , Sam Ravnborg , Sharat Masetty , Jordan Crouse , Bjorn Andersson , Eric Anholt , "Kristian H. Kristensen" , Daniel Vetter , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Marijn Suijten , Sean Paul , open list , Emil Velikov Subject: Re: [Freedreno] [PATCH 1/2] drm/msm: Fix a5xx/a6xx timestamps Message-ID: <20210402145001.n7upxwvyub2tyavz@cosmicpenguin.net> Mail-Followup-To: Rob Clark , dri-devel@lists.freedesktop.org, Rob Clark , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Sai Prakash Ranjan , "Gustavo A. R. Silva" , Jonathan Marek , David Airlie , Sam Ravnborg , Sharat Masetty , Jordan Crouse , Bjorn Andersson , Eric Anholt , "Kristian H. Kristensen" , Daniel Vetter , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Marijn Suijten , Sean Paul , open list , Emil Velikov References: <20210325012358.1759770-1-robdclark@gmail.com> <20210325012358.1759770-2-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210325012358.1759770-2-robdclark@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 24, 2021 at 06:23:52PM -0700, Rob Clark wrote: > From: Rob Clark > > They were reading a counter that was configured to ALWAYS_COUNT (ie. > cycles that the GPU is doing something) rather than ALWAYS_ON. This > isn't the thing that userspace is looking for. Acked-by: Jordan Crouse > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 ++-- > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > index a5af223eaf50..bb82fcd9df81 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > @@ -1241,8 +1241,8 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu) > > static int a5xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) > { > - *value = gpu_read64(gpu, REG_A5XX_RBBM_PERFCTR_CP_0_LO, > - REG_A5XX_RBBM_PERFCTR_CP_0_HI); > + *value = gpu_read64(gpu, REG_A5XX_RBBM_ALWAYSON_COUNTER_LO, > + REG_A5XX_RBBM_ALWAYSON_COUNTER_HI); > > return 0; > } > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > index 130661898546..59718c304488 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > @@ -1173,8 +1173,8 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) > /* Force the GPU power on so we can read this register */ > a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET); > > - *value = gpu_read64(gpu, REG_A6XX_RBBM_PERFCTR_CP_0_LO, > - REG_A6XX_RBBM_PERFCTR_CP_0_HI); > + *value = gpu_read64(gpu, REG_A6XX_CP_ALWAYS_ON_COUNTER_LO, > + REG_A6XX_CP_ALWAYS_ON_COUNTER_HI); > > a6xx_gmu_clear_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET); > return 0; > -- > 2.29.2 > > _______________________________________________ > Freedreno mailing list > Freedreno@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/freedreno