|
@@ -1384,7 +1384,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv,
|
|
|
enum pipe pipe, int reg)
|
|
|
{
|
|
|
u32 val = I915_READ(reg);
|
|
|
- WARN(hdmi_pipe_enabled(dev_priv, val, pipe),
|
|
|
+ WARN(hdmi_pipe_enabled(dev_priv, pipe, val),
|
|
|
"PCH HDMI (0x%08x) enabled on transcoder %c, should be disabled\n",
|
|
|
reg, pipe_name(pipe));
|
|
|
|
|
@@ -1404,13 +1404,13 @@ static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv,
|
|
|
|
|
|
reg = PCH_ADPA;
|
|
|
val = I915_READ(reg);
|
|
|
- WARN(adpa_pipe_enabled(dev_priv, val, pipe),
|
|
|
+ WARN(adpa_pipe_enabled(dev_priv, pipe, val),
|
|
|
"PCH VGA enabled on transcoder %c, should be disabled\n",
|
|
|
pipe_name(pipe));
|
|
|
|
|
|
reg = PCH_LVDS;
|
|
|
val = I915_READ(reg);
|
|
|
- WARN(lvds_pipe_enabled(dev_priv, val, pipe),
|
|
|
+ WARN(lvds_pipe_enabled(dev_priv, pipe, val),
|
|
|
"PCH LVDS enabled on transcoder %c, should be disabled\n",
|
|
|
pipe_name(pipe));
|
|
|
|
|
@@ -1874,7 +1874,7 @@ static void disable_pch_hdmi(struct drm_i915_private *dev_priv,
|
|
|
enum pipe pipe, int reg)
|
|
|
{
|
|
|
u32 val = I915_READ(reg);
|
|
|
- if (hdmi_pipe_enabled(dev_priv, val, pipe)) {
|
|
|
+ if (hdmi_pipe_enabled(dev_priv, pipe, val)) {
|
|
|
DRM_DEBUG_KMS("Disabling pch HDMI %x on pipe %d\n",
|
|
|
reg, pipe);
|
|
|
I915_WRITE(reg, val & ~PORT_ENABLE);
|
|
@@ -1896,12 +1896,12 @@ static void intel_disable_pch_ports(struct drm_i915_private *dev_priv,
|
|
|
|
|
|
reg = PCH_ADPA;
|
|
|
val = I915_READ(reg);
|
|
|
- if (adpa_pipe_enabled(dev_priv, val, pipe))
|
|
|
+ if (adpa_pipe_enabled(dev_priv, pipe, val))
|
|
|
I915_WRITE(reg, val & ~ADPA_DAC_ENABLE);
|
|
|
|
|
|
reg = PCH_LVDS;
|
|
|
val = I915_READ(reg);
|
|
|
- if (lvds_pipe_enabled(dev_priv, val, pipe)) {
|
|
|
+ if (lvds_pipe_enabled(dev_priv, pipe, val)) {
|
|
|
DRM_DEBUG_KMS("disable lvds on pipe %d val 0x%08x\n", pipe, val);
|
|
|
I915_WRITE(reg, val & ~LVDS_PORT_EN);
|
|
|
POSTING_READ(reg);
|