From patchwork Mon May 10 10:19:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433076 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2727188jao; Mon, 10 May 2021 04:05:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAoi1IGQCfvlYLa1MIqXN3VK638VjzJHFkNfqrlmaGs7uzebH9M1nbe/GII89+ZEBjVxhP X-Received: by 2002:a63:617:: with SMTP id 23mr20709169pgg.409.1620644704231; Mon, 10 May 2021 04:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620644704; cv=none; d=google.com; s=arc-20160816; b=h5acFOubXbE/FPwH7jHZPnhxugWVZfKvOvh5OVbNFsZq4nDtoNwjUe65lbIjHqwZNJ J61wn7Pgs8RBVfco8fiR6vrwzS6O7avPYMVbPuNCWXERMTCTLOdf86QwWpZ78pm0C+Az ESRWDGMpT0N44iR4/HR3cVa6U9tm4QdIME0woyh+Hx2/2yckAMjLFnF5O57wZZHaH4bS kiuOrsLx/8sqpZzYeC9CTSTPko74HdHWxKUb1c9i0SwPG7YOM/CLtGDv6Xqe3/DGG4pr 9mC9NpV2r5QxBA2gPizHe+MyA96w1pglYomfu1txkSP98hqwcHsK54XkuqNm6oJKCfo1 YrXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:user-agent:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=KarvsBAIfAsVIyJPeuJmv+18uvr+FaTbjZ1xCxrPJlY=; b=Uo+n/WEIYlu8aGHhmmN4vo0tSzvi3KP6aFTyguhIslzYNa2ggJ6sxpMEsMjckNwKqO tJE6Bv33ZVNnaa9UfI74sOzv+itvJPQy2tZ4aKzzf5qeZEn22Cx8+RUVaSflNihIuwyV Od9wjfKM7spm9xtI5rqsw1Z09cU3LDWDP83jOtCM0S+d6pbvLAsmP+nZYtcdmosFgxgR sOHtZVJnvDt+FB2oBEhlML9h7meQoNHgBxdndDoUMTWMOXCH6JDlZ6GasXqc9+rKSF5b PvcI69plkMdyYopZrI2hBSyiqZwnYcC8Wi4CXf1rWDXqx9fNqLsoCBwZ5PNalh4/6Gnx Rphw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linuxfoundation.org header.s=korg header.b=BGBXRjJj; 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=linuxfoundation.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id u10si22291441pgg.279.2021.05.10.04.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 04:05:04 -0700 (PDT) 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=fail header.i=@linuxfoundation.org header.s=korg header.b=BGBXRjJj; 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=linuxfoundation.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6939689FD4; Mon, 10 May 2021 11:05:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id E25CA89FD4; Mon, 10 May 2021 11:05:00 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id B8E73610A7; Mon, 10 May 2021 11:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644700; bh=EXK4iLNayhUOC3WWOSq/Lehhdmm+cANa20sK4cCvN84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BGBXRjJjjEvV/UNHjwmGUac/DYcG75iepqz1/NTn/wHab5UZzEfXO1o6lvDf+XBsB J1BcpIc3x220mmKAUwvz/9HppEARhMaEeD7MjmftNkygKPldO8BenWFbibZPqP3RZG lW611tzh7oBdSlxfJ7O+agH5wt7hDN/ffP1OcO54= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Subject: [PATCH 5.12 153/384] drm/amd/display/dc/dce/dce_aux: Remove duplicate line causing field overwritten issue Date: Mon, 10 May 2021 12:19:02 +0200 Message-Id: <20210510102019.923319661@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 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: Sasha Levin , Leo Li , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, David Airlie , amd-gfx@lists.freedesktop.org, Alex Deucher , Lee Jones , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Lee Jones [ Upstream commit 3e3527f5b765c6f479ba55e5a570ee9538589a74 ] 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 Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 1 - 1 file changed, 1 deletion(-) -- 2.30.2 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 277484cf853e..d4be5954d7aa 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h @@ -99,7 +99,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),\