From patchwork Sat Mar 6 11:05:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Menglong Dong X-Patchwork-Id: 12119873 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 F1E78C433DB for ; Sat, 6 Mar 2021 11:05:35 +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 A407F64DED for ; Sat, 6 Mar 2021 11:05:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A407F64DED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 D8ED76E4FE; Sat, 6 Mar 2021 11:05:34 +0000 (UTC) Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5D5B6E4FE; Sat, 6 Mar 2021 11:05:33 +0000 (UTC) Received: by mail-pj1-x1043.google.com with SMTP id j6-20020a17090adc86b02900cbfe6f2c96so560753pjv.1; Sat, 06 Mar 2021 03:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9AfHAOMbxC7MTHsWF8p12oIJD2meb9c1IkmlruG2cLk=; b=oQa2f93ojNFEENAzbWjskJgLPWUPepttHtbGGmAwtO+Mmd9qiVp29+g71zchN3IzoT JgFje6XxxcNzBJsGddkMpFcn5qrF3b2z2pbWQtdWHkvPxVvOlclTniWBtp2qbnB+caSD u22+jTSAjVpBEVSF6Pot9qtJ+TUhFXsrY7cfQ16d/DoH8Bk1t+qfd6KvH8NmLUJD02lm du6tldtT/NLHyDuYYwItnYjY9XSX2ob/DXvb4ZsaRdFmD3kuWqv5jDQpk0bRmJUFsIDi StN3Ms570K/eyPgfxJTsZ2qacM4bzt6bNv3IP9sQhRcg+xl7InD2U8ubYPGf4F1i4dMz X/hQ== 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:mime-version :content-transfer-encoding; bh=9AfHAOMbxC7MTHsWF8p12oIJD2meb9c1IkmlruG2cLk=; b=AhuxikgiJR8xHwIFq3BYtxr+m07enNzqEFPEJ64P13xySOKLYICY9NuFSNaPOsgl0n x1kf6itQvBu5c2OTG+V55ByoZsk7gxIF1jtPhKkyw3I+7uc4tGW0WmZZJHp30Hx+jp2d kSwtouJYcfyXXt+32UxmwEXW2Qohq6tz1wjDYYPrbQtD2No6c1MXEVVweJW2nQu+l+3m b9VaOynsaPqje9aS6eBtTqf1FUQ1wwWunQXIj+ZbscYLCw6OLvxViQINWydQWOsJT7iC nJ5MXJu1Fpq52+FlPzmsqN5mCcj5fagbOJy0MXA7xDtyjWjHoNdEjlUV76hGvdhDYgIc Zd5A== X-Gm-Message-State: AOAM532hT8mCd8zzpPiFK8YRllEHZKM6wwv2NbYe8WqlzmEmeT97T/aZ 8+BqNxjahn+ZQcMz03wAlEs= X-Google-Smtp-Source: ABdhPJzlIglq+eDAuFl63+agzj8j0YbnG/skFpE8O2PcgFt5z7j4HeTRpvNWTvfpl+R7RJoBUKc8yA== X-Received: by 2002:a17:90a:400f:: with SMTP id u15mr14728424pjc.80.1615028733480; Sat, 06 Mar 2021 03:05:33 -0800 (PST) Received: from localhost.localdomain ([178.236.46.205]) by smtp.gmail.com with ESMTPSA id d16sm4903743pjd.25.2021.03.06.03.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 03:05:33 -0800 (PST) From: menglong8.dong@gmail.com X-Google-Original-From: zhang.yunkai@zte.com.cn To: sunpeng.li@amd.com Subject: [PATCH] drm/amd/display: remove duplicate include in dcn21 and gpio Date: Sat, 6 Mar 2021 03:05:25 -0800 Message-Id: <20210306110525.216316-1-zhang.yunkai@zte.com.cn> X-Mailer: git-send-email 2.25.1 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: isabel.zhang@amd.com, sung.lee@amd.com, Dmytro.Laktyushkin@amd.com, airlied@linux.ie, Tony.Cheng@amd.com, Rodrigo.Siqueira@amd.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, zhang.yunkai@zte.com.cn, aurabindo.pillai@amd.com, dri-devel@lists.freedesktop.org, wyatt.wood@amd.com, alexander.deucher@amd.com, Krunoslav.Kovac@amd.com, christian.koenig@amd.com, Anthony.Koo@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Zhang Yunkai 'dce110_resource.h' included in 'dcn21_resource.c' is duplicated. 'hw_gpio.h' included in 'hw_factory_dce110.c' is duplicated. Signed-off-by: Zhang Yunkai --- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 - .../gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c index 072f8c880924..8a6a965751e8 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c @@ -61,7 +61,6 @@ #include "dcn21/dcn21_dccg.h" #include "dcn21_hubbub.h" #include "dcn10/dcn10_resource.h" -#include "dce110/dce110_resource.h" #include "dce/dce_panel_cntl.h" #include "dcn20/dcn20_dwb.h" diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c b/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c index 66e4841f41e4..ca335ea60412 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c @@ -48,10 +48,6 @@ #define REGI(reg_name, block, id)\ mm ## block ## id ## _ ## reg_name -#include "../hw_gpio.h" -#include "../hw_ddc.h" -#include "../hw_hpd.h" - #include "reg_helper.h" #include "../hpd_regs.h"