struct dc_state has been declared at 273rd line. Remove the duplicate. Delete duplicate blank lines.
Signed-off-by: Wan Jiabing wanjiabing@vivo.com --- 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 ******************************************************************************/
On Sat, Mar 27, 2021 at 3:28 AM Wan Jiabing wanjiabing@vivo.com wrote:
struct dc_state has been declared at 273rd line. Remove the duplicate. Delete duplicate blank lines.
Can you split these into separate patches?
Alex
Signed-off-by: Wan Jiabing wanjiabing@vivo.com
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
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Sat, Mar 27, 2021 at 3:28 AM Wan Jiabing wanjiabing@vivo.com wrote:
struct dc_state has been declared at 273rd line. Remove the duplicate. Delete duplicate blank lines.
Can you split these into separate patches?
Alex
OK. But in fact, what I did is simple. The most important thing is removing the duplicate struct dc_state declaration at 585th line. Others are all deleting duplicate blank lines.
So maybe I should send two patchs, one is removing duplicate declaration, the other is deleting blank lines?
Signed-off-by: Wan Jiabing wanjiabing@vivo.com
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;
Removing the duplicate is here. And others are all deleting duplicate blank line.
I think they are in the same file. I want to remove the declaration first. By the way, I deleted the blank line.
Yours, Wan Jiabing
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
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Mon, Mar 29, 2021 at 9:36 PM 万家兵 wanjiabing@vivo.com wrote:
On Sat, Mar 27, 2021 at 3:28 AM Wan Jiabing wanjiabing@vivo.com wrote:
struct dc_state has been declared at 273rd line. Remove the duplicate. Delete duplicate blank lines.
Can you split these into separate patches?
Alex
OK. But in fact, what I did is simple. The most important thing is removing the duplicate struct dc_state declaration at 585th line. Others are all deleting duplicate blank lines.
So maybe I should send two patchs, one is removing duplicate declaration, the other is deleting blank lines?
Yes. There are so many whitespace changes in the commit that it's hard to see the functional change.
Alex
Signed-off-by: Wan Jiabing wanjiabing@vivo.com
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;
Removing the duplicate is here. And others are all deleting duplicate blank line.
I think they are in the same file. I want to remove the declaration first. By the way, I deleted the blank line.
Yours, Wan Jiabing
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
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Wan Jiabing -
万家兵