From patchwork Wed Mar 3 13:42:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 392072 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp5132950jap; Wed, 3 Mar 2021 05:44:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/Xrn4JWkc+DHUgOoqHI/MleD2OZdB2vz0x1gGju8FZNpwzhdyPDIZJzEOV7aCRZdyXJU/ X-Received: by 2002:a62:a507:0:b029:1ce:ddad:79de with SMTP id v7-20020a62a5070000b02901ceddad79demr8340026pfm.19.1614779041826; Wed, 03 Mar 2021 05:44:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614779041; cv=none; d=google.com; s=arc-20160816; b=IrgO+LkEqa8o/FW+OwdGEgt/19AiYbttgUb41y1ymFlVzhtkP+S2jtIIgeU1B367iE SpNOU7SBLQdtXzXDsO/Aay4KJFiYsDOGo70oaaVObSUuAD5JhCAgEcuRg8IUPjvrnUbP YqdNAp6mrE61LLRSCEM5F6HOYpp3GcrIA1y/rkPSKBo818pGGKABL7fiTKpNzbsy24NC +leM7NrzMNTJDvdI6gJqcEGGXJFZpnUCzf6weRak9+i5izXcfxmWO3Db68C9Jbuv2sG2 s68Vf5trK3VSOfSqbAxByrlIVJ8EcQ23hV3GWAjc4axNLBe7hzsqWV6yXHwSSwqeLOle e2cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=OBiflEMBrcRSzWIrY9IyZp26BYMgzazkPCZkMmONeNk=; b=PLKCUsPD+01ZwUZBCFbwpBqwhkmTsb6MTwN9MQoYwDXEVwXRUsqTruBFCWimCxN2JB 1iBwTmI7xMBEc8c1xSXlp0kYJDPS5oR07CW+jA9sCIJ2ZQGOcbDU/rIx3PqvF4QMcV6p FI4powFtRa66hROlSoIQDaptDtg5VdbEt/bsqBDuQ9+/LgqTGanPXFhhOCcdHQu+9LuY p8j3IOrDn9M2ZbKkzIAcaSTLfi+aUSOipUwZoM2NymuL8mvJ6MWCIw/Pb7A0GckhycVf OB7p0x8KxlQpVLMuEacrQTNb2IrLswaO3iJU9gpNGhzcGAFLsk3Bpki2eYff7MzYQCwh iBCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jLQUoxJt; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id p24si24939894plq.399.2021.03.03.05.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:44:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jLQUoxJt; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEA436E8DB; Wed, 3 Mar 2021 13:43:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02E186E8EB for ; Wed, 3 Mar 2021 13:43:41 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id h98so23716483wrh.11 for ; Wed, 03 Mar 2021 05:43:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/QIOJ+jcry9nSq3nprw2igH3RHK7U5zFD/JMioUS840=; b=jLQUoxJt4yKOi/a2LytqC3f9MXcNn4Ges2MV13JFH21+ISQZPa1bJwuNQ2Ri6hUvPf MSCY27ncYgC6IN6vgmZzR1T6D4pKHZPwAFmVroWGy7jSbLeWj3I+8YIATC3TFK7Z6kyo vsWNJ9T5qyAgtOynq6rfhL+oGtnJfDzITSbdlRvMIPjJHTq0KCY9YZ2NqolFx35lLnuZ Fdf0r9DNAO000lpRErN5MfZq56OW1eVu9aqHf9dFahotdxPJV3nNJiSfioRK+IYOClkU 5ZwV5WPy849dLVNUZVUPEVDWGrMSkK2uTWDPrsxdHMjmSy87hgYuzeOHLUfZzpc9NE0U 6+DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/QIOJ+jcry9nSq3nprw2igH3RHK7U5zFD/JMioUS840=; b=j583RLaSQOYQI3gL1hmNFGBDADWOOQROzJIk8Ga9LJUT1EjBqBaSy2prK9ies7LRzX mRZWwCBzb3Pl98BbKwl65YcOuUMq7l6TqVouobhbFe4mZ+4hg1Fi85ZuADoDDa0Z3WwW BSHKWAzSgy+XyqRow5mgYN85dGqNfYpO030o0V0QtLgDPKtiP7eHlVeLT/PMdzIn3ZRn YQHbKr6rdVtZdXWgRW0NAH2RocYaGvT0Qn1Q0Oqds+isyHCXt4p11Eqm3BItlDP8UW7z KZw5UZYE+Pf+4xrRkcKV5HDJbV4i7iqI1qNsr+9SMNBXDC3vCIR3ub7PR41nw+R2ZSo+ uQmw== X-Gm-Message-State: AOAM532gq4Q5GRaSSBAweJjUcClwYDNJVQH3g/gqwWU3lFJyivJfJ6RE d+tmk4UwByglNFMlXxfwgx2xeQ== X-Received: by 2002:adf:fb49:: with SMTP id c9mr27869115wrs.72.1614779020649; Wed, 03 Mar 2021 05:43:40 -0800 (PST) Received: from dell.default ([91.110.221.155]) by smtp.gmail.com with ESMTPSA id w18sm6109524wrr.7.2021.03.03.05.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:43:40 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 10/53] drm/amd/display/dc/dce/dce_aux: Remove duplicate line causing 'field overwritten' issue Date: Wed, 3 Mar 2021 13:42:36 +0000 Message-Id: <20210303134319.3160762-11-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210303134319.3160762-1-lee.jones@linaro.org> References: <20210303134319.3160762-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Li , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, David Airlie , dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): In file included from drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.c:59: drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_11_2_sh_mask.h:10014:58: warning: initialized field overwritten [-Woverride-init] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:214:16: note: in expansion of macro ‘AUX_SW_DATA__AUX_SW_AUTOINCREMENT_DISABLE__SHIFT’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:127:2: note: in expansion of macro ‘AUX_SF’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.c:177:2: note: in expansion of macro ‘DCE_AUX_MASK_SH_LIST’ drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_11_2_sh_mask.h:10014:58: note: (near initialization for ‘aux_shift.AUX_SW_AUTOINCREMENT_DISABLE’) drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:214:16: note: in expansion of macro ‘AUX_SW_DATA__AUX_SW_AUTOINCREMENT_DISABLE__SHIFT’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:127:2: note: in expansion of macro ‘AUX_SF’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.c:177:2: note: in expansion of macro ‘DCE_AUX_MASK_SH_LIST’ drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_11_2_sh_mask.h:10013:56: warning: initialized field overwritten [-Woverride-init] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:214:16: note: in expansion of macro ‘AUX_SW_DATA__AUX_SW_AUTOINCREMENT_DISABLE_MASK’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:127:2: note: in expansion of macro ‘AUX_SF’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.c:181:2: note: in expansion of macro ‘DCE_AUX_MASK_SH_LIST’ drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_11_2_sh_mask.h:10013:56: note: (near initialization for ‘aux_mask.AUX_SW_AUTOINCREMENT_DISABLE’) drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:214:16: note: in expansion of macro ‘AUX_SW_DATA__AUX_SW_AUTOINCREMENT_DISABLE_MASK’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.h:127:2: note: in expansion of macro ‘AUX_SF’ Cc: Harry Wentland Cc: Leo Li Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter 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_aux.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h index 775e24926380e..566b1bddd8cc6 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h @@ -100,7 +100,6 @@ struct dce110_aux_registers { AUX_SF(AUX_SW_CONTROL, AUX_SW_GO, mask_sh),\ AUX_SF(AUX_SW_DATA, AUX_SW_AUTOINCREMENT_DISABLE, mask_sh),\ AUX_SF(AUX_SW_DATA, AUX_SW_DATA_RW, mask_sh),\ - AUX_SF(AUX_SW_DATA, AUX_SW_AUTOINCREMENT_DISABLE, mask_sh),\ AUX_SF(AUX_SW_DATA, AUX_SW_INDEX, mask_sh),\ AUX_SF(AUX_SW_DATA, AUX_SW_DATA, mask_sh),\ AUX_SF(AUX_SW_STATUS, AUX_SW_REPLY_BYTE_COUNT, mask_sh),\