drm/i915/wm: split out SKL+ watermark regs to a separate file
authorJani Nikula <jani.nikula@intel.com>
Fri, 31 Mar 2023 09:09:48 +0000 (12:09 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 4 Apr 2023 07:05:38 +0000 (10:05 +0300)
Clean up i915_reg.h by splitting out SKL+ watermark regs to
display/skl_watermark_regs.h.

v2: Rebased

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> # v1
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230331090949.2858951-1-jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_display_power.c
drivers/gpu/drm/i915/display/skl_watermark.c
drivers/gpu/drm/i915/display/skl_watermark_regs.h [new file with mode: 0644]
drivers/gpu/drm/i915/gvt/handlers.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_gvt_mmio_table.c

index 757bb1e2d07fabce59d1fb943e961fd2595c9518..7c9f4288329ede68b644038b4585b14485f7f985 100644 (file)
@@ -22,6 +22,7 @@
 #include "intel_pps_regs.h"
 #include "intel_snps_phy.h"
 #include "skl_watermark.h"
+#include "skl_watermark_regs.h"
 #include "vlv_sideband.h"
 
 #define for_each_power_domain_well(__dev_priv, __power_well, __domain) \
index 5296a20d62d3811b5d156b8b491457fcc50aceba..1c7e6468f3e34a06d3c400f6dd2c512d81582642 100644 (file)
@@ -21,6 +21,7 @@
 #include "intel_pcode.h"
 #include "intel_wm.h"
 #include "skl_watermark.h"
+#include "skl_watermark_regs.h"
 
 static void skl_sagv_disable(struct drm_i915_private *i915);
 
diff --git a/drivers/gpu/drm/i915/display/skl_watermark_regs.h b/drivers/gpu/drm/i915/display/skl_watermark_regs.h
new file mode 100644 (file)
index 0000000..628c592
--- /dev/null
@@ -0,0 +1,160 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef __SKL_WATERMARK_REGS_H__
+#define __SKL_WATERMARK_REGS_H__
+
+#include "intel_display_reg_defs.h"
+
+#define _PIPEA_MBUS_DBOX_CTL                   0x7003C
+#define _PIPEB_MBUS_DBOX_CTL                   0x7103C
+#define PIPE_MBUS_DBOX_CTL(pipe)               _MMIO_PIPE(pipe, _PIPEA_MBUS_DBOX_CTL, \
+                                                          _PIPEB_MBUS_DBOX_CTL)
+#define MBUS_DBOX_B2B_TRANSACTIONS_MAX_MASK    REG_GENMASK(24, 20) /* tgl+ */
+#define MBUS_DBOX_B2B_TRANSACTIONS_MAX(x)      REG_FIELD_PREP(MBUS_DBOX_B2B_TRANSACTIONS_MAX_MASK, x)
+#define MBUS_DBOX_B2B_TRANSACTIONS_DELAY_MASK  REG_GENMASK(19, 17) /* tgl+ */
+#define MBUS_DBOX_B2B_TRANSACTIONS_DELAY(x)    REG_FIELD_PREP(MBUS_DBOX_B2B_TRANSACTIONS_DELAY_MASK, x)
+#define MBUS_DBOX_REGULATE_B2B_TRANSACTIONS_EN REG_BIT(16) /* tgl+ */
+#define MBUS_DBOX_BW_CREDIT_MASK               REG_GENMASK(15, 14)
+#define MBUS_DBOX_BW_CREDIT(x)                 REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, x)
+#define MBUS_DBOX_BW_4CREDITS_MTL              REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, 0x2)
+#define MBUS_DBOX_BW_8CREDITS_MTL              REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, 0x3)
+#define MBUS_DBOX_B_CREDIT_MASK                        REG_GENMASK(12, 8)
+#define MBUS_DBOX_B_CREDIT(x)                  REG_FIELD_PREP(MBUS_DBOX_B_CREDIT_MASK, x)
+#define MBUS_DBOX_I_CREDIT_MASK                        REG_GENMASK(7, 5)
+#define MBUS_DBOX_I_CREDIT(x)                  REG_FIELD_PREP(MBUS_DBOX_I_CREDIT_MASK, x)
+#define MBUS_DBOX_A_CREDIT_MASK                        REG_GENMASK(3, 0)
+#define MBUS_DBOX_A_CREDIT(x)                  REG_FIELD_PREP(MBUS_DBOX_A_CREDIT_MASK, x)
+
+#define MBUS_UBOX_CTL                  _MMIO(0x4503C)
+#define MBUS_BBOX_CTL_S1               _MMIO(0x45040)
+#define MBUS_BBOX_CTL_S2               _MMIO(0x45044)
+
+#define MBUS_CTL                       _MMIO(0x4438C)
+#define MBUS_JOIN                      REG_BIT(31)
+#define MBUS_HASHING_MODE_MASK         REG_BIT(30)
+#define MBUS_HASHING_MODE_2x2          REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 0)
+#define MBUS_HASHING_MODE_1x4          REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 1)
+#define MBUS_JOIN_PIPE_SELECT_MASK     REG_GENMASK(28, 26)
+#define MBUS_JOIN_PIPE_SELECT(pipe)    REG_FIELD_PREP(MBUS_JOIN_PIPE_SELECT_MASK, pipe)
+#define MBUS_JOIN_PIPE_SELECT_NONE     MBUS_JOIN_PIPE_SELECT(7)
+
+/* Watermark register definitions for SKL */
+#define _CUR_WM_A_0            0x70140
+#define _CUR_WM_B_0            0x71140
+#define _CUR_WM_SAGV_A         0x70158
+#define _CUR_WM_SAGV_B         0x71158
+#define _CUR_WM_SAGV_TRANS_A   0x7015C
+#define _CUR_WM_SAGV_TRANS_B   0x7115C
+#define _CUR_WM_TRANS_A                0x70168
+#define _CUR_WM_TRANS_B                0x71168
+#define _PLANE_WM_1_A_0                0x70240
+#define _PLANE_WM_1_B_0                0x71240
+#define _PLANE_WM_2_A_0                0x70340
+#define _PLANE_WM_2_B_0                0x71340
+#define _PLANE_WM_SAGV_1_A     0x70258
+#define _PLANE_WM_SAGV_1_B     0x71258
+#define _PLANE_WM_SAGV_2_A     0x70358
+#define _PLANE_WM_SAGV_2_B     0x71358
+#define _PLANE_WM_SAGV_TRANS_1_A       0x7025C
+#define _PLANE_WM_SAGV_TRANS_1_B       0x7125C
+#define _PLANE_WM_SAGV_TRANS_2_A       0x7035C
+#define _PLANE_WM_SAGV_TRANS_2_B       0x7135C
+#define _PLANE_WM_TRANS_1_A    0x70268
+#define _PLANE_WM_TRANS_1_B    0x71268
+#define _PLANE_WM_TRANS_2_A    0x70368
+#define _PLANE_WM_TRANS_2_B    0x71368
+#define   PLANE_WM_EN          (1 << 31)
+#define   PLANE_WM_IGNORE_LINES        (1 << 30)
+#define   PLANE_WM_LINES_MASK  REG_GENMASK(26, 14)
+#define   PLANE_WM_BLOCKS_MASK REG_GENMASK(11, 0)
+
+#define _CUR_WM_0(pipe) _PIPE(pipe, _CUR_WM_A_0, _CUR_WM_B_0)
+#define CUR_WM(pipe, level) _MMIO(_CUR_WM_0(pipe) + ((4) * (level)))
+#define CUR_WM_SAGV(pipe) _MMIO_PIPE(pipe, _CUR_WM_SAGV_A, _CUR_WM_SAGV_B)
+#define CUR_WM_SAGV_TRANS(pipe) _MMIO_PIPE(pipe, _CUR_WM_SAGV_TRANS_A, _CUR_WM_SAGV_TRANS_B)
+#define CUR_WM_TRANS(pipe) _MMIO_PIPE(pipe, _CUR_WM_TRANS_A, _CUR_WM_TRANS_B)
+#define _PLANE_WM_1(pipe) _PIPE(pipe, _PLANE_WM_1_A_0, _PLANE_WM_1_B_0)
+#define _PLANE_WM_2(pipe) _PIPE(pipe, _PLANE_WM_2_A_0, _PLANE_WM_2_B_0)
+#define _PLANE_WM_BASE(pipe, plane) \
+       _PLANE(plane, _PLANE_WM_1(pipe), _PLANE_WM_2(pipe))
+#define PLANE_WM(pipe, plane, level) \
+       _MMIO(_PLANE_WM_BASE(pipe, plane) + ((4) * (level)))
+#define _PLANE_WM_SAGV_1(pipe) \
+       _PIPE(pipe, _PLANE_WM_SAGV_1_A, _PLANE_WM_SAGV_1_B)
+#define _PLANE_WM_SAGV_2(pipe) \
+       _PIPE(pipe, _PLANE_WM_SAGV_2_A, _PLANE_WM_SAGV_2_B)
+#define PLANE_WM_SAGV(pipe, plane) \
+       _MMIO(_PLANE(plane, _PLANE_WM_SAGV_1(pipe), _PLANE_WM_SAGV_2(pipe)))
+#define _PLANE_WM_SAGV_TRANS_1(pipe) \
+       _PIPE(pipe, _PLANE_WM_SAGV_TRANS_1_A, _PLANE_WM_SAGV_TRANS_1_B)
+#define _PLANE_WM_SAGV_TRANS_2(pipe) \
+       _PIPE(pipe, _PLANE_WM_SAGV_TRANS_2_A, _PLANE_WM_SAGV_TRANS_2_B)
+#define PLANE_WM_SAGV_TRANS(pipe, plane) \
+       _MMIO(_PLANE(plane, _PLANE_WM_SAGV_TRANS_1(pipe), _PLANE_WM_SAGV_TRANS_2(pipe)))
+#define _PLANE_WM_TRANS_1(pipe) \
+       _PIPE(pipe, _PLANE_WM_TRANS_1_A, _PLANE_WM_TRANS_1_B)
+#define _PLANE_WM_TRANS_2(pipe) \
+       _PIPE(pipe, _PLANE_WM_TRANS_2_A, _PLANE_WM_TRANS_2_B)
+#define PLANE_WM_TRANS(pipe, plane) \
+       _MMIO(_PLANE(plane, _PLANE_WM_TRANS_1(pipe), _PLANE_WM_TRANS_2(pipe)))
+
+#define _PLANE_BUF_CFG_1_B                     0x7127c
+#define _PLANE_BUF_CFG_2_B                     0x7137c
+#define _PLANE_BUF_CFG_1(pipe) \
+       _PIPE(pipe, _PLANE_BUF_CFG_1_A, _PLANE_BUF_CFG_1_B)
+#define _PLANE_BUF_CFG_2(pipe) \
+       _PIPE(pipe, _PLANE_BUF_CFG_2_A, _PLANE_BUF_CFG_2_B)
+#define PLANE_BUF_CFG(pipe, plane)     \
+       _MMIO_PLANE(plane, _PLANE_BUF_CFG_1(pipe), _PLANE_BUF_CFG_2(pipe))
+
+#define _PLANE_NV12_BUF_CFG_1_B                0x71278
+#define _PLANE_NV12_BUF_CFG_2_B                0x71378
+#define _PLANE_NV12_BUF_CFG_1(pipe)    \
+       _PIPE(pipe, _PLANE_NV12_BUF_CFG_1_A, _PLANE_NV12_BUF_CFG_1_B)
+#define _PLANE_NV12_BUF_CFG_2(pipe)    \
+       _PIPE(pipe, _PLANE_NV12_BUF_CFG_2_A, _PLANE_NV12_BUF_CFG_2_B)
+#define PLANE_NV12_BUF_CFG(pipe, plane)        \
+       _MMIO_PLANE(plane, _PLANE_NV12_BUF_CFG_1(pipe), _PLANE_NV12_BUF_CFG_2(pipe))
+
+/* SKL new cursor registers */
+#define _CUR_BUF_CFG_A                         0x7017c
+#define _CUR_BUF_CFG_B                         0x7117c
+#define CUR_BUF_CFG(pipe)      _MMIO_PIPE(pipe, _CUR_BUF_CFG_A, _CUR_BUF_CFG_B)
+
+/*
+ * The below are numbered starting from "S1" on gen11/gen12, but starting
+ * with display 13, the bspec switches to a 0-based numbering scheme
+ * (although the addresses stay the same so new S0 = old S1, new S1 = old S2).
+ * We'll just use the 0-based numbering here for all platforms since it's the
+ * way things will be named by the hardware team going forward, plus it's more
+ * consistent with how most of the rest of our registers are named.
+ */
+#define _DBUF_CTL_S0                           0x45008
+#define _DBUF_CTL_S1                           0x44FE8
+#define _DBUF_CTL_S2                           0x44300
+#define _DBUF_CTL_S3                           0x44304
+#define DBUF_CTL_S(slice)                      _MMIO(_PICK(slice, \
+                                                           _DBUF_CTL_S0, \
+                                                           _DBUF_CTL_S1, \
+                                                           _DBUF_CTL_S2, \
+                                                           _DBUF_CTL_S3))
+#define  DBUF_POWER_REQUEST                    REG_BIT(31)
+#define  DBUF_POWER_STATE                      REG_BIT(30)
+#define  DBUF_TRACKER_STATE_SERVICE_MASK       REG_GENMASK(23, 19)
+#define  DBUF_TRACKER_STATE_SERVICE(x)         REG_FIELD_PREP(DBUF_TRACKER_STATE_SERVICE_MASK, x)
+#define  DBUF_MIN_TRACKER_STATE_SERVICE_MASK   REG_GENMASK(18, 16) /* ADL-P+ */
+#define  DBUF_MIN_TRACKER_STATE_SERVICE(x)             REG_FIELD_PREP(DBUF_MIN_TRACKER_STATE_SERVICE_MASK, x) /* ADL-P+ */
+
+#define MTL_LATENCY_LP0_LP1            _MMIO(0x45780)
+#define MTL_LATENCY_LP2_LP3            _MMIO(0x45784)
+#define MTL_LATENCY_LP4_LP5            _MMIO(0x45788)
+#define  MTL_LATENCY_LEVEL_EVEN_MASK   REG_GENMASK(12, 0)
+#define  MTL_LATENCY_LEVEL_ODD_MASK    REG_GENMASK(28, 16)
+
+#define MTL_LATENCY_SAGV               _MMIO(0x4578c)
+#define   MTL_LATENCY_QCLK_SAGV                REG_GENMASK(12, 0)
+
+#endif /* __SKL_WATERMARK_REGS_H__ */
index ea6a21dc832221a0c8d656b0b1eb79446de80921..8bfccae7e02683202fdb845cd4c701b6e5b79a15 100644 (file)
@@ -48,6 +48,7 @@
 #include "display/intel_fbc.h"
 #include "display/intel_fdi_regs.h"
 #include "display/intel_pps_regs.h"
+#include "display/skl_watermark_regs.h"
 #include "display/vlv_dsi_pll_regs.h"
 #include "gt/intel_gt_regs.h"
 
index a350ee2288f2439dab475b5a4fb758bd988def4a..3519b1ac41608b41e505917e42d1471a0e54b2a1 100644 (file)
 #define MBUS_ABOX_BT_CREDIT_POOL1_MASK (0x1F << 0)
 #define MBUS_ABOX_BT_CREDIT_POOL1(x)   ((x) << 0)
 
-#define _PIPEA_MBUS_DBOX_CTL                   0x7003C
-#define _PIPEB_MBUS_DBOX_CTL                   0x7103C
-#define PIPE_MBUS_DBOX_CTL(pipe)               _MMIO_PIPE(pipe, _PIPEA_MBUS_DBOX_CTL, \
-                                                          _PIPEB_MBUS_DBOX_CTL)
-#define MBUS_DBOX_B2B_TRANSACTIONS_MAX_MASK    REG_GENMASK(24, 20) /* tgl+ */
-#define MBUS_DBOX_B2B_TRANSACTIONS_MAX(x)      REG_FIELD_PREP(MBUS_DBOX_B2B_TRANSACTIONS_MAX_MASK, x)
-#define MBUS_DBOX_B2B_TRANSACTIONS_DELAY_MASK  REG_GENMASK(19, 17) /* tgl+ */
-#define MBUS_DBOX_B2B_TRANSACTIONS_DELAY(x)    REG_FIELD_PREP(MBUS_DBOX_B2B_TRANSACTIONS_DELAY_MASK, x)
-#define MBUS_DBOX_REGULATE_B2B_TRANSACTIONS_EN REG_BIT(16) /* tgl+ */
-#define MBUS_DBOX_BW_CREDIT_MASK               REG_GENMASK(15, 14)
-#define MBUS_DBOX_BW_CREDIT(x)                 REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, x)
-#define MBUS_DBOX_BW_4CREDITS_MTL              REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, 0x2)
-#define MBUS_DBOX_BW_8CREDITS_MTL              REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, 0x3)
-#define MBUS_DBOX_B_CREDIT_MASK                        REG_GENMASK(12, 8)
-#define MBUS_DBOX_B_CREDIT(x)                  REG_FIELD_PREP(MBUS_DBOX_B_CREDIT_MASK, x)
-#define MBUS_DBOX_I_CREDIT_MASK                        REG_GENMASK(7, 5)
-#define MBUS_DBOX_I_CREDIT(x)                  REG_FIELD_PREP(MBUS_DBOX_I_CREDIT_MASK, x)
-#define MBUS_DBOX_A_CREDIT_MASK                        REG_GENMASK(3, 0)
-#define MBUS_DBOX_A_CREDIT(x)                  REG_FIELD_PREP(MBUS_DBOX_A_CREDIT_MASK, x)
-
-#define MBUS_UBOX_CTL                  _MMIO(0x4503C)
-#define MBUS_BBOX_CTL_S1               _MMIO(0x45040)
-#define MBUS_BBOX_CTL_S2               _MMIO(0x45044)
-
-#define MBUS_CTL                       _MMIO(0x4438C)
-#define MBUS_JOIN                      REG_BIT(31)
-#define MBUS_HASHING_MODE_MASK         REG_BIT(30)
-#define MBUS_HASHING_MODE_2x2          REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 0)
-#define MBUS_HASHING_MODE_1x4          REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 1)
-#define MBUS_JOIN_PIPE_SELECT_MASK     REG_GENMASK(28, 26)
-#define MBUS_JOIN_PIPE_SELECT(pipe)    REG_FIELD_PREP(MBUS_JOIN_PIPE_SELECT_MASK, pipe)
-#define MBUS_JOIN_PIPE_SELECT_NONE     MBUS_JOIN_PIPE_SELECT(7)
-
 /* Make render/texture TLB fetches lower priorty than associated data
  *   fetches. This is not turned on by default
  */
 #define I965_CURSOR_MAX_WM     32
 #define I965_CURSOR_DFT_WM     8
 
-/* Watermark register definitions for SKL */
-#define _CUR_WM_A_0            0x70140
-#define _CUR_WM_B_0            0x71140
-#define _CUR_WM_SAGV_A         0x70158
-#define _CUR_WM_SAGV_B         0x71158
-#define _CUR_WM_SAGV_TRANS_A   0x7015C
-#define _CUR_WM_SAGV_TRANS_B   0x7115C
-#define _CUR_WM_TRANS_A                0x70168
-#define _CUR_WM_TRANS_B                0x71168
-#define _PLANE_WM_1_A_0                0x70240
-#define _PLANE_WM_1_B_0                0x71240
-#define _PLANE_WM_2_A_0                0x70340
-#define _PLANE_WM_2_B_0                0x71340
-#define _PLANE_WM_SAGV_1_A     0x70258
-#define _PLANE_WM_SAGV_1_B     0x71258
-#define _PLANE_WM_SAGV_2_A     0x70358
-#define _PLANE_WM_SAGV_2_B     0x71358
-#define _PLANE_WM_SAGV_TRANS_1_A       0x7025C
-#define _PLANE_WM_SAGV_TRANS_1_B       0x7125C
-#define _PLANE_WM_SAGV_TRANS_2_A       0x7035C
-#define _PLANE_WM_SAGV_TRANS_2_B       0x7135C
-#define _PLANE_WM_TRANS_1_A    0x70268
-#define _PLANE_WM_TRANS_1_B    0x71268
-#define _PLANE_WM_TRANS_2_A    0x70368
-#define _PLANE_WM_TRANS_2_B    0x71368
-#define   PLANE_WM_EN          (1 << 31)
-#define   PLANE_WM_IGNORE_LINES        (1 << 30)
-#define   PLANE_WM_LINES_MASK  REG_GENMASK(26, 14)
-#define   PLANE_WM_BLOCKS_MASK REG_GENMASK(11, 0)
-
-#define _CUR_WM_0(pipe) _PIPE(pipe, _CUR_WM_A_0, _CUR_WM_B_0)
-#define CUR_WM(pipe, level) _MMIO(_CUR_WM_0(pipe) + ((4) * (level)))
-#define CUR_WM_SAGV(pipe) _MMIO_PIPE(pipe, _CUR_WM_SAGV_A, _CUR_WM_SAGV_B)
-#define CUR_WM_SAGV_TRANS(pipe) _MMIO_PIPE(pipe, _CUR_WM_SAGV_TRANS_A, _CUR_WM_SAGV_TRANS_B)
-#define CUR_WM_TRANS(pipe) _MMIO_PIPE(pipe, _CUR_WM_TRANS_A, _CUR_WM_TRANS_B)
-#define _PLANE_WM_1(pipe) _PIPE(pipe, _PLANE_WM_1_A_0, _PLANE_WM_1_B_0)
-#define _PLANE_WM_2(pipe) _PIPE(pipe, _PLANE_WM_2_A_0, _PLANE_WM_2_B_0)
-#define _PLANE_WM_BASE(pipe, plane) \
-       _PLANE(plane, _PLANE_WM_1(pipe), _PLANE_WM_2(pipe))
-#define PLANE_WM(pipe, plane, level) \
-       _MMIO(_PLANE_WM_BASE(pipe, plane) + ((4) * (level)))
-#define _PLANE_WM_SAGV_1(pipe) \
-       _PIPE(pipe, _PLANE_WM_SAGV_1_A, _PLANE_WM_SAGV_1_B)
-#define _PLANE_WM_SAGV_2(pipe) \
-       _PIPE(pipe, _PLANE_WM_SAGV_2_A, _PLANE_WM_SAGV_2_B)
-#define PLANE_WM_SAGV(pipe, plane) \
-       _MMIO(_PLANE(plane, _PLANE_WM_SAGV_1(pipe), _PLANE_WM_SAGV_2(pipe)))
-#define _PLANE_WM_SAGV_TRANS_1(pipe) \
-       _PIPE(pipe, _PLANE_WM_SAGV_TRANS_1_A, _PLANE_WM_SAGV_TRANS_1_B)
-#define _PLANE_WM_SAGV_TRANS_2(pipe) \
-       _PIPE(pipe, _PLANE_WM_SAGV_TRANS_2_A, _PLANE_WM_SAGV_TRANS_2_B)
-#define PLANE_WM_SAGV_TRANS(pipe, plane) \
-       _MMIO(_PLANE(plane, _PLANE_WM_SAGV_TRANS_1(pipe), _PLANE_WM_SAGV_TRANS_2(pipe)))
-#define _PLANE_WM_TRANS_1(pipe) \
-       _PIPE(pipe, _PLANE_WM_TRANS_1_A, _PLANE_WM_TRANS_1_B)
-#define _PLANE_WM_TRANS_2(pipe) \
-       _PIPE(pipe, _PLANE_WM_TRANS_2_A, _PLANE_WM_TRANS_2_B)
-#define PLANE_WM_TRANS(pipe, plane) \
-       _MMIO(_PLANE(plane, _PLANE_WM_TRANS_1(pipe), _PLANE_WM_TRANS_2(pipe)))
-
 /* define the Watermark register on Ironlake */
 #define _WM0_PIPEA_ILK         0x45100
 #define _WM0_PIPEB_ILK         0x45104
 #define PLANE_CHICKEN(pipe, plane) \
        _MMIO_PLANE(plane, _PLANE_CHICKEN_1(pipe), _PLANE_CHICKEN_2(pipe))
 
-#define _PLANE_BUF_CFG_1_B                     0x7127c
-#define _PLANE_BUF_CFG_2_B                     0x7137c
-#define _PLANE_BUF_CFG_1(pipe) \
-       _PIPE(pipe, _PLANE_BUF_CFG_1_A, _PLANE_BUF_CFG_1_B)
-#define _PLANE_BUF_CFG_2(pipe) \
-       _PIPE(pipe, _PLANE_BUF_CFG_2_A, _PLANE_BUF_CFG_2_B)
-#define PLANE_BUF_CFG(pipe, plane)     \
-       _MMIO_PLANE(plane, _PLANE_BUF_CFG_1(pipe), _PLANE_BUF_CFG_2(pipe))
-
-#define _PLANE_NV12_BUF_CFG_1_B                0x71278
-#define _PLANE_NV12_BUF_CFG_2_B                0x71378
-#define _PLANE_NV12_BUF_CFG_1(pipe)    \
-       _PIPE(pipe, _PLANE_NV12_BUF_CFG_1_A, _PLANE_NV12_BUF_CFG_1_B)
-#define _PLANE_NV12_BUF_CFG_2(pipe)    \
-       _PIPE(pipe, _PLANE_NV12_BUF_CFG_2_A, _PLANE_NV12_BUF_CFG_2_B)
-#define PLANE_NV12_BUF_CFG(pipe, plane)        \
-       _MMIO_PLANE(plane, _PLANE_NV12_BUF_CFG_1(pipe), _PLANE_NV12_BUF_CFG_2(pipe))
-
 #define _PLANE_AUX_DIST_1_B            0x711c0
 #define _PLANE_AUX_DIST_2_B            0x712c0
 #define _PLANE_AUX_DIST_1(pipe) \
                                                  _SEL_FETCH_PLANE_OFFSET_1_A - \
                                                  _SEL_FETCH_PLANE_BASE_1_A)
 
-/* SKL new cursor registers */
-#define _CUR_BUF_CFG_A                         0x7017c
-#define _CUR_BUF_CFG_B                         0x7117c
-#define CUR_BUF_CFG(pipe)      _MMIO_PIPE(pipe, _CUR_BUF_CFG_A, _CUR_BUF_CFG_B)
-
 /* VBIOS regs */
 #define VGACNTRL               _MMIO(0x71400)
 # define VGA_DISP_DISABLE                      (1 << 31)
 #define  DISP_DATA_PARTITION_5_6       (1 << 6)
 #define  DISP_IPC_ENABLE               (1 << 3)
 
-/*
- * The below are numbered starting from "S1" on gen11/gen12, but starting
- * with display 13, the bspec switches to a 0-based numbering scheme
- * (although the addresses stay the same so new S0 = old S1, new S1 = old S2).
- * We'll just use the 0-based numbering here for all platforms since it's the
- * way things will be named by the hardware team going forward, plus it's more
- * consistent with how most of the rest of our registers are named.
- */
-#define _DBUF_CTL_S0                           0x45008
-#define _DBUF_CTL_S1                           0x44FE8
-#define _DBUF_CTL_S2                           0x44300
-#define _DBUF_CTL_S3                           0x44304
-#define DBUF_CTL_S(slice)                      _MMIO(_PICK(slice, \
-                                                           _DBUF_CTL_S0, \
-                                                           _DBUF_CTL_S1, \
-                                                           _DBUF_CTL_S2, \
-                                                           _DBUF_CTL_S3))
-#define  DBUF_POWER_REQUEST                    REG_BIT(31)
-#define  DBUF_POWER_STATE                      REG_BIT(30)
-#define  DBUF_TRACKER_STATE_SERVICE_MASK       REG_GENMASK(23, 19)
-#define  DBUF_TRACKER_STATE_SERVICE(x)         REG_FIELD_PREP(DBUF_TRACKER_STATE_SERVICE_MASK, x)
-#define  DBUF_MIN_TRACKER_STATE_SERVICE_MASK   REG_GENMASK(18, 16) /* ADL-P+ */
-#define  DBUF_MIN_TRACKER_STATE_SERVICE(x)             REG_FIELD_PREP(DBUF_MIN_TRACKER_STATE_SERVICE_MASK, x) /* ADL-P+ */
-
 #define GEN7_MSG_CTL   _MMIO(0x45010)
 #define  WAIT_FOR_PCH_RESET_ACK                (1 << 1)
 #define  WAIT_FOR_PCH_FLR_ACK          (1 << 0)
@@ -6908,15 +6768,6 @@ enum skl_power_gate {
 #define MTL_CLKGATE_DIS_TRANS(trans)                   _MMIO_TRANS2(trans, _MTL_CLKGATE_DIS_TRANS_A)
 #define  MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS                REG_BIT(7)
 
-#define MTL_LATENCY_LP0_LP1            _MMIO(0x45780)
-#define MTL_LATENCY_LP2_LP3            _MMIO(0x45784)
-#define MTL_LATENCY_LP4_LP5            _MMIO(0x45788)
-#define  MTL_LATENCY_LEVEL_EVEN_MASK   REG_GENMASK(12, 0)
-#define  MTL_LATENCY_LEVEL_ODD_MASK    REG_GENMASK(28, 16)
-
-#define MTL_LATENCY_SAGV               _MMIO(0x4578c)
-#define   MTL_LATENCY_QCLK_SAGV                REG_GENMASK(12, 0)
-
 #define MTL_MEM_SS_INFO_GLOBAL                 _MMIO(0x45700)
 #define   MTL_N_OF_ENABLED_QGV_POINTS_MASK     REG_GENMASK(11, 8)
 #define   MTL_N_OF_POPULATED_CH_MASK           REG_GENMASK(7, 4)
index 4bee209da4251c55a249622540dddcb32bbe9934..3b49d2e6a66f079d851c3c024a3bdde52505a01d 100644 (file)
@@ -11,6 +11,7 @@
 #include "display/intel_dpio_phy.h"
 #include "display/intel_fdi_regs.h"
 #include "display/intel_lvds_regs.h"
+#include "display/skl_watermark_regs.h"
 #include "display/vlv_dsi_pll_regs.h"
 #include "gt/intel_gt_regs.h"
 #include "gvt/gvt.h"