Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp2029573pxf; Sat, 27 Mar 2021 00:30:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAB6lQX9uNGtCuV+bPlLku5ezdnuE4HSJLgS2uxXyhgQK22KR7Y5Sep0t2pnPTuVCHdl4S X-Received: by 2002:a17:906:4cd6:: with SMTP id q22mr19050989ejt.469.1616830203989; Sat, 27 Mar 2021 00:30:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616830203; cv=none; d=google.com; s=arc-20160816; b=u259J1EFfoyEzBXiiCCbc3Tnnf4WsrWTRE6XSbLsRYMCCjsvH7+6g6fCrXsEOXR2QJ U4GaUSnbMVuHvF+XbZjjXYSUh/vd3+vg483RoLHWhlOEbnAuLUm130sueWyA54RRYLv5 xZFXhAg2VGPZVT/aoyB1PDTo997qSSdAPqF8Kw3Ub9Dda0TUYGCgy70FHr4XtL9B1fbP xrzR0+Pcyml02Mj8uo5Vbc2aB4wTF4gzxpxIYlIz8PXg2CqTO3j+ThUDGlrtfXz/l4mN 1UYL3brsTd3UMNXny5ryp9ZQa7K3rItqkTBAL6vm9DPEPSubRyH5B8rTi8lLnPzf0PDo dJng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=nJMdvUGXRqRKCI+DYfZUe/dHtVHYKqtRcQHMCPqB+w8=; b=E15Bywx75XAimoezc0gtMqoWoa8fh7AtxZmdWTW1rKYj0KIcRxdxOn6iEE0dyqSuIG 4EnF1JVB7yPNu/WsP8d4xbvJYBhW6WOgS4k09j1v+2Ox0H4RpniQOlZUkb/0jMh4UCn5 OaebZVOuZMkBqM/GhXUf15Run3TJbWZziaq5tTcVXxGyRcPx4NUiWarTpFpUqdFXTfoQ TPXkZQuiNnMYLkKc7kxkrSFyHayr6exKJJPOPgBvna0lKFvMQgoqTIDMRSU0zhFjmzVO rJGHqGuBMFXjGtBIvUVYlPFjAaaD1P9bpGpJe8GGK0RunH4xi7ZHI63I45899oQ1vgMZ kCOg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e16si8251642edq.338.2021.03.27.00.29.41; Sat, 27 Mar 2021 00:30:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230236AbhC0H2e (ORCPT + 99 others); Sat, 27 Mar 2021 03:28:34 -0400 Received: from mail-m17637.qiye.163.com ([59.111.176.37]:16844 "EHLO mail-m17637.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229726AbhC0H2X (ORCPT ); Sat, 27 Mar 2021 03:28:23 -0400 Received: from wanjb-virtual-machine.localdomain (unknown [36.152.145.182]) by mail-m17637.qiye.163.com (Hmail) with ESMTPA id 4E03A9800E6; Sat, 27 Mar 2021 15:28:20 +0800 (CST) From: Wan Jiabing To: Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Daniel Vetter , Aric Cyr , Rodrigo Siqueira , Aurabindo Pillai , Qingqing Zhuo , Bhawanpreet Lakha , Krunoslav Kovac , Jacky Liao , Wan Jiabing , Nicholas Kazlauskas , Wenjing Liu , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: kael_w@yeah.net Subject: [PATCH] amd: display: dc: struct dc_state is declared twice Date: Sat, 27 Mar 2021 15:28:05 +0800 Message-Id: <20210327072807.1486517-1-wanjiabing@vivo.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZQxgaGUwZGR5PTxgZVkpNSk1DSEtKS0tMSUNVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKTFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6NzY6Dgw4ND8NCjMLMgs6FA4U Ik5PFCJVSlVKTUpNQ0hLSktKSk9IVTMWGhIXVQwaFRESGhkSFRw7DRINFFUYFBZFWVdZEgtZQVlI TVVKTklVSk9OVUpDSVlXWQgBWUFPTEhPNwY+ X-HM-Tid: 0a78729574b0d992kuws4e03a9800e6 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org struct dc_state has been declared at 273rd line. Remove the duplicate. Delete duplicate blank lines. Signed-off-by: Wan Jiabing --- drivers/gpu/drm/amd/display/dc/dc.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index 18ed0d3f247e..dc667298ab5b 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -234,7 +234,6 @@ struct dc_static_screen_params { unsigned int num_frames; }; - /* Surface update type is used by dc_update_surfaces_and_stream * The update type is determined at the very beginning of the function based * on parameters passed in and decides how much programming (or updating) is @@ -272,7 +271,6 @@ struct dc; struct dc_plane_state; struct dc_state; - struct dc_cap_funcs { bool (*get_dcc_compression_cap)(const struct dc *dc, const struct dc_dcc_surface_param *input, @@ -281,7 +279,6 @@ struct dc_cap_funcs { struct link_training_settings; - /* Structure to hold configuration flags set by dm at dc creation. */ struct dc_config { bool gpu_vm_support; @@ -581,7 +578,6 @@ struct dc_bounding_box_overrides { int min_dcfclk_mhz; }; -struct dc_state; struct resource_pool; struct dce_hwseq; struct gpu_info_soc_bounding_box_v1_0; @@ -757,7 +753,6 @@ enum dc_transfer_func_predefined { TRANSFER_FUNCTION_GAMMA26 }; - struct dc_transfer_func { struct kref refcount; enum dc_transfer_func_type type; @@ -770,7 +765,6 @@ struct dc_transfer_func { }; }; - union dc_3dlut_state { struct { uint32_t initialized:1; /*if 3dlut is went through color module for initialization */ @@ -784,7 +778,6 @@ union dc_3dlut_state { uint32_t raw; }; - struct dc_3dlut { struct kref refcount; struct tetrahedral_params lut_3d; @@ -1014,7 +1007,6 @@ enum dc_status dc_validate_global_state( struct dc_state *new_ctx, bool fast_validate); - void dc_resource_state_construct( const struct dc *dc, struct dc_state *dst_ctx); @@ -1167,7 +1159,6 @@ struct dc_container_id { unsigned short productCode; }; - struct dc_sink_dsc_caps { // 'true' if these are virtual DPCD's DSC caps (immediately upstream of sink in MST topology), // 'false' if they are sink's DSC caps @@ -1229,7 +1220,6 @@ struct dc_cursor { struct dc_cursor_attributes attributes; }; - /******************************************************************************* * Interrupt interfaces ******************************************************************************/ -- 2.25.1