From patchwork Fri Nov 13 13:49:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11903407 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B8EDC388F7 for ; Fri, 13 Nov 2020 13:50:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47EF822201 for ; Fri, 13 Nov 2020 13:50:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="y+C8gxmn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47EF822201 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AB776E51B; Fri, 13 Nov 2020 13:49:54 +0000 (UTC) Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2B4C6E4F3 for ; Fri, 13 Nov 2020 13:49:47 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id 23so8097752wmg.1 for ; Fri, 13 Nov 2020 05:49:47 -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=z/8viFdCzNWHnSXDW2EunFyaI/d41Skp7gtV6qeYb0o=; b=y+C8gxmn2CgNAthyNMnIAqnLUwLH4naZTgbJSpTdoD73gKQFGYgWDnZ8/pu87+N3My 3Z5QYUXjogsA6are0/qHHGs4Pm0ky8IDgD4q2wVolPvVk9/7del+06HVnzXbYLOsHnUa y0utOgFt23KAzeKXkP+hksNHB1PME8rQ5hy5mBy5L9BcrtbzhrfoNl5TFsuG+eSAP9Bk Y5grD862KHbiX5jvyYjwoXCt6Ebdc45fMNWMs9Cv+wBzoQ/OmOEU+mdYUzLj8waneUZk 8IyfzinwFH/5AyA44qCDXcQd9ew9kVyAGMfWkII3O5JuO9AJhBbU+lB/6BZ2oXTa2IfF ohFA== 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=z/8viFdCzNWHnSXDW2EunFyaI/d41Skp7gtV6qeYb0o=; b=owCiUOymE2GUS1eFlZFROefhjlmVu3PnMs8jTo18+XyxvD2yJQifoDG8JZfd9nOAdY DnCFS3e6aSG+tojNSO3g7psK0iFPw4RgrAEm5eofWmZ68xBM0nze1po7aU2ckI5SrJ58 e7Iq7eM1m5huxr/G3kNUsObsXt94gFZofYVetX/t7rUrGs6q/k6VkKgY0l0OWWgO1Y3l PJNyIc0cvgYMw3xLggx/F5J8Qu46uMYpKKgNwKObzIinHGkzlXXHxKKxppSefkJq5Fxv Ywd1bkx3paedXd6ISihMQCdF+7TkQwZdjoldkYGSKeoAClrqnwHEayzBwFuDJTZiI2u7 PUKw== X-Gm-Message-State: AOAM533J+G5ZmUf2uy2UYiAgAVYAMMMb6jJGPiRbbWCHNWN5qTx9Rdhc AAxVPzfYp2NtvrNB8NvvvXAzLw== X-Google-Smtp-Source: ABdhPJwrqmZ4GNbkeACVm1/vQC7L1XX7aXP5n5VW3GuHBkUyDAqenITmqVUTAfPhLM0Fyok02x3AOw== X-Received: by 2002:a1c:2842:: with SMTP id o63mr2652810wmo.59.1605275386536; Fri, 13 Nov 2020 05:49:46 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id t11sm4561614wrm.8.2020.11.13.05.49.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 05:49:45 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 03/40] drm/amd/display/dc/core/dc_link_ddc: Move DP_DVI_CONVERTER_ID_{4, 5} to where they're used Date: Fri, 13 Nov 2020 13:49:01 +0000 Message-Id: <20201113134938.4004947-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201113134938.4004947-1-lee.jones@linaro.org> References: <20201113134938.4004947-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" This patch fixes >200 warnings. Fixes the following W=1 kernel build warning(s): from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:31: drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:126:22: warning: ‘DP_DVI_CONVERTER_ID_5’ defined but not used [-Wunused-const-variable=] 126 | static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; | ^~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:125:22: warning: ‘DP_DVI_CONVERTER_ID_4’ defined but not used [-Wunused-const-variable=] 125 | static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; | ^~~~~~~~~~~~~~~~~~~~~ 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/core/dc_link_ddc.c | 4 ++++ drivers/gpu/drm/amd/display/include/ddc_service_types.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c index 54beda4d4e85d..c5936e0643606 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c @@ -37,6 +37,10 @@ #include "dc_link_ddc.h" #include "dce/dce_aux.h" +/*DP to Dual link DVI converter*/ +static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; +static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; + #define AUX_POWER_UP_WA_DELAY 500 #define I2C_OVER_AUX_DEFER_WA_DELAY 70 #define I2C_OVER_AUX_DEFER_WA_DELAY_1MS 1 diff --git a/drivers/gpu/drm/amd/display/include/ddc_service_types.h b/drivers/gpu/drm/amd/display/include/ddc_service_types.h index b453ce5a9bfdb..4de59b66bb1a3 100644 --- a/drivers/gpu/drm/amd/display/include/ddc_service_types.h +++ b/drivers/gpu/drm/amd/display/include/ddc_service_types.h @@ -117,8 +117,4 @@ struct av_sync_data { uint8_t aud_del_ins3;/* DPCD 0002Dh */ }; -/*DP to Dual link DVI converter*/ -static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; -static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; - #endif /* __DAL_DDC_SERVICE_TYPES_H__ */