From patchwork Mon Jan 11 19:19:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 360557 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3139681jai; Mon, 11 Jan 2021 11:20:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgAvHTW7Ffmz4SmH1CUYMo5+3V83OZtuViTtE1zROy7Nyp2QzDZcl7w0EYSaGbs98tTigX X-Received: by 2002:a17:90a:ae02:: with SMTP id t2mr339392pjq.169.1610392820158; Mon, 11 Jan 2021 11:20:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610392820; cv=none; d=google.com; s=arc-20160816; b=GYyRX1bkxE8KRcGPPwlu0NXzfkIkzdpPcbLkqWGrDrcxKHvrA8zzZzNtPH5UlOZTg+ xjD5xzJGPMg7zgW2TxNLTyfHn8nt0Ssg5hJnoxjzfH1jRlrgFbyLHu7AbrgymcwsRfYT UwiRIeqdMnUUotlijan2Hp8SOg4MkpVFiZUfKyW2nEZW6NxYDcP1sMB0YlsiVvZo5l/H XtKgEWWGYHshIH61VSeuWpBIW47zZOtKOCDIxrlvQwettM7CQh0yLWkPB4hJnBHGSZYe zQeLtaB19XjNNSHFwEZhX3AUEGoD057396se4fKY4dL5P6fnCDx55ryW3/nCe3j+OQVa N3fQ== 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=MXP0t+WrGIKUzfaD3mpxEIfYWY0VjmBWNVEHfMBYcAg=; b=WZ6NFOVLsCaDg+nq3EGrg71a20zZdfzLMPy4kbnJrz3q761ozSjCkJ0WSbErd18OYm Dqe53nN9c0hFRn5asUcoRt1ebfGLMJI5VI2DT+7y8UkZ25TOksAuSP83f/iN4ngBmL76 IKsSRIYOJvDLE3C1L3un9zX4/kCGDgIwhoaWCPszoLuu1Qsn69emhF3DIBI/0cXhL8Ru BtowPprgHXSL16bS8qOLcpBvPAWIf54fIPsI8IZXIGV4ffMNnsDF1Z2hxJxbd6CV53Ll b0PPHBmmY8/99jZIKBFElVDPQ2gUgNo4YM2Oc7SpDG20Xehahg+qj0T29OQUOFYHfGwK +ESA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=rjSyoFGb; 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 r130si473500pfc.271.2021.01.11.11.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 11:20:20 -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=rjSyoFGb; 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 C7E6389F27; Mon, 11 Jan 2021 19:20:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by gabe.freedesktop.org (Postfix) with ESMTPS id AFBC589E2B for ; Mon, 11 Jan 2021 19:19:56 +0000 (UTC) Received: by mail-wm1-x32e.google.com with SMTP id c124so233270wma.5 for ; Mon, 11 Jan 2021 11:19:56 -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=4f0FtZXp9xVs1vBA+TFZeeAO+I8q3YihV8u/Z7zvpoM=; b=rjSyoFGbyoA6OFHvEnHL5eOuRnQB8feiOHf2dVoaV0cnhK1LHvbxXhQNf5fpny64TM V0BurbwGgCi2pGIl+/muaxAZcbrIOwlZ4JSl5ynfsznPn24tPcngDhW/KzLsgB6AR+Tr +TeysSR2e3qbwg+6JD8qJmHkbGLLrMCQkp1szP8svGFRnhZgaV2l3prirUlF1OwKdveK 0ll2Y080EHI//ECwaQRonRJZQnLWJcPnrXOB3Gz5yunY45AMBo6BgOPiChBAq3aPBADo brVG2yU/r7JffymFfbfBhmMFDNZqQEyv4OKTQEnc1kycnmPkosze7rgJ9GIoGb+JCf3S qSCQ== 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=4f0FtZXp9xVs1vBA+TFZeeAO+I8q3YihV8u/Z7zvpoM=; b=ZG1OkQYv3EV2GonXaaf2PtM+X75GPrBl+w4qFx8yBk44QLhKcDoP/v/HQ3/GX6d0Iv lRezHad/GPcyDsYtz9cQJYzK8vR9Wpw+GIaSMktqQN69sW97EN+cibtOYxysg0WZ0Vwb JhOSyTEdc2TloMZbPO9XcocCSsF2pAR+4/o+hoA3psiizIN3HCk0LnHR7GqJm38Sq8eT kqI0k016GWecdNPLnYZHET22Rt/raRwOXi2fhsZ4mNjDROQxYImdWAGTh5Uiwa4TcLbj ND3xLZRn30RrlYbcTscUmo2dFCJ3h6fDFA0yOuyxVkcnVAgv8v+jgDPAqeaYQavZnJDd 6vBA== X-Gm-Message-State: AOAM533KOhuKWAUGPaTGq+E3qtqz8KoE6pbXyt5CxDNVjQgOKv0tRrPe MJnuBFUt64zKB1e+r2nzt/YQ4Q== X-Received: by 2002:a7b:cf30:: with SMTP id m16mr255039wmg.145.1610392795315; Mon, 11 Jan 2021 11:19:55 -0800 (PST) Received: from dell.default ([91.110.221.229]) by smtp.gmail.com with ESMTPSA id n3sm778090wrw.61.2021.01.11.11.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 11:19:54 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 19/40] drm/amd/display/dc/dce/dce_opp: Remove duplicate entries causing 'field overwritten' issues Date: Mon, 11 Jan 2021 19:19:05 +0000 Message-Id: <20210111191926.3688443-20-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 , Mauro Rossi , 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:10480:62: warning: initialized field overwritten [-Woverride-init] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:96:16: note: in expansion of macro ‘FMT_BIT_DEPTH_CONTROL__FMT_TEMPORAL_DITHER_EN__SHIFT’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:114:2: note: in expansion of macro ‘OPP_SF’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:148:2: note: in expansion of macro ‘OPP_COMMON_MASK_SH_LIST_DCE_COMMON_BASE’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.c:321:2: note: in expansion of macro ‘OPP_COMMON_MASK_SH_LIST_DCE_112’ drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_11_2_sh_mask.h:10480:62: note: (near initialization for ‘opp_shift.FMT_TEMPORAL_DITHER_EN’) drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:96:16: note: in expansion of macro ‘FMT_BIT_DEPTH_CONTROL__FMT_TEMPORAL_DITHER_EN__SHIFT’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:114:2: note: in expansion of macro ‘OPP_SF’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:148:2: note: in expansion of macro ‘OPP_COMMON_MASK_SH_LIST_DCE_COMMON_BASE’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.c:321:2: note: in expansion of macro ‘OPP_COMMON_MASK_SH_LIST_DCE_112’ drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_11_2_sh_mask.h:10479:60: warning: initialized field overwritten [-Woverride-init] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:96:16: note: in expansion of macro ‘FMT_BIT_DEPTH_CONTROL__FMT_TEMPORAL_DITHER_EN_MASK’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:114:2: note: in expansion of macro ‘OPP_SF’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:148:2: note: in expansion of macro ‘OPP_COMMON_MASK_SH_LIST_DCE_COMMON_BASE’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.c:325:2: note: in expansion of macro ‘OPP_COMMON_MASK_SH_LIST_DCE_112’ drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_11_2_sh_mask.h:10479:60: note: (near initialization for ‘opp_mask.FMT_TEMPORAL_DITHER_EN’) drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:96:16: note: in expansion of macro ‘FMT_BIT_DEPTH_CONTROL__FMT_TEMPORAL_DITHER_EN_MASK’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:114:2: note: in expansion of macro ‘OPP_SF’ drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_opp.h:148:2: note: in expansion of macro ‘OPP_COMMON_MASK_SH_LIST_DCE_COMMON_BASE’ 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_opp.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h index 4d484ef60f357..bf1ffc3629c7f 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h @@ -111,7 +111,6 @@ enum dce110_opp_reg_type { OPP_SF(FMT_DITHER_RAND_R_SEED, FMT_RAND_R_SEED, mask_sh),\ OPP_SF(FMT_DITHER_RAND_G_SEED, FMT_RAND_G_SEED, mask_sh),\ OPP_SF(FMT_DITHER_RAND_B_SEED, FMT_RAND_B_SEED, mask_sh),\ - OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_EN, mask_sh),\ OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_RESET, mask_sh),\ OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_OFFSET, mask_sh),\ OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_DEPTH, mask_sh),\ @@ -219,7 +218,6 @@ enum dce110_opp_reg_type { OPP_SF(FMT_DITHER_RAND_R_SEED, FMT_RAND_R_SEED, mask_sh),\ OPP_SF(FMT_DITHER_RAND_G_SEED, FMT_RAND_G_SEED, mask_sh),\ OPP_SF(FMT_DITHER_RAND_B_SEED, FMT_RAND_B_SEED, mask_sh),\ - OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_EN, mask_sh),\ OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_RESET, mask_sh),\ OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_OFFSET, mask_sh),\ OPP_SF(FMT_BIT_DEPTH_CONTROL, FMT_TEMPORAL_DITHER_DEPTH, mask_sh),\