drm/i915: switch intel_wait_for_register to uncore

[linux.git] / drivers / gpu / drm / i915 / intel_hdcp.c

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 9ce09f67776d1f3c2a3dd0ec95316c8d3c02f7a1..86965fa377390a998ad9d40c79247d6e7d29678a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -225,7 +225,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)
        }
 
        /* Wait for the keys to load (500us) */
-       ret = __intel_wait_for_register(dev_priv, HDCP_KEY_STATUS,
+       ret = __intel_wait_for_register(&dev_priv->uncore, HDCP_KEY_STATUS,
                                        HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE,
                                        10, 1, &val);
        if (ret)
@@ -243,7 +243,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)
 static int intel_write_sha_text(struct drm_i915_private *dev_priv, u32 sha_text)
 {
        I915_WRITE(HDCP_SHA_TEXT, sha_text);
-       if (intel_wait_for_register(dev_priv, HDCP_REP_CTL,
+       if (intel_wait_for_register(&dev_priv->uncore, HDCP_REP_CTL,
                                    HDCP_SHA1_READY, HDCP_SHA1_READY, 1)) {
                DRM_ERROR("Timed out waiting for SHA1 ready\n");
                return -ETIMEDOUT;
@@ -474,7 +474,7 @@ int intel_hdcp_validate_v_prime(struct intel_digital_port *intel_dig_port,
 
        /* Tell the HW we're done with the hash and wait for it to ACK */
        I915_WRITE(HDCP_REP_CTL, rep_ctl | HDCP_SHA1_COMPLETE_HASH);
-       if (intel_wait_for_register(dev_priv, HDCP_REP_CTL,
+       if (intel_wait_for_register(&dev_priv->uncore, HDCP_REP_CTL,
                                    HDCP_SHA1_COMPLETE,
                                    HDCP_SHA1_COMPLETE, 1)) {
                DRM_ERROR("Timed out waiting for SHA1 complete\n");
@@ -604,7 +604,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,
        I915_WRITE(PORT_HDCP_CONF(port), HDCP_CONF_CAPTURE_AN);
 
        /* Wait for An to be acquired */
-       if (intel_wait_for_register(dev_priv, PORT_HDCP_STATUS(port),
+       if (intel_wait_for_register(&dev_priv->uncore, PORT_HDCP_STATUS(port),
                                    HDCP_STATUS_AN_READY,
                                    HDCP_STATUS_AN_READY, 1)) {
                DRM_ERROR("Timed out waiting for An\n");
@@ -685,7 +685,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,
        }
 
        /* Wait for encryption confirmation */
-       if (intel_wait_for_register(dev_priv, PORT_HDCP_STATUS(port),
+       if (intel_wait_for_register(&dev_priv->uncore, PORT_HDCP_STATUS(port),
                                    HDCP_STATUS_ENC, HDCP_STATUS_ENC,
                                    ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
                DRM_ERROR("Timed out waiting for encryption\n");
@@ -717,7 +717,8 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
 
        hdcp->hdcp_encrypted = false;
        I915_WRITE(PORT_HDCP_CONF(port), 0);
-       if (intel_wait_for_register(dev_priv, PORT_HDCP_STATUS(port), ~0, 0,
+       if (intel_wait_for_register(&dev_priv->uncore,
+                                   PORT_HDCP_STATUS(port), ~0, 0,
                                    ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
                DRM_ERROR("Failed to disable HDCP, timeout clearing status\n");
                return -ETIMEDOUT;
@@ -1477,7 +1478,7 @@ static int hdcp2_enable_encryption(struct intel_connector *connector)
                           CTL_LINK_ENCRYPTION_REQ);
        }
 
-       ret = intel_wait_for_register(dev_priv, HDCP2_STATUS_DDI(port),
+       ret = intel_wait_for_register(&dev_priv->uncore, HDCP2_STATUS_DDI(port),
                                      LINK_ENCRYPTION_STATUS,
                                      LINK_ENCRYPTION_STATUS,
                                      ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);
@@ -1498,7 +1499,7 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)
        I915_WRITE(HDCP2_CTL_DDI(port),
                   I915_READ(HDCP2_CTL_DDI(port)) & ~CTL_LINK_ENCRYPTION_REQ);
 
-       ret = intel_wait_for_register(dev_priv, HDCP2_STATUS_DDI(port),
+       ret = intel_wait_for_register(&dev_priv->uncore, HDCP2_STATUS_DDI(port),
                                      LINK_ENCRYPTION_STATUS, 0x0,
                                      ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);
        if (ret == -ETIMEDOUT)