Commit dd6090f8 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Rename SDVO_AUDIO_ENABLE to HDMI_AUDIO_ENABLE

The "audio enable" bit on the SDVO/HDMI control register is only meant
for HDMI. Audio is never delivered over the SDVO bus. Rename the define
to reflect this fact.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190409144054.24561-4-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent dc49a56b
...@@ -4557,7 +4557,7 @@ enum { ...@@ -4557,7 +4557,7 @@ enum {
#define HDMI_MODE_SELECT_HDMI (1 << 9) /* HDMI only */ #define HDMI_MODE_SELECT_HDMI (1 << 9) /* HDMI only */
#define HDMI_MODE_SELECT_DVI (0 << 9) /* HDMI only */ #define HDMI_MODE_SELECT_DVI (0 << 9) /* HDMI only */
#define HDMI_COLOR_RANGE_16_235 (1 << 8) /* HDMI only */ #define HDMI_COLOR_RANGE_16_235 (1 << 8) /* HDMI only */
#define SDVO_AUDIO_ENABLE (1 << 6) #define HDMI_AUDIO_ENABLE (1 << 6) /* HDMI only */
/* VSYNC/HSYNC bits new with 965, default is to be set */ /* VSYNC/HSYNC bits new with 965, default is to be set */
#define SDVO_VSYNC_ACTIVE_HIGH (1 << 4) #define SDVO_VSYNC_ACTIVE_HIGH (1 << 4)
#define SDVO_HSYNC_ACTIVE_HIGH (1 << 3) #define SDVO_HSYNC_ACTIVE_HIGH (1 << 3)
......
...@@ -1807,7 +1807,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, ...@@ -1807,7 +1807,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
if (pipe_config->infoframes.enable) if (pipe_config->infoframes.enable)
pipe_config->has_infoframe = true; pipe_config->has_infoframe = true;
if (tmp & SDVO_AUDIO_ENABLE) if (tmp & HDMI_AUDIO_ENABLE)
pipe_config->has_audio = true; pipe_config->has_audio = true;
if (!HAS_PCH_SPLIT(dev_priv) && if (!HAS_PCH_SPLIT(dev_priv) &&
...@@ -1866,7 +1866,7 @@ static void g4x_enable_hdmi(struct intel_encoder *encoder, ...@@ -1866,7 +1866,7 @@ static void g4x_enable_hdmi(struct intel_encoder *encoder,
temp |= SDVO_ENABLE; temp |= SDVO_ENABLE;
if (pipe_config->has_audio) if (pipe_config->has_audio)
temp |= SDVO_AUDIO_ENABLE; temp |= HDMI_AUDIO_ENABLE;
I915_WRITE(intel_hdmi->hdmi_reg, temp); I915_WRITE(intel_hdmi->hdmi_reg, temp);
POSTING_READ(intel_hdmi->hdmi_reg); POSTING_READ(intel_hdmi->hdmi_reg);
...@@ -1888,7 +1888,7 @@ static void ibx_enable_hdmi(struct intel_encoder *encoder, ...@@ -1888,7 +1888,7 @@ static void ibx_enable_hdmi(struct intel_encoder *encoder,
temp |= SDVO_ENABLE; temp |= SDVO_ENABLE;
if (pipe_config->has_audio) if (pipe_config->has_audio)
temp |= SDVO_AUDIO_ENABLE; temp |= HDMI_AUDIO_ENABLE;
/* /*
* HW workaround, need to write this twice for issue * HW workaround, need to write this twice for issue
...@@ -1940,7 +1940,7 @@ static void cpt_enable_hdmi(struct intel_encoder *encoder, ...@@ -1940,7 +1940,7 @@ static void cpt_enable_hdmi(struct intel_encoder *encoder,
temp |= SDVO_ENABLE; temp |= SDVO_ENABLE;
if (pipe_config->has_audio) if (pipe_config->has_audio)
temp |= SDVO_AUDIO_ENABLE; temp |= HDMI_AUDIO_ENABLE;
/* /*
* WaEnableHDMI8bpcBefore12bpc:snb,ivb * WaEnableHDMI8bpcBefore12bpc:snb,ivb
...@@ -2000,7 +2000,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder, ...@@ -2000,7 +2000,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder,
temp = I915_READ(intel_hdmi->hdmi_reg); temp = I915_READ(intel_hdmi->hdmi_reg);
temp &= ~(SDVO_ENABLE | SDVO_AUDIO_ENABLE); temp &= ~(SDVO_ENABLE | HDMI_AUDIO_ENABLE);
I915_WRITE(intel_hdmi->hdmi_reg, temp); I915_WRITE(intel_hdmi->hdmi_reg, temp);
POSTING_READ(intel_hdmi->hdmi_reg); POSTING_READ(intel_hdmi->hdmi_reg);
......
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