drm/i915: split out intel_pcode.[ch] to separate file
authorJani Nikula <jani.nikula@intel.com>
Thu, 14 Oct 2021 10:28:57 +0000 (13:28 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 14 Oct 2021 15:04:17 +0000 (18:04 +0300)
The snb+ pcode mailbox code is not sideband, so split it out to a
separate file. As can be seen from the #include changes, very few places
use both sideband and pcode.

Code movement only.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/185deb18eb739e5ae019e27834b9997dcc1347bc.1634207064.git.jani.nikula@intel.com
17 files changed:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/intel_bw.c
drivers/gpu/drm/i915/display/intel_cdclk.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_power.c
drivers/gpu/drm/i915/display/intel_hdcp.c
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c
drivers/gpu/drm/i915/gt/intel_llc.c
drivers/gpu/drm/i915/gt/intel_rc6.c
drivers/gpu/drm/i915/gt/intel_rps.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_dram.c
drivers/gpu/drm/i915/intel_pcode.c [new file with mode: 0644]
drivers/gpu/drm/i915/intel_pcode.h [new file with mode: 0644]
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sideband.c
drivers/gpu/drm/i915/intel_sideband.h

index d50d2b1..e44c725 100644 (file)
@@ -47,6 +47,7 @@ i915-y += i915_drv.o \
          intel_dram.o \
          intel_memory_region.o \
          intel_pch.o \
+         intel_pcode.o \
          intel_pm.o \
          intel_region_ttm.o \
          intel_runtime_pm.o \
index 4b94256..8d9d888 100644 (file)
@@ -9,8 +9,8 @@
 #include "intel_bw.h"
 #include "intel_cdclk.h"
 #include "intel_display_types.h"
+#include "intel_pcode.h"
 #include "intel_pm.h"
-#include "intel_sideband.h"
 
 /* Parameters for Qclk Geyserville (QGV) */
 struct intel_qgv_point {
index 44bb187..9e466d8 100644 (file)
@@ -28,8 +28,8 @@
 #include "intel_cdclk.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
+#include "intel_pcode.h"
 #include "intel_psr.h"
-#include "intel_sideband.h"
 #include "vlv_sideband.h"
 
 /**
index 3602fdb..b070cdc 100644 (file)
 #include "intel_dp_link_training.h"
 #include "intel_dpt.h"
 #include "intel_fbc.h"
-#include "intel_fdi.h"
 #include "intel_fbdev.h"
+#include "intel_fdi.h"
 #include "intel_fifo_underrun.h"
 #include "intel_frontbuffer.h"
 #include "intel_hdcp.h"
 #include "intel_hotplug.h"
 #include "intel_overlay.h"
 #include "intel_panel.h"
+#include "intel_pcode.h"
 #include "intel_pipe_crc.h"
 #include "intel_plane_initial.h"
 #include "intel_pm.h"
index 7095692..1672604 100644 (file)
@@ -15,9 +15,9 @@
 #include "intel_dpio_phy.h"
 #include "intel_dpll.h"
 #include "intel_hotplug.h"
+#include "intel_pcode.h"
 #include "intel_pm.h"
 #include "intel_pps.h"
-#include "intel_sideband.h"
 #include "intel_snps_phy.h"
 #include "intel_tc.h"
 #include "intel_vga.h"
index 9b9fd9d..4509fe7 100644 (file)
 
 #include "i915_drv.h"
 #include "i915_reg.h"
-#include "intel_display_power.h"
+#include "intel_connector.h"
 #include "intel_de.h"
+#include "intel_display_power.h"
 #include "intel_display_types.h"
 #include "intel_hdcp.h"
-#include "intel_sideband.h"
-#include "intel_connector.h"
+#include "intel_pcode.h"
 
 #define KEY_LOAD_TRIES 5
 #define HDCP2_LC_RETRY_CNT                     3
index 1e00fa6..b3ddb91 100644 (file)
 #include "intel_gt_pm.h"
 #include "intel_gt_pm_debugfs.h"
 #include "intel_llc.h"
+#include "intel_pcode.h"
 #include "intel_rc6.h"
 #include "intel_rps.h"
 #include "intel_runtime_pm.h"
-#include "intel_sideband.h"
 #include "intel_uncore.h"
 #include "vlv_sideband.h"
 
index eb1a15d..9ca88f8 100644 (file)
@@ -8,7 +8,7 @@
 #include "i915_drv.h"
 #include "intel_gt.h"
 #include "intel_llc.h"
-#include "intel_sideband.h"
+#include "intel_pcode.h"
 
 struct ia_constants {
        unsigned int min_gpu_freq;
index 799d382..43093dd 100644 (file)
@@ -9,8 +9,8 @@
 #include "i915_vgpu.h"
 #include "intel_gt.h"
 #include "intel_gt_pm.h"
+#include "intel_pcode.h"
 #include "intel_rc6.h"
-#include "intel_sideband.h"
 
 /**
  * DOC: RC6
index c47024d..5e275f8 100644 (file)
@@ -11,8 +11,8 @@
 #include "intel_gt_clock_utils.h"
 #include "intel_gt_irq.h"
 #include "intel_gt_pm_irq.h"
+#include "intel_pcode.h"
 #include "intel_rps.h"
-#include "intel_sideband.h"
 #include "vlv_sideband.h"
 #include "../../../platform/x86/intel_ips.h"
 
index c65c374..b18a250 100644 (file)
@@ -84,9 +84,9 @@
 #include "intel_dram.h"
 #include "intel_gvt.h"
 #include "intel_memory_region.h"
+#include "intel_pcode.h"
 #include "intel_pm.h"
 #include "intel_region_ttm.h"
-#include "intel_sideband.h"
 #include "vlv_suspend.h"
 
 static const struct drm_driver driver;
index 30a0cab..da3ad59 100644 (file)
@@ -5,7 +5,7 @@
 
 #include "i915_drv.h"
 #include "intel_dram.h"
-#include "intel_sideband.h"
+#include "intel_pcode.h"
 
 struct dram_dimm_info {
        u16 size;
diff --git a/drivers/gpu/drm/i915/intel_pcode.c b/drivers/gpu/drm/i915/intel_pcode.c
new file mode 100644 (file)
index 0000000..e8c886e
--- /dev/null
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2013-2021 Intel Corporation
+ */
+
+#include "i915_drv.h"
+#include "intel_pcode.h"
+
+static int gen6_check_mailbox_status(u32 mbox)
+{
+       switch (mbox & GEN6_PCODE_ERROR_MASK) {
+       case GEN6_PCODE_SUCCESS:
+               return 0;
+       case GEN6_PCODE_UNIMPLEMENTED_CMD:
+               return -ENODEV;
+       case GEN6_PCODE_ILLEGAL_CMD:
+               return -ENXIO;
+       case GEN6_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
+       case GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
+               return -EOVERFLOW;
+       case GEN6_PCODE_TIMEOUT:
+               return -ETIMEDOUT;
+       default:
+               MISSING_CASE(mbox & GEN6_PCODE_ERROR_MASK);
+               return 0;
+       }
+}
+
+static int gen7_check_mailbox_status(u32 mbox)
+{
+       switch (mbox & GEN6_PCODE_ERROR_MASK) {
+       case GEN6_PCODE_SUCCESS:
+               return 0;
+       case GEN6_PCODE_ILLEGAL_CMD:
+               return -ENXIO;
+       case GEN7_PCODE_TIMEOUT:
+               return -ETIMEDOUT;
+       case GEN7_PCODE_ILLEGAL_DATA:
+               return -EINVAL;
+       case GEN11_PCODE_ILLEGAL_SUBCOMMAND:
+               return -ENXIO;
+       case GEN11_PCODE_LOCKED:
+               return -EBUSY;
+       case GEN11_PCODE_REJECTED:
+               return -EACCES;
+       case GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
+               return -EOVERFLOW;
+       default:
+               MISSING_CASE(mbox & GEN6_PCODE_ERROR_MASK);
+               return 0;
+       }
+}
+
+static int __sandybridge_pcode_rw(struct drm_i915_private *i915,
+                                 u32 mbox, u32 *val, u32 *val1,
+                                 int fast_timeout_us,
+                                 int slow_timeout_ms,
+                                 bool is_read)
+{
+       struct intel_uncore *uncore = &i915->uncore;
+
+       lockdep_assert_held(&i915->sb_lock);
+
+       /*
+        * GEN6_PCODE_* are outside of the forcewake domain, we can use
+        * intel_uncore_read/write_fw variants to reduce the amount of work
+        * required when reading/writing.
+        */
+
+       if (intel_uncore_read_fw(uncore, GEN6_PCODE_MAILBOX) & GEN6_PCODE_READY)
+               return -EAGAIN;
+
+       intel_uncore_write_fw(uncore, GEN6_PCODE_DATA, *val);
+       intel_uncore_write_fw(uncore, GEN6_PCODE_DATA1, val1 ? *val1 : 0);
+       intel_uncore_write_fw(uncore,
+                             GEN6_PCODE_MAILBOX, GEN6_PCODE_READY | mbox);
+
+       if (__intel_wait_for_register_fw(uncore,
+                                        GEN6_PCODE_MAILBOX,
+                                        GEN6_PCODE_READY, 0,
+                                        fast_timeout_us,
+                                        slow_timeout_ms,
+                                        &mbox))
+               return -ETIMEDOUT;
+
+       if (is_read)
+               *val = intel_uncore_read_fw(uncore, GEN6_PCODE_DATA);
+       if (is_read && val1)
+               *val1 = intel_uncore_read_fw(uncore, GEN6_PCODE_DATA1);
+
+       if (GRAPHICS_VER(i915) > 6)
+               return gen7_check_mailbox_status(mbox);
+       else
+               return gen6_check_mailbox_status(mbox);
+}
+
+int sandybridge_pcode_read(struct drm_i915_private *i915, u32 mbox,
+                          u32 *val, u32 *val1)
+{
+       int err;
+
+       mutex_lock(&i915->sb_lock);
+       err = __sandybridge_pcode_rw(i915, mbox, val, val1,
+                                    500, 20,
+                                    true);
+       mutex_unlock(&i915->sb_lock);
+
+       if (err) {
+               drm_dbg(&i915->drm,
+                       "warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n",
+                       mbox, __builtin_return_address(0), err);
+       }
+
+       return err;
+}
+
+int sandybridge_pcode_write_timeout(struct drm_i915_private *i915,
+                                   u32 mbox, u32 val,
+                                   int fast_timeout_us,
+                                   int slow_timeout_ms)
+{
+       int err;
+
+       mutex_lock(&i915->sb_lock);
+       err = __sandybridge_pcode_rw(i915, mbox, &val, NULL,
+                                    fast_timeout_us, slow_timeout_ms,
+                                    false);
+       mutex_unlock(&i915->sb_lock);
+
+       if (err) {
+               drm_dbg(&i915->drm,
+                       "warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n",
+                       val, mbox, __builtin_return_address(0), err);
+       }
+
+       return err;
+}
+
+static bool skl_pcode_try_request(struct drm_i915_private *i915, u32 mbox,
+                                 u32 request, u32 reply_mask, u32 reply,
+                                 u32 *status)
+{
+       *status = __sandybridge_pcode_rw(i915, mbox, &request, NULL,
+                                        500, 0,
+                                        true);
+
+       return *status || ((request & reply_mask) == reply);
+}
+
+/**
+ * skl_pcode_request - send PCODE request until acknowledgment
+ * @i915: device private
+ * @mbox: PCODE mailbox ID the request is targeted for
+ * @request: request ID
+ * @reply_mask: mask used to check for request acknowledgment
+ * @reply: value used to check for request acknowledgment
+ * @timeout_base_ms: timeout for polling with preemption enabled
+ *
+ * Keep resending the @request to @mbox until PCODE acknowledges it, PCODE
+ * reports an error or an overall timeout of @timeout_base_ms+50 ms expires.
+ * The request is acknowledged once the PCODE reply dword equals @reply after
+ * applying @reply_mask. Polling is first attempted with preemption enabled
+ * for @timeout_base_ms and if this times out for another 50 ms with
+ * preemption disabled.
+ *
+ * Returns 0 on success, %-ETIMEDOUT in case of a timeout, <0 in case of some
+ * other error as reported by PCODE.
+ */
+int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,
+                     u32 reply_mask, u32 reply, int timeout_base_ms)
+{
+       u32 status;
+       int ret;
+
+       mutex_lock(&i915->sb_lock);
+
+#define COND \
+       skl_pcode_try_request(i915, mbox, request, reply_mask, reply, &status)
+
+       /*
+        * Prime the PCODE by doing a request first. Normally it guarantees
+        * that a subsequent request, at most @timeout_base_ms later, succeeds.
+        * _wait_for() doesn't guarantee when its passed condition is evaluated
+        * first, so send the first request explicitly.
+        */
+       if (COND) {
+               ret = 0;
+               goto out;
+       }
+       ret = _wait_for(COND, timeout_base_ms * 1000, 10, 10);
+       if (!ret)
+               goto out;
+
+       /*
+        * The above can time out if the number of requests was low (2 in the
+        * worst case) _and_ PCODE was busy for some reason even after a
+        * (queued) request and @timeout_base_ms delay. As a workaround retry
+        * the poll with preemption disabled to maximize the number of
+        * requests. Increase the timeout from @timeout_base_ms to 50ms to
+        * account for interrupts that could reduce the number of these
+        * requests, and for any quirks of the PCODE firmware that delays
+        * the request completion.
+        */
+       drm_dbg_kms(&i915->drm,
+                   "PCODE timeout, retrying with preemption disabled\n");
+       drm_WARN_ON_ONCE(&i915->drm, timeout_base_ms > 3);
+       preempt_disable();
+       ret = wait_for_atomic(COND, 50);
+       preempt_enable();
+
+out:
+       mutex_unlock(&i915->sb_lock);
+       return ret ? ret : status;
+#undef COND
+}
+
+int intel_pcode_init(struct drm_i915_private *i915)
+{
+       int ret = 0;
+
+       if (!IS_DGFX(i915))
+               return ret;
+
+       ret = skl_pcode_request(i915, DG1_PCODE_STATUS,
+                               DG1_UNCORE_GET_INIT_STATUS,
+                               DG1_UNCORE_INIT_STATUS_COMPLETE,
+                               DG1_UNCORE_INIT_STATUS_COMPLETE, 180000);
+
+       drm_dbg(&i915->drm, "PCODE init status %d\n", ret);
+
+       if (ret)
+               drm_err(&i915->drm, "Pcode did not report uncore initialization completion!\n");
+
+       return ret;
+}
diff --git a/drivers/gpu/drm/i915/intel_pcode.h b/drivers/gpu/drm/i915/intel_pcode.h
new file mode 100644 (file)
index 0000000..5080664
--- /dev/null
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2013-2021 Intel Corporation
+ */
+
+#ifndef _INTEL_PCODE_H_
+#define _INTEL_PCODE_H_
+
+#include <linux/types.h>
+
+struct drm_i915_private;
+
+int sandybridge_pcode_read(struct drm_i915_private *i915, u32 mbox,
+                          u32 *val, u32 *val1);
+int sandybridge_pcode_write_timeout(struct drm_i915_private *i915, u32 mbox,
+                                   u32 val, int fast_timeout_us,
+                                   int slow_timeout_ms);
+#define sandybridge_pcode_write(i915, mbox, val)       \
+       sandybridge_pcode_write_timeout(i915, mbox, val, 500, 0)
+
+int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,
+                     u32 reply_mask, u32 reply, int timeout_base_ms);
+
+int intel_pcode_init(struct drm_i915_private *i915);
+
+#endif /* _INTEL_PCODE_H */
index c7831bb..f90fe39 100644 (file)
@@ -47,8 +47,8 @@
 #include "i915_fixed.h"
 #include "i915_irq.h"
 #include "i915_trace.h"
+#include "intel_pcode.h"
 #include "intel_pm.h"
-#include "intel_sideband.h"
 #include "vlv_sideband.h"
 #include "../../../platform/x86/intel_ips.h"
 
index 59ef672..1d30273 100644 (file)
@@ -90,231 +90,3 @@ void intel_sbi_write(struct drm_i915_private *i915, u16 reg, u32 value,
 {
        intel_sbi_rw(i915, reg, destination, &value, false);
 }
-
-static int gen6_check_mailbox_status(u32 mbox)
-{
-       switch (mbox & GEN6_PCODE_ERROR_MASK) {
-       case GEN6_PCODE_SUCCESS:
-               return 0;
-       case GEN6_PCODE_UNIMPLEMENTED_CMD:
-               return -ENODEV;
-       case GEN6_PCODE_ILLEGAL_CMD:
-               return -ENXIO;
-       case GEN6_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
-       case GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
-               return -EOVERFLOW;
-       case GEN6_PCODE_TIMEOUT:
-               return -ETIMEDOUT;
-       default:
-               MISSING_CASE(mbox & GEN6_PCODE_ERROR_MASK);
-               return 0;
-       }
-}
-
-static int gen7_check_mailbox_status(u32 mbox)
-{
-       switch (mbox & GEN6_PCODE_ERROR_MASK) {
-       case GEN6_PCODE_SUCCESS:
-               return 0;
-       case GEN6_PCODE_ILLEGAL_CMD:
-               return -ENXIO;
-       case GEN7_PCODE_TIMEOUT:
-               return -ETIMEDOUT;
-       case GEN7_PCODE_ILLEGAL_DATA:
-               return -EINVAL;
-       case GEN11_PCODE_ILLEGAL_SUBCOMMAND:
-               return -ENXIO;
-       case GEN11_PCODE_LOCKED:
-               return -EBUSY;
-       case GEN11_PCODE_REJECTED:
-               return -EACCES;
-       case GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
-               return -EOVERFLOW;
-       default:
-               MISSING_CASE(mbox & GEN6_PCODE_ERROR_MASK);
-               return 0;
-       }
-}
-
-static int __sandybridge_pcode_rw(struct drm_i915_private *i915,
-                                 u32 mbox, u32 *val, u32 *val1,
-                                 int fast_timeout_us,
-                                 int slow_timeout_ms,
-                                 bool is_read)
-{
-       struct intel_uncore *uncore = &i915->uncore;
-
-       lockdep_assert_held(&i915->sb_lock);
-
-       /*
-        * GEN6_PCODE_* are outside of the forcewake domain, we can use
-        * intel_uncore_read/write_fw variants to reduce the amount of work
-        * required when reading/writing.
-        */
-
-       if (intel_uncore_read_fw(uncore, GEN6_PCODE_MAILBOX) & GEN6_PCODE_READY)
-               return -EAGAIN;
-
-       intel_uncore_write_fw(uncore, GEN6_PCODE_DATA, *val);
-       intel_uncore_write_fw(uncore, GEN6_PCODE_DATA1, val1 ? *val1 : 0);
-       intel_uncore_write_fw(uncore,
-                             GEN6_PCODE_MAILBOX, GEN6_PCODE_READY | mbox);
-
-       if (__intel_wait_for_register_fw(uncore,
-                                        GEN6_PCODE_MAILBOX,
-                                        GEN6_PCODE_READY, 0,
-                                        fast_timeout_us,
-                                        slow_timeout_ms,
-                                        &mbox))
-               return -ETIMEDOUT;
-
-       if (is_read)
-               *val = intel_uncore_read_fw(uncore, GEN6_PCODE_DATA);
-       if (is_read && val1)
-               *val1 = intel_uncore_read_fw(uncore, GEN6_PCODE_DATA1);
-
-       if (GRAPHICS_VER(i915) > 6)
-               return gen7_check_mailbox_status(mbox);
-       else
-               return gen6_check_mailbox_status(mbox);
-}
-
-int sandybridge_pcode_read(struct drm_i915_private *i915, u32 mbox,
-                          u32 *val, u32 *val1)
-{
-       int err;
-
-       mutex_lock(&i915->sb_lock);
-       err = __sandybridge_pcode_rw(i915, mbox, val, val1,
-                                    500, 20,
-                                    true);
-       mutex_unlock(&i915->sb_lock);
-
-       if (err) {
-               drm_dbg(&i915->drm,
-                       "warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n",
-                       mbox, __builtin_return_address(0), err);
-       }
-
-       return err;
-}
-
-int sandybridge_pcode_write_timeout(struct drm_i915_private *i915,
-                                   u32 mbox, u32 val,
-                                   int fast_timeout_us,
-                                   int slow_timeout_ms)
-{
-       int err;
-
-       mutex_lock(&i915->sb_lock);
-       err = __sandybridge_pcode_rw(i915, mbox, &val, NULL,
-                                    fast_timeout_us, slow_timeout_ms,
-                                    false);
-       mutex_unlock(&i915->sb_lock);
-
-       if (err) {
-               drm_dbg(&i915->drm,
-                       "warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n",
-                       val, mbox, __builtin_return_address(0), err);
-       }
-
-       return err;
-}
-
-static bool skl_pcode_try_request(struct drm_i915_private *i915, u32 mbox,
-                                 u32 request, u32 reply_mask, u32 reply,
-                                 u32 *status)
-{
-       *status = __sandybridge_pcode_rw(i915, mbox, &request, NULL,
-                                        500, 0,
-                                        true);
-
-       return *status || ((request & reply_mask) == reply);
-}
-
-/**
- * skl_pcode_request - send PCODE request until acknowledgment
- * @i915: device private
- * @mbox: PCODE mailbox ID the request is targeted for
- * @request: request ID
- * @reply_mask: mask used to check for request acknowledgment
- * @reply: value used to check for request acknowledgment
- * @timeout_base_ms: timeout for polling with preemption enabled
- *
- * Keep resending the @request to @mbox until PCODE acknowledges it, PCODE
- * reports an error or an overall timeout of @timeout_base_ms+50 ms expires.
- * The request is acknowledged once the PCODE reply dword equals @reply after
- * applying @reply_mask. Polling is first attempted with preemption enabled
- * for @timeout_base_ms and if this times out for another 50 ms with
- * preemption disabled.
- *
- * Returns 0 on success, %-ETIMEDOUT in case of a timeout, <0 in case of some
- * other error as reported by PCODE.
- */
-int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,
-                     u32 reply_mask, u32 reply, int timeout_base_ms)
-{
-       u32 status;
-       int ret;
-
-       mutex_lock(&i915->sb_lock);
-
-#define COND \
-       skl_pcode_try_request(i915, mbox, request, reply_mask, reply, &status)
-
-       /*
-        * Prime the PCODE by doing a request first. Normally it guarantees
-        * that a subsequent request, at most @timeout_base_ms later, succeeds.
-        * _wait_for() doesn't guarantee when its passed condition is evaluated
-        * first, so send the first request explicitly.
-        */
-       if (COND) {
-               ret = 0;
-               goto out;
-       }
-       ret = _wait_for(COND, timeout_base_ms * 1000, 10, 10);
-       if (!ret)
-               goto out;
-
-       /*
-        * The above can time out if the number of requests was low (2 in the
-        * worst case) _and_ PCODE was busy for some reason even after a
-        * (queued) request and @timeout_base_ms delay. As a workaround retry
-        * the poll with preemption disabled to maximize the number of
-        * requests. Increase the timeout from @timeout_base_ms to 50ms to
-        * account for interrupts that could reduce the number of these
-        * requests, and for any quirks of the PCODE firmware that delays
-        * the request completion.
-        */
-       drm_dbg_kms(&i915->drm,
-                   "PCODE timeout, retrying with preemption disabled\n");
-       drm_WARN_ON_ONCE(&i915->drm, timeout_base_ms > 3);
-       preempt_disable();
-       ret = wait_for_atomic(COND, 50);
-       preempt_enable();
-
-out:
-       mutex_unlock(&i915->sb_lock);
-       return ret ? ret : status;
-#undef COND
-}
-
-int intel_pcode_init(struct drm_i915_private *i915)
-{
-       int ret = 0;
-
-       if (!IS_DGFX(i915))
-               return ret;
-
-       ret = skl_pcode_request(i915, DG1_PCODE_STATUS,
-                               DG1_UNCORE_GET_INIT_STATUS,
-                               DG1_UNCORE_INIT_STATUS_COMPLETE,
-                               DG1_UNCORE_INIT_STATUS_COMPLETE, 180000);
-
-       drm_dbg(&i915->drm, "PCODE init status %d\n", ret);
-
-       if (ret)
-               drm_err(&i915->drm, "Pcode did not report uncore initialization completion!\n");
-
-       return ret;
-}
index 914ffd9..9d93757 100644 (file)
@@ -17,17 +17,4 @@ u32 intel_sbi_read(struct drm_i915_private *i915, u16 reg,
 void intel_sbi_write(struct drm_i915_private *i915, u16 reg, u32 value,
                     enum intel_sbi_destination destination);
 
-int sandybridge_pcode_read(struct drm_i915_private *i915, u32 mbox,
-                          u32 *val, u32 *val1);
-int sandybridge_pcode_write_timeout(struct drm_i915_private *i915, u32 mbox,
-                                   u32 val, int fast_timeout_us,
-                                   int slow_timeout_ms);
-#define sandybridge_pcode_write(i915, mbox, val)       \
-       sandybridge_pcode_write_timeout(i915, mbox, val, 500, 0)
-
-int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,
-                     u32 reply_mask, u32 reply, int timeout_base_ms);
-
-int intel_pcode_init(struct drm_i915_private *i915);
-
 #endif /* _INTEL_SIDEBAND_H */