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=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 4D2EFC47082 for ; Tue, 8 Jun 2021 18:06:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 326B261377 for ; Tue, 8 Jun 2021 18:06:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233254AbhFHSH4 (ORCPT ); Tue, 8 Jun 2021 14:07:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234150AbhFHSHq (ORCPT ); Tue, 8 Jun 2021 14:07:46 -0400 Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C25BFC0613A4 for ; Tue, 8 Jun 2021 11:05:25 -0700 (PDT) Received: by mail-qt1-x829.google.com with SMTP id g12so3626430qtb.2 for ; Tue, 08 Jun 2021 11:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=WOlapbro2aVNPxibq8j3aKmRfZb+mvnEkxvW8XPtMuU=; b=u5xkaH+UZcFHSC4oAOTteBw3RDdVrJdHBHpxD0nJQ+qGNakS9xZadU94PfKBHg4bPM g3vn3OBBvVdO2NzCsdjQr1D+ZOjpaw4w9UKZXYfRU7Xbpy/G89rxAZR1RzLdDij2yT75 XBwspKktwnnUGufnEc5Nx9rv+UpTYOqY8KTfjWhoRs0VCWoLbHRWlretslU1mNMAKS2n BlmLyqF2fjC80y2Wl21tJjT2CFRnnZZZsMRXFEF4je/StC151EirqknEtFz9ZYyTU44g eUguAQXU8JPYagOfxx/aRbWKtXGCSr3xz9/rWR+dK7Dp5xJs+ec55rwD6C0aoxl4Y68q iXeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=WOlapbro2aVNPxibq8j3aKmRfZb+mvnEkxvW8XPtMuU=; b=pvhfl/416z6f1dDx/Ihp1pV4BybvAkJeawJ6t1JIDehFnBqgs6goUgJjy/wlbNt1vh paXVEMJi1RTbjNiQDAnRb0wToOOPV4C1wG6QUuPrkGrFNQssw9tUU0WIh/AC0fbx/znS sogCPoBFeF0N9ovLm0Q1JVerD8KohWYc+fn9Orbmt/D18r4ofFkCMaOJwnJYuSumkulU fAEJYLLldxfLhep0imxTcjfp2olrmmFY3qA+DAs/rr4bfCA4NUwUuzTw2aCSeFXZQVl4 7znyc+SnTGwzCf6yOG8EvnrsgQfmSvgoybYwqdCOkugWH4kH9HNN5PvOlrqovG0xVaMe wQWA== X-Gm-Message-State: AOAM533bxP7T14aHsq7fvaEth9/klwHYvgaqr65IoWyicROQ2AprYfBG G3EvEcGIzxFmt1KSFWSQsAGArA== X-Google-Smtp-Source: ABdhPJyhZOqlnVcAHTSXDc04MENqTodbdNP6uY3poRtjnX1YpaTedbGhu6Osr4KNS075sOxw/pGmfg== X-Received: by 2002:ac8:4e2e:: with SMTP id d14mr19798627qtw.205.1623175524925; Tue, 08 Jun 2021 11:05:24 -0700 (PDT) Received: from [192.168.0.189] (modemcable068.184-131-66.mc.videotron.ca. [66.131.184.68]) by smtp.gmail.com with ESMTPSA id v5sm12320418qkh.39.2021.06.08.11.05.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Jun 2021 11:05:24 -0700 (PDT) Subject: Re: [PATCH v3 3/5] drm/msm/a6xx: add GMU_CX_GMU_CX_FALNEXT_INTF write for a650 From: Jonathan Marek To: freedreno@lists.freedesktop.org Cc: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Akhil P Oommen , Eric Anholt , Sharat Masetty , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list References: <20210608172808.11803-1-jonathan@marek.ca> <20210608172808.11803-4-jonathan@marek.ca> Message-ID: <4c6ae8ab-05e2-5974-4f8d-48e2a31504b0@marek.ca> Date: Tue, 8 Jun 2021 14:03:41 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20210608172808.11803-4-jonathan@marek.ca> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 6/8/21 1:27 PM, Jonathan Marek wrote: > downstream msm-5.14 kernel added a write to this register, so match that. > Note: this should say msm-5.4 (msm-5.14 is not a thing) > Signed-off-by: Jonathan Marek > --- > drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 4 +++- > drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 2 ++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > index c1ee02d6371d..0f3390eab55e 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > @@ -751,8 +751,10 @@ static int a6xx_gmu_fw_start(struct a6xx_gmu *gmu, unsigned int state) > int ret; > u32 chipid; > > - if (adreno_is_a650(adreno_gpu)) > + if (adreno_is_a650(adreno_gpu)) { > + gmu_write(gmu, REG_A6XX_GPU_GMU_CX_GMU_CX_FALNEXT_INTF, 1); > gmu_write(gmu, REG_A6XX_GPU_GMU_CX_GMU_CX_FAL_INTF, 1); > + } > > if (state == GMU_WARM_BOOT) { > ret = a6xx_rpmh_start(gmu); > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h b/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h > index 5a43d3090b0c..eeef3d6d89b8 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h > @@ -292,6 +292,8 @@ static inline uint32_t A6XX_GMU_GPU_NAP_CTRL_SID(uint32_t val) > > #define REG_A6XX_GPU_GMU_CX_GMU_CX_FAL_INTF 0x000050f0 > > +#define REF_A6XX_GPU_GMU_CX_GMU_CX_FALNEXT_INTF 0x000050f1 > + > #define REG_A6XX_GPU_GMU_CX_GMU_PWR_COL_CP_MSG 0x00005100 > > #define REG_A6XX_GPU_GMU_CX_GMU_PWR_COL_CP_RESP 0x00005101 >