@@ -3380,11 +3380,10 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state,
3380
3380
const struct intel_crtc_state * crtc_state ,
3381
3381
const struct drm_connector_state * conn_state )
3382
3382
{
3383
- struct intel_digital_port * intel_dig_port = enc_to_dig_port (encoder );
3384
- struct intel_hdmi * intel_hdmi = & intel_dig_port -> hdmi ;
3383
+ struct intel_digital_port * dig_port = enc_to_dig_port (encoder );
3384
+ struct intel_hdmi * intel_hdmi = & dig_port -> hdmi ;
3385
3385
struct drm_i915_private * dev_priv = to_i915 (encoder -> base .dev );
3386
3386
int level = intel_ddi_hdmi_level (encoder );
3387
- struct intel_digital_port * dig_port = enc_to_dig_port (encoder );
3388
3387
3389
3388
intel_dp_dual_mode_set_tmds_output (intel_hdmi , true);
3390
3389
intel_ddi_clk_select (encoder , crtc_state );
@@ -3411,9 +3410,9 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state,
3411
3410
3412
3411
intel_ddi_enable_pipe_clock (encoder , crtc_state );
3413
3412
3414
- intel_dig_port -> set_infoframes (encoder ,
3415
- crtc_state -> has_infoframe ,
3416
- crtc_state , conn_state );
3413
+ dig_port -> set_infoframes (encoder ,
3414
+ crtc_state -> has_infoframe ,
3415
+ crtc_state , conn_state );
3417
3416
}
3418
3417
3419
3418
static void intel_ddi_pre_enable (struct intel_atomic_state * state ,
0 commit comments