Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp761206pxj; Wed, 2 Jun 2021 10:42:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCd9zmmmc8FYo56XlT8h3EFqgI1Hh3u/aRFMoM80/U6cE1fxNmGvpTl9NEdCQHN9BkTK98 X-Received: by 2002:a05:6402:2706:: with SMTP id y6mr40597364edd.355.1622655736091; Wed, 02 Jun 2021 10:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622655736; cv=none; d=google.com; s=arc-20160816; b=sCgpdXNDZSqnL9c8rYvj7ThIrCw7IgBcWhhJpOL8NHdqzEqZ73N+Bgqn/4wQPh0AGv pMit49SERK7s2gAnOKz4/aI/AzzGergZYRZsTduALtekkXBis0H8Oct8lkkJGNCT7dnd fXWx0Np9hEdYqNBiDCm1vOVtULOfHN5r8OoY1ZKU6bYF6SyOmTYuTk9pAUZoACW2kx5V YC4+A9DShdSxUtDJXCgpZuXo4nbOEv2/vz+P9CCeUUj44vbrAY79X2KxYMjuCfHOP5Yb +WoAGqcCryEHLs/09c3l74G+ylWirCTu2tFYx6Gw5IzCLqVAdJooNqj2vgi3vpIV1ruG M+Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=+yaTa+zDqmDiAibU5zoH8Z7YnQKRwY03Jyu/LIqtjEI=; b=hr5Sbyy9MMTf5Ef3yEVmuF/ktXWKsTbDIFegp1l9/Xt186SVRRJY9J+JB5GuVnqslm 19H5Sz90Vp40A/rcG28LVu4mJdhz5Z8DvFtbawHacc6MnW+kmomKuNqNfPHB89l5YLe+ uQPwBeLUoaU0mIdLOJjKFrNZifJhlPJIamQORRgPzXigzDT66INqGrETm5+pYGqWK10f hM2X2bmzJoDlcl9BgxWwwjCAETK21TEvOpW9EzrWqS+wuGH+6iGHOcxPSCggwQtdk+Xi 2Osf9LI3ODxbjNGqoZdwTlQE1o39dwuXTQJ9ri4aM5Es/le7w71I7IcgSqGVVnAKNzxu a1VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NweQXUxi; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e15si351733ejl.425.2021.06.02.10.41.52; Wed, 02 Jun 2021 10:42:16 -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=@linaro.org header.s=google header.b=NweQXUxi; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229685AbhFBRki (ORCPT + 99 others); Wed, 2 Jun 2021 13:40:38 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:35836 "EHLO mail-wr1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229467AbhFBRki (ORCPT ); Wed, 2 Jun 2021 13:40:38 -0400 Received: by mail-wr1-f51.google.com with SMTP id m18so3140637wrv.2 for ; Wed, 02 Jun 2021 10:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=+yaTa+zDqmDiAibU5zoH8Z7YnQKRwY03Jyu/LIqtjEI=; b=NweQXUximI5ePuS0XoWrWeT2EWTWo74GFJr3gtWpYr4cBa/glGPCN1MFlztMmepXSt Vd+fbZUDe+a5tB+iB/Wbapbm2KVoW96cmcBe8F2P0kkPLtsDvIfcmdGfmbO7fJzG0Zk7 QOp0ET0vMmsIhYhJXvLtUv1MsbC5taoVQH0DQSDnPGXzEZfKkR6aT94XYk0vILzdgB7Y q2SIEJmDPMsjAC2BXzw3yhqibiLA3x+sDITaR01MOpDdMA8usM26KGz0DbZQtDnJDFTV 4PhF3is4/MZo9nsFotUgEtsFiBRan+5V8KpuZL2r7CB9s38/kYvyhEd2xo5DwkArz5Ua cbpQ== 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:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=+yaTa+zDqmDiAibU5zoH8Z7YnQKRwY03Jyu/LIqtjEI=; b=GF0E8efC7+lx+rzu2h9HN6IXGIjneTVcc+pEyPeldL/ryFfRq/zBk8v4V0wtxBhI1D aXrn0zJnY2pfw1NCB3dR7eaqFoAnUMyRVx+RQ7/tsYUHrllZfjcPatVZFexXUjRxCSg2 CQE9Lc9boUgPoZ4FdHoD9YZ7J2chDohxGX4FVAKyCsTvuXY2VZHTtosR2dymdnGoRcRJ 8uZLwVuDnDV9zJ4ASoE0XjBzZUzCNE9x41N45LMS0X9WxHZlkFv8sdp7Lgp/IzbjinjZ HRda0auJww3TOR4lGI8jdMPbvWd0E4Tdvvjid/S2qyXP0XQa2XmwMxuHkHCKjBwMVNvE utCQ== X-Gm-Message-State: AOAM533+zrRIwt9u8s4W1AqsvV1KUSQlc6sHAK+/oBD2QzR+5o9NujHP AJLcVhBZB0/Vr4zmm/gY53OpFg== X-Received: by 2002:a05:6000:186a:: with SMTP id d10mr35384063wri.41.1622655474277; Wed, 02 Jun 2021 10:37:54 -0700 (PDT) Received: from dell ([91.110.221.214]) by smtp.gmail.com with ESMTPSA id i34sm788478wri.3.2021.06.02.10.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 10:37:53 -0700 (PDT) Date: Wed, 2 Jun 2021 18:37:52 +0100 From: Lee Jones To: Alex Deucher Cc: Leo Li , Mauro Rossi , LKML , amd-gfx list , David Airlie , Maling list - DRI developers , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [RESEND 16/26] drm/amd/display/dc/dce/dce_transform: Remove superfluous re-initialisation of DCFE_MEM_LIGHT_SLEEP_CNTL, Message-ID: <20210602173752.GK2173308@dell> References: <20210602143300.2330146-1-lee.jones@linaro.org> <20210602143300.2330146-17-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 02 Jun 2021, Alex Deucher wrote: > On Wed, Jun 2, 2021 at 10:33 AM Lee Jones wrote: > > > > Fixes the following W=1 kernel build warning(s): > > > > drivers/gpu/drm/amd/amdgpu/../display/modules/hdcp/hdcp_psp.c:374:22: warning: no previous prototype for ‘mod_hdcp_hdcp1_get_link_encryption_status’ > > In file included from drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:28: > > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_d.h:568:43: warning: initialized field overwritten [-Woverride-init] > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:157:14: note: in expansion of macro ‘mmCRTC0_DCFE_MEM_LIGHT_SLEEP_CNTL’ > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_transform.h:170:2: note: in expansion of macro ‘SRI’ > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:183:3: note: in expansion of macro ‘XFM_COMMON_REG_LIST_DCE60’ > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:187:3: note: in expansion of macro ‘transform_regs’ > > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_d.h:568:43: note: (near initialization for ‘xfm_regs[0].DCFE_MEM_LIGHT_SLEEP_CNTL’) > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:157:14: note: in expansion of macro ‘mmCRTC0_DCFE_MEM_LIGHT_SLEEP_CNTL’ > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_transform.h:170:2: note: in expansion of macro ‘SRI’ > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:183:3: note: in expansion of macro ‘XFM_COMMON_REG_LIST_DCE60’ > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:187:3: note: in expansion of macro ‘transform_regs’ > > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_d.h:645:43: warning: initialized field overwritten [-Woverride-init] > > > > Cc: Harry Wentland > > Cc: Leo Li > > Cc: Alex Deucher > > Cc: "Christian König" > > Cc: David Airlie > > Cc: Daniel Vetter > > Cc: Mauro Rossi > > Cc: amd-gfx@lists.freedesktop.org > > Cc: dri-devel@lists.freedesktop.org > > Signed-off-by: Lee Jones > > --- > > drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h > > index cbce194ec7b82..e98b5d4141739 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h > > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h > > @@ -166,8 +166,7 @@ > > SRI(SCL_F_SHARP_CONTROL, SCL, id) > > > > #define XFM_COMMON_REG_LIST_DCE60(id) \ > > - XFM_COMMON_REG_LIST_DCE60_BASE(id), \ > > - SRI(DCFE_MEM_LIGHT_SLEEP_CNTL, CRTC, id) > > + XFM_COMMON_REG_LIST_DCE60_BASE(id) > > I believe DCFE_MEM_LIGHT_SLEEP_CNTL should be kept here and it should > be removed from > XFM_COMMON_REG_LIST_DCE60_BASE() to align with other asics. Ack. Sorry for missing this. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog