amdgpu/dc: fix indentation on a couple of returns.
Subsystems (3)
PATCH 1/4 amdgpu/dc: fix indentation on a couple of returns.
From: Dave Airlie <[email protected]>
These were misaligned.
found by the cocci ifcol script.
--- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +2 -2
@@ -1472,7 +1472,7 @@ static enum bp_result get_integrated_info_v11( DATA_TABLES(integratedsysteminfo));if (info_v11 ==NULL ) -return BP_RESULT_BADBIOSTABLE ; +return BP_RESULT_BADBIOSTABLE ; info->gpu_cap_info =le32_to_cpu (info_v11->gpucapinfo);
@@ -1753,7 +1753,7 @@ static struct integrated_info *bios_parser_create_integrated_info( }if (construct_integrated_info (bp, info) ==BP_RESULT_OK ) -return info; +return info;kfree (info);
Signature · 6 lines
2.9.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20171003051102.325-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 2/4 amdgpu/dc: kill some deadcode in dc core.
From: Dave Airlie <[email protected]>
Moves one function to an inline, but kills a bunch of deadcode.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 91 -------------------------------- drivers/gpu/drm/amd/display/dc/dc.h | 9 ++-- 2 files changed, 4 insertions(+), 96 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -91
@@ -575,30 +575,6 @@ static bool construct(struct dc *dc,return false; } -/* -void ProgramPixelDurationV(unsigned int pixelClockInKHz ) -{ -fixed31_32 pixel_duration = Fixed31_32(100000000, pixelClockInKHz) * 10; -unsigned int pixDurationInPico = round(pixel_duration); - -DPG_PIPE_ARBITRATION_CONTROL1 arb_control; - -arb_control.u32All = ReadReg (mmDPGV0_PIPE_ARBITRATION_CONTROL1); -arb_control.bits.PIXEL_DURATION = pixDurationInPico; -WriteReg (mmDPGV0_PIPE_ARBITRATION_CONTROL1, arb_control.u32All); - -arb_control.u32All = ReadReg (mmDPGV1_PIPE_ARBITRATION_CONTROL1); -arb_control.bits.PIXEL_DURATION = pixDurationInPico; -WriteReg (mmDPGV1_PIPE_ARBITRATION_CONTROL1, arb_control.u32All); - -WriteReg (mmDPGV0_PIPE_ARBITRATION_CONTROL2, 0x4000800); -WriteReg (mmDPGV0_REPEATER_PROGRAM, 0x11); - -WriteReg (mmDPGV1_PIPE_ARBITRATION_CONTROL2, 0x4000800); -WriteReg (mmDPGV1_REPEATER_PROGRAM, 0x11); -} -*/ -/******************************************************************************* * Public functions ******************************************************************************/
@@ -1518,28 +1494,6 @@ struct dc_stream_state *dc_get_stream_at_index(struct dc *dc, uint8_t i)return NULL ; } -struct dc_link *dc_get_link_at_index (struct dc *dc,uint32_t link_index) -{ -return dc->links[link_index]; -} - -const struct graphics_object_id dc_get_link_id_at_index ( -struct dc *dc,uint32_t link_index) -{ -return dc->links[link_index]->link_id; -} - -enum dc_irq_source dc_get_hpd_irq_source_at_index ( -struct dc *dc,uint32_t link_index) -{ -return dc->links[link_index]->irq_source_hpd; -} - -const struct audio **dc_get_audios (struct dc *dc) -{ -return (const struct audio **)dc->res_pool->audios; -} - enum dc_irq_source dc_interrupt_to_irq_source( struct dc *dc, uint32_t src_id,
@@ -1789,17 +1743,6 @@ struct dc_sink *dc_link_add_remote_sink(return NULL ; } -void dc_link_set_sink (struct dc_link *link,struct dc_sink *sink) -{ - link->local_sink = sink; - -if (sink ==NULL ) { - link->type = dc_connection_none; - }else { - link->type = dc_connection_single; - } -} -void dc_link_remove_remote_sink (struct dc_link *link,struct dc_sink *sink) {int i;
@@ -1825,37 +1768,3 @@ void dc_link_remove_remote_sink(struct dc_link *link, struct dc_sink *sink) } } } - -bool dc_init_dchub (struct dc *dc,struct dchub_init_data *dh_data) -{ -int i; -struct mem_input *mi =NULL ; - -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (dc->res_pool->mis[i] !=NULL ) { - mi = dc->res_pool->mis[i]; -break ; - } - } -if (mi ==NULL ) { -dm_error ("no mem_input!\n" ); -return false; - } - -if (dc->hwss.update_dchub) - dc->hwss.update_dchub (dc->hwseq, dh_data); -else -ASSERT (dc->hwss.update_dchub); - - -return true; - -} - -void dc_log_hw_state (struct dc *dc) -{ - -if (dc->hwss.log_hw_state) - dc->hwss.log_hw_state (dc); -} -
drivers/gpu/drm/amd/display/dc/dc.h +4 -5
@@ -277,10 +277,6 @@ struct dc *dc_create(const struct dc_init_data *init_params);void dc_destroy (struct dc **dc); -bool dc_init_dchub (struct dc *dc,struct dchub_init_data *dh_data); - -void dc_log_hw_state (struct dc *dc); -/******************************************************************************* * Surface Interfaces ******************************************************************************/
@@ -866,7 +862,10 @@ const struct dc_link_status *dc_link_get_status(const struct dc_link *dc_link);* boot time. They cannot be created or destroyed. * Use dc_get_caps() to get number of links. */ -struct dc_link *dc_get_link_at_index (struct dc *dc,uint32_t link_index); +static inline struct dc_link *dc_get_link_at_index (struct dc *dc,uint32_t link_index) +{ +return dc->links[link_index]; +}/* Set backlight level of an embedded panel (eDP, LVDS). */ bool dc_link_set_backlight_level(const struct dc_link *dc_link, uint32_t level,
Signature · 6 lines
2.9.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 amdgpu/dc: set a bunch of functions to static.
In reply to a message not in the archiveFrom: Dave Airlie <[email protected]>
All of these are unused outside the file they are in.
--- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 3 +-- drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 6 +++--- 8 files changed, 10 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +1 -1
@@ -531,7 +531,7 @@ static enum bp_result bios_parser_get_hpd_info(struct dc_bios *dcb,return BP_RESULT_NORECORD ; } -enum bp_result bios_parser_get_device_tag_record ( +static enum bp_result bios_parser_get_device_tag_record (struct bios_parser *bp,ATOM_OBJECT *object,ATOM_CONNECTOR_DEVICE_TAG_RECORD **record)
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +1 -1
@@ -1135,7 +1135,7 @@ bool dcn_validate_bandwidth(return false; } -unsigned int dcn_find_normalized_clock_vdd_Level ( +static unsigned int dcn_find_normalized_clock_vdd_Level (const struct dc *dc,enum dm_pp_clock_type clocks_type,int clocks_in_khz)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -1
@@ -327,7 +327,7 @@ static void set_test_pattern( cust_pattern_size); } -void set_dither_option (struct dc_stream_state *stream, +static void set_dither_option (struct dc_stream_state *stream,enum dc_dither_option option) {struct bit_depth_reduction_params params;
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -208,7 +208,7 @@ static bool detect_sink(struct dc_link *link, enum dc_connection_type *type)return false; } -enum ddc_transaction_type get_ddc_transaction_type ( +static enum ddc_transaction_type get_ddc_transaction_type (enum signal_type sink_signal) {enum ddc_transaction_type transaction_type =DDC_TRANSACTION_TYPE_NONE ;
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -1
@@ -1209,7 +1209,7 @@ static inline bool reached_minimum_link_rate(enum dc_link_rate link_rate)return link_rate <=LINK_RATE_LOW ; } -enum dc_lane_count reduce_lane_count (enum dc_lane_count lane_count) +static enum dc_lane_count reduce_lane_count (enum dc_lane_count lane_count) {switch (lane_count) {case LANE_COUNT_FOUR :
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +1 -1
@@ -110,7 +110,7 @@ void dp_enable_link_phy(dp_receiver_power_ctrl (link, true); } -bool edp_receiver_ready_T9 (struct dc_link *link) +static bool edp_receiver_ready_T9 (struct dc_link *link) {unsigned int tries =0 ;unsigned char sinkstatus =0 ;
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +1 -2
@@ -833,8 +833,7 @@ void dce_aud_wall_dto_setup( } } -bool dce_aud_endpoint_valid ( -struct audio *audio) +static bool dce_aud_endpoint_valid (struct audio *audio) {uint32_t value;uint32_t port_connectivity;
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +3 -3
@@ -1183,7 +1183,7 @@ static const struct audio_clock_info audio_clock_info_table_48bpc[14] = { }; -union audio_cea_channels speakers_to_channels ( +static union audio_cea_channels speakers_to_channels (struct audio_speaker_flags speaker_flags) {union audio_cea_channels cea_channels = {0 };
@@ -1217,7 +1217,7 @@ union audio_cea_channels speakers_to_channels(return cea_channels; } -uint32_t calc_max_audio_packets_per_line ( +static uint32_t calc_max_audio_packets_per_line (const struct audio_crtc_info *crtc_info) {uint32_t max_packets_per_line;
@@ -1238,7 +1238,7 @@ uint32_t calc_max_audio_packets_per_line(return max_packets_per_line; } -void get_audio_clock_info( +static void get_audio_clock_info( enum dc_color_depth color_depth, uint32_t crtc_pixel_clock_in_khz, uint32_t actual_pixel_clock_in_khz,
Signature · 6 lines
2.9.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 amdgpu/dc: kill a bunch of dead code.
In reply to a message not in the archiveFrom: Dave Airlie <[email protected]>
None of this code is used currently.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 101 -------------------------- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 15 ---- drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 34 --------- 3 files changed, 150 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -101
@@ -1559,107 +1559,6 @@ void dc_resume(struct dc *dc)core_link_resume (dc->links[i]); } -bool dc_read_aux_dpcd ( -struct dc *dc, -uint32_t link_index, -uint32_t address, -uint8_t *data, -uint32_t size) -{ - -struct dc_link *link = dc->links[link_index]; -enum ddc_result r =dal_ddc_service_read_dpcd_data ( - link->ddc, - false, -I2C_MOT_UNDEF , - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_write_aux_dpcd ( -struct dc *dc, -uint32_t link_index, -uint32_t address, -const uint8_t *data, -uint32_t size) -{ -struct dc_link *link = dc->links[link_index]; - -enum ddc_result r =dal_ddc_service_write_dpcd_data ( - link->ddc, - false, -I2C_MOT_UNDEF , - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_read_aux_i2c ( -struct dc *dc, -uint32_t link_index, -enum i2c_mot_mode mot, -uint32_t address, -uint8_t *data, -uint32_t size) -{ - -struct dc_link *link = dc->links[link_index]; -enum ddc_result r =dal_ddc_service_read_dpcd_data ( - link->ddc, - true, - mot, - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_write_aux_i2c ( -struct dc *dc, -uint32_t link_index, -enum i2c_mot_mode mot, -uint32_t address, -const uint8_t *data, -uint32_t size) -{ -struct dc_link *link = dc->links[link_index]; - -enum ddc_result r =dal_ddc_service_write_dpcd_data ( - link->ddc, - true, - mot, - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_query_ddc_data ( -struct dc *dc, -uint32_t link_index, -uint32_t address, -uint8_t *write_buf, -uint32_t write_size, -uint8_t *read_buf, -uint32_t read_size) { - - -struct dc_link *link = dc->links[link_index]; - -bool result =dal_ddc_service_query_ddc_data ( - link->ddc, - address, - write_buf, - write_size, - read_buf, - read_size); - -return result; -} - bool dc_submit_i2c( struct dc *dc, uint32_t link_index,
drivers/gpu/drm/amd/display/dc/core/dc_link.c +0 -15
@@ -1857,21 +1857,6 @@ bool dc_link_set_backlight_level(const struct dc_link *link, uint32_t level,return true; } - -bool dc_link_set_abm_disable (const struct dc_link *link) -{ -struct dc *core_dc = link->ctx->dc; -struct abm *abm = core_dc->res_pool->abm; - -if ((abm ==NULL ) || (abm->funcs->set_backlight_level ==NULL )) -return false; - - abm->funcs->set_abm_immediate_disable (abm); - -return true; -} - -bool dc_link_set_psr_enable (const struct dc_link *link,bool enable,bool wait) {struct dc *core_dc = link->ctx->dc;
drivers/gpu/drm/amd/display/dc/core/dc_sink.c +0 -34
@@ -99,40 +99,6 @@ struct dc_sink *dc_sink_create(const struct dc_sink_init_data *init_params)return NULL ; } -bool dc_sink_get_container_id (struct dc_sink *dc_sink,struct dc_container_id *container_id) -{ -if (dc_sink && container_id && dc_sink->dc_container_id) { -memmove (&container_id->guid, &dc_sink->dc_container_id->guid, -sizeof (container_id->guid)); -memmove (&container_id->portId, &dc_sink->dc_container_id->portId, -sizeof (container_id->portId)); - container_id->manufacturerName = dc_sink->dc_container_id->manufacturerName; - container_id->productCode = dc_sink->dc_container_id->productCode; -return true; - } -return false; -} - -bool dc_sink_set_container_id (struct dc_sink *dc_sink,const struct dc_container_id *container_id) -{ -if (dc_sink && container_id) { -if (!dc_sink->dc_container_id) - dc_sink->dc_container_id =kzalloc (sizeof (*dc_sink->dc_container_id), -GFP_KERNEL ); - -if (dc_sink->dc_container_id) { -memmove (&dc_sink->dc_container_id->guid, &container_id->guid, -sizeof (container_id->guid)); -memmove (&dc_sink->dc_container_id->portId, &container_id->portId, -sizeof (container_id->portId)); - dc_sink->dc_container_id->manufacturerName = container_id->manufacturerName; - dc_sink->dc_container_id->productCode = container_id->productCode; -return true; - } - } -return false; -} -/******************************************************************************* * Protected functions - visible only inside of DC (not visible in DM) ******************************************************************************/
Signature · 6 lines
2.9.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20171003051102.325-4-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Harry Wentland
Reviewed-byRe: [PATCH 4/4] amdgpu/dc: kill a bunch of dead code.
Quoted 5 lines · Dave Airlie
From: Dave Airlie <[email protected]>
None of this code is used currently.
Signed-off-by Dave Airlie <[email protected]>
Series is
Harry
Quoted 180 lines
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 101 -------------------------- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 15 ---- drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 34 --------- 3 files changed, 150 deletions(-)drivers/gpu/drm/amd/display/dc/core/dc.c +0
-101@@ -1559,107 +1559,6 @@ void dc_resume(struct dc *dc)core_link_resume (dc->links[i]); } -bool dc_read_aux_dpcd ( -struct dc *dc, -uint32_t link_index, -uint32_t address, -uint8_t *data, -uint32_t size) -{ - -struct dc_link *link = dc->links[link_index]; -enum ddc_result r =dal_ddc_service_read_dpcd_data ( - link->ddc, - false, -I2C_MOT_UNDEF , - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_write_aux_dpcd ( -struct dc *dc, -uint32_t link_index, -uint32_t address, -const uint8_t *data, -uint32_t size) -{ -struct dc_link *link = dc->links[link_index]; - -enum ddc_result r =dal_ddc_service_write_dpcd_data ( - link->ddc, - false, -I2C_MOT_UNDEF , - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_read_aux_i2c ( -struct dc *dc, -uint32_t link_index, -enum i2c_mot_mode mot, -uint32_t address, -uint8_t *data, -uint32_t size) -{ - -struct dc_link *link = dc->links[link_index]; -enum ddc_result r =dal_ddc_service_read_dpcd_data ( - link->ddc, - true, - mot, - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_write_aux_i2c ( -struct dc *dc, -uint32_t link_index, -enum i2c_mot_mode mot, -uint32_t address, -const uint8_t *data, -uint32_t size) -{ -struct dc_link *link = dc->links[link_index]; - -enum ddc_result r =dal_ddc_service_write_dpcd_data ( - link->ddc, - true, - mot, - address, - data, - size); -return r ==DDC_RESULT_SUCESSFULL ; -} - -bool dc_query_ddc_data ( -struct dc *dc, -uint32_t link_index, -uint32_t address, -uint8_t *write_buf, -uint32_t write_size, -uint8_t *read_buf, -uint32_t read_size) { - - -struct dc_link *link = dc->links[link_index]; - -bool result =dal_ddc_service_query_ddc_data ( - link->ddc, - address, - write_buf, - write_size, - read_buf, - read_size); - -return result; -} - bool dc_submit_i2c( struct dc *dc, uint32_t link_index,drivers/gpu/drm/amd/display/dc/core/dc_link.c +0
-15@@ -1857,21 +1857,6 @@ bool dc_link_set_backlight_level(const struct dc_link *link, uint32_t level,return true; } - -bool dc_link_set_abm_disable (const struct dc_link *link) -{ -struct dc *core_dc = link->ctx->dc; -struct abm *abm = core_dc->res_pool->abm; - -if ((abm ==NULL ) || (abm->funcs->set_backlight_level ==NULL )) -return false; - - abm->funcs->set_abm_immediate_disable (abm); - -return true; -} - -bool dc_link_set_psr_enable (const struct dc_link *link,bool enable,bool wait) {struct dc *core_dc = link->ctx->dc;drivers/gpu/drm/amd/display/dc/core/dc_sink.c +0
-27@@ -99,40 +99,6 @@ struct dc_sink *dc_sink_create(const struct dc_sink_init_data *init_params)return NULL ; } -bool dc_sink_get_container_id (struct dc_sink *dc_sink,struct dc_container_id *container_id) -{ -if (dc_sink && container_id && dc_sink->dc_container_id) { -memmove (&container_id->guid, &dc_sink->dc_container_id->guid, -sizeof (container_id->guid)); -memmove (&container_id->portId, &dc_sink->dc_container_id->portId, -sizeof (container_id->portId)); - container_id->manufacturerName = dc_sink->dc_container_id->manufacturerName; - container_id->productCode = dc_sink->dc_container_id->productCode; -return true; - } -return false; -} - -bool dc_sink_set_container_id (struct dc_sink *dc_sink,const struct dc_container_id *container_id) -{ -if (dc_sink && container_id) { -if (!dc_sink->dc_container_id) - dc_sink->dc_container_id =kzalloc (sizeof (*dc_sink->dc_container_id), -GFP_KERNEL ); - -if (dc_sink->dc_container_id) { -memmove (&dc_sink->dc_container_id->guid, &container_id->guid, -sizeof (container_id->guid)); -memmove (&dc_sink->dc_container_id->portId, &container_id->portId, -sizeof (container_id->portId)); - dc_sink->dc_container_id->manufacturerName = container_id->manufacturerName;
drivers/gpu/drm/amd/display/dc/core/dc_sink.c struct dc_sink *dc_sink_create(const struct dc_sink_init_data *init_params) · line 104
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/core/dc_sink.c +0
-7- dc_sink->dc_container_id->productCode = container_id->productCode; -return true; - } - } -return false; -} -/******************************************************************************* * Protected functions - visible only inside of DC (not visible in DM) ******************************************************************************/
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx