Commit 5667ff5c authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher

amdgpu/dc: fix a bunch of misc whitespace.

This just aligns a few things with kernel style.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2016b641
...@@ -1473,10 +1473,10 @@ void decide_link_settings(struct dc_stream_state *stream, ...@@ -1473,10 +1473,10 @@ void decide_link_settings(struct dc_stream_state *stream,
return; return;
} }
/* search for the minimum link setting that: /* search for the minimum link setting that:
* 1. is supported according to the link training result * 1. is supported according to the link training result
* 2. could support the b/w requested by the timing * 2. could support the b/w requested by the timing
*/ */
while (current_link_setting.link_rate <= while (current_link_setting.link_rate <=
link->verified_link_cap.link_rate) { link->verified_link_cap.link_rate) {
link_bw = bandwidth_in_kbps_from_link_settings( link_bw = bandwidth_in_kbps_from_link_settings(
......
...@@ -429,14 +429,14 @@ union audio_sample_rates { ...@@ -429,14 +429,14 @@ union audio_sample_rates {
}; };
struct audio_speaker_flags { struct audio_speaker_flags {
uint32_t FL_FR:1; uint32_t FL_FR:1;
uint32_t LFE:1; uint32_t LFE:1;
uint32_t FC:1; uint32_t FC:1;
uint32_t RL_RR:1; uint32_t RL_RR:1;
uint32_t RC:1; uint32_t RC:1;
uint32_t FLC_FRC:1; uint32_t FLC_FRC:1;
uint32_t RLC_RRC:1; uint32_t RLC_RRC:1;
uint32_t SUPPORT_AI:1; uint32_t SUPPORT_AI:1;
}; };
struct audio_speaker_info { struct audio_speaker_info {
......
...@@ -1238,8 +1238,8 @@ void dce110_timing_generator_setup_global_swap_lock( ...@@ -1238,8 +1238,8 @@ void dce110_timing_generator_setup_global_swap_lock(
DCP_GSL_CONTROL, DCP_GSL_CONTROL,
DCP_GSL_HSYNC_FLIP_FORCE_DELAY); DCP_GSL_HSYNC_FLIP_FORCE_DELAY);
/* Keep signal low (pending high) during 6 lines. /* Keep signal low (pending high) during 6 lines.
* Also defines minimum interval before re-checking signal. */ * Also defines minimum interval before re-checking signal. */
set_reg_field_value(value, set_reg_field_value(value,
HFLIP_CHECK_DELAY, HFLIP_CHECK_DELAY,
DCP_GSL_CONTROL, DCP_GSL_CONTROL,
......
...@@ -2396,14 +2396,14 @@ static void program_all_pipe_in_tree( ...@@ -2396,14 +2396,14 @@ static void program_all_pipe_in_tree(
dcn10_power_on_fe(dc, pipe_ctx, context); dcn10_power_on_fe(dc, pipe_ctx, context);
/* temporary dcn1 wa: /* temporary dcn1 wa:
* watermark update requires toggle after a/b/c/d sets are programmed * watermark update requires toggle after a/b/c/d sets are programmed
* if hubp is pg then wm value doesn't get properaged to hubp * if hubp is pg then wm value doesn't get properaged to hubp
* need to toggle after ungate to ensure wm gets to hubp. * need to toggle after ungate to ensure wm gets to hubp.
* *
* final solution: we need to get SMU to do the toggle as * final solution: we need to get SMU to do the toggle as
* DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST is owned by SMU we should have * DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST is owned by SMU we should have
* both driver and fw accessing same register * both driver and fw accessing same register
*/ */
toggle_watermark_change_req(dc->hwseq); toggle_watermark_change_req(dc->hwseq);
update_dchubp_dpp(dc, pipe_ctx, context); update_dchubp_dpp(dc, pipe_ctx, context);
......
...@@ -697,37 +697,37 @@ static void min10_set_vm_context0_settings(struct mem_input *mem_input, ...@@ -697,37 +697,37 @@ static void min10_set_vm_context0_settings(struct mem_input *mem_input,
} }
static void min_set_viewport( static void min_set_viewport(
struct mem_input *mem_input, struct mem_input *mem_input,
const struct rect *viewport, const struct rect *viewport,
const struct rect *viewport_c) const struct rect *viewport_c)
{ {
struct dcn10_mem_input *mi = TO_DCN10_MEM_INPUT(mem_input); struct dcn10_mem_input *mi = TO_DCN10_MEM_INPUT(mem_input);
REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION, 0, REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION, 0,
PRI_VIEWPORT_WIDTH, viewport->width, PRI_VIEWPORT_WIDTH, viewport->width,
PRI_VIEWPORT_HEIGHT, viewport->height); PRI_VIEWPORT_HEIGHT, viewport->height);
REG_SET_2(DCSURF_PRI_VIEWPORT_START, 0, REG_SET_2(DCSURF_PRI_VIEWPORT_START, 0,
PRI_VIEWPORT_X_START, viewport->x, PRI_VIEWPORT_X_START, viewport->x,
PRI_VIEWPORT_Y_START, viewport->y); PRI_VIEWPORT_Y_START, viewport->y);
/*for stereo*/ /*for stereo*/
REG_SET_2(DCSURF_SEC_VIEWPORT_DIMENSION, 0, REG_SET_2(DCSURF_SEC_VIEWPORT_DIMENSION, 0,
SEC_VIEWPORT_WIDTH, viewport->width, SEC_VIEWPORT_WIDTH, viewport->width,
SEC_VIEWPORT_HEIGHT, viewport->height); SEC_VIEWPORT_HEIGHT, viewport->height);
REG_SET_2(DCSURF_SEC_VIEWPORT_START, 0, REG_SET_2(DCSURF_SEC_VIEWPORT_START, 0,
SEC_VIEWPORT_X_START, viewport->x, SEC_VIEWPORT_X_START, viewport->x,
SEC_VIEWPORT_Y_START, viewport->y); SEC_VIEWPORT_Y_START, viewport->y);
/* DC supports NV12 only at the moment */ /* DC supports NV12 only at the moment */
REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION_C, 0, REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION_C, 0,
PRI_VIEWPORT_WIDTH_C, viewport_c->width, PRI_VIEWPORT_WIDTH_C, viewport_c->width,
PRI_VIEWPORT_HEIGHT_C, viewport_c->height); PRI_VIEWPORT_HEIGHT_C, viewport_c->height);
REG_SET_2(DCSURF_PRI_VIEWPORT_START_C, 0, REG_SET_2(DCSURF_PRI_VIEWPORT_START_C, 0,
PRI_VIEWPORT_X_START_C, viewport_c->x, PRI_VIEWPORT_X_START_C, viewport_c->x,
PRI_VIEWPORT_Y_START_C, viewport_c->y); PRI_VIEWPORT_Y_START_C, viewport_c->y);
} }
void dcn10_mem_input_read_state(struct dcn10_mem_input *mi, void dcn10_mem_input_read_state(struct dcn10_mem_input *mi,
......
...@@ -183,9 +183,9 @@ struct dc_firmware_info { ...@@ -183,9 +183,9 @@ struct dc_firmware_info {
}; };
struct step_and_delay_info { struct step_and_delay_info {
uint32_t step; uint32_t step;
uint32_t delay; uint32_t delay;
uint32_t recommended_ref_div; uint32_t recommended_ref_div;
}; };
struct spread_spectrum_info { struct spread_spectrum_info {
...@@ -266,16 +266,16 @@ struct transmitter_configuration { ...@@ -266,16 +266,16 @@ struct transmitter_configuration {
#define NUMBER_OF_AVAILABLE_SCLK 5 #define NUMBER_OF_AVAILABLE_SCLK 5
struct i2c_reg_info { struct i2c_reg_info {
unsigned char i2c_reg_index; unsigned char i2c_reg_index;
unsigned char i2c_reg_val; unsigned char i2c_reg_val;
}; };
struct ext_hdmi_settings { struct ext_hdmi_settings {
unsigned char slv_addr; unsigned char slv_addr;
unsigned char reg_num; unsigned char reg_num;
struct i2c_reg_info reg_settings[9]; struct i2c_reg_info reg_settings[9];
unsigned char reg_num_6g; unsigned char reg_num_6g;
struct i2c_reg_info reg_settings_6g[3]; struct i2c_reg_info reg_settings_6g[3];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment