diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-08-18 16:49:52 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-08-22 17:53:05 +0300 |
| commit | b47ef0f793d9b67a998bb8468f4d81485897d833 (patch) | |
| tree | c77e840e4e5bf715066ba72cf5ad732fbe8afee1 /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | 41e61020e821487489526e50b8e2e223342b7b93 (diff) | |
| download | op-kernel-dev-b47ef0f793d9b67a998bb8468f4d81485897d833.zip op-kernel-dev-b47ef0f793d9b67a998bb8468f4d81485897d833.tar.gz | |
drm/i915: Check has_infoframes when enabling infoframes
has_infoframe is what tells us whether infoframes should be enabled, so
let's pass that instead of has_hdmi_sink to .set_infoframes().
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170818134958.15502-3-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index e8abea7..445b866 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1650,7 +1650,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder, intel_hdmi_prepare(encoder, pipe_config); intel_hdmi->set_infoframes(&encoder->base, - pipe_config->has_hdmi_sink, + pipe_config->has_infoframe, pipe_config, conn_state); } @@ -1670,7 +1670,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder, 0x2b247878); intel_hdmi->set_infoframes(&encoder->base, - pipe_config->has_hdmi_sink, + pipe_config->has_infoframe, pipe_config, conn_state); g4x_enable_hdmi(encoder, pipe_config, conn_state); @@ -1742,7 +1742,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder, chv_set_phy_signal_level(encoder, 128, 102, false); intel_hdmi->set_infoframes(&encoder->base, - pipe_config->has_hdmi_sink, + pipe_config->has_infoframe, pipe_config, conn_state); g4x_enable_hdmi(encoder, pipe_config, conn_state); |
