From patchwork Mon Jan 11 19:19:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 360552 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3139556jai; Mon, 11 Jan 2021 11:20:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKf6gLvE4Rir/fK5aZmUsohaiuTw4vGwQ9HjYvZXYIgl9qLj3ihlidhy3pDqqJ+7tXh2Jp X-Received: by 2002:a63:4c09:: with SMTP id z9mr1039942pga.260.1610392810995; Mon, 11 Jan 2021 11:20:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610392810; cv=none; d=google.com; s=arc-20160816; b=utVQ8ch1iFBjcgNL+EP8kCdQg3gp0nZZr48TDUyr2ORyCSU8Opmibe8dObUXkEnhh6 p60CKaJBFFtEEJ0tOlkgw6Sy9VdmRIpqTTsW5L9WWbmKxJb7+6XIVvD8tipAGLf1vGBt frWb9KOPBvHa/uPZDFUK7mVNnLCdNMqIVdSzzICnZhfAi4wD3Psfw5h5UEta6DIHP5ZB Bo6ndXydCOgGUok6F1j62x5VEoD8cp5Wn8Sx2C10+hUPfs9ID846RiqAFD1ahLVQPYyP 5xHBIVMsAdd6nIKGtuvRH0PFJNNEtaxiS0kXNUqsHPeqMFF0bLgAaFAisr4x52MXjeT2 FSuQ== 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=iOAVQ5sitCpgTFu4SAQl8e8+cqAZ690FsDYMisctg18=; b=XmkhCNLP/IAE63ANktWbSmJcQ99ULB8rKU4io+T8IO0jOVv0SO5JylToHKL51ZHlV6 mAnRDNjDNdbgh5Twf7iVGRuoRoDJ37YT6fZWjq6BXN3IPzDdLkHERZM6/3Z+48k2sQ6j X/TlvyrMDDAWB+MDKbtWGx5UvSq8bEU6cJLPEJph9YnhELUo2/fP5lBFGywjZW3OCVsp qicdD0Y4Obk4WrvZsljCwv8PXAP60owcpP0YaMNOi1DA2J1lYpMRQs0LqS0mUjb/gdga VZ6hlU/hP1vROjey+TNMyeJ9CCJMomcdC6fJUvbQmremWbApnQ62zU4+TT7rPF4r0Muv Uobw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Hb3cuQsS; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id mr22si295350pjb.36.2021.01.11.11.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 11:20:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Hb3cuQsS; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 E30C589E43; Mon, 11 Jan 2021 19:19:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by gabe.freedesktop.org (Postfix) with ESMTPS id 14A8D8975F for ; Mon, 11 Jan 2021 19:19:54 +0000 (UTC) Received: by mail-wm1-x336.google.com with SMTP id k10so243672wmi.3 for ; Mon, 11 Jan 2021 11:19:53 -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=miXNZ6gGmj2M59EydnLO6lgExaxQkAaXuUbDezw9Q9E=; b=Hb3cuQsSFZ1jEyNVTfncIcsgdUxm0tHxyqEwFT7taKF22e0/Eu5lKQ989Ilii7idMz 9CLW1Ev8wTHz8TuK3jl9HqNsH9o3eGntX4yVKCpvoQ3n9LPcbe1xiT/14UqnXMBOMuN5 0OQrnAi/+JeA7rnWwV8kDquF4ONohcKo4jzO9bB7iYp+GbjyNMSHpGHF/UxoeeLOUqJI 8AR80hZmwpl0/Dr1XlRzY5yx/8mnxg0Xk5cvmx1w6Zx9q+WDCtXNMOYU6DZ+ZuvaSMj/ 0ahzK0ny8XZPoq/0Eee907+PzNcxplWujury3VdSUuW1mCvTI08UveHREaYpbFl7hHbo 2KGQ== 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=miXNZ6gGmj2M59EydnLO6lgExaxQkAaXuUbDezw9Q9E=; b=ox9DInavTX90Cmc9LTcYR0P62muWWS+eLy4IWavMFhhzhwEg50d+LB0jWR3b95ZM0+ I29blZ4rHAAfg3bZcjCZBsrAAJhs4WZLb3ekHwb5HIwGtCGjyVJyCDlurgtErfYaywf1 9gqntm+PAEKIrDvQGbD8lMwYWn1C5+Kz2OF+HZTJq1EfzZDfWlXKtxtPDtpkkpXhtf09 LzJdMWG0s1AHacmvhK17QpUwpLFVD8TgraZNuQ+HcxkHedFvAIkVI1wqGXbVM45mFaa4 Ny3Q9kU3GbzQunZUMPV3wKLd+femHdnLJp0eOm6StuKecfNCZg41HceIT8jXsxBOktp8 l1lw== X-Gm-Message-State: AOAM533EDk+0ZCJ8pNzGqkhPQIjtmJN2rIAaJJFmcFl0SrgdU38qJiSt aRtzl8ZnXuQ1rehObQ3Fsx82jg== X-Received: by 2002:a1c:356:: with SMTP id 83mr284142wmd.31.1610392792743; Mon, 11 Jan 2021 11:19:52 -0800 (PST) Received: from dell.default ([91.110.221.229]) by smtp.gmail.com with ESMTPSA id n3sm778090wrw.61.2021.01.11.11.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 11:19:52 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 17/40] drm/amd/display/dc/dce/dce_aux: Remove duplicate line causing 'field overwritten' issue Date: Mon, 11 Jan 2021 19:19:03 +0000 Message-Id: <20210111191926.3688443-18-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210111191926.3688443-1-lee.jones@linaro.org> References: <20210111191926.3688443-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 382465862f297..277484cf853e4 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h @@ -124,7 +124,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),\