drm/i915/hdcp: split out hdcp registers to a separate file
authorJani Nikula <jani.nikula@intel.com>
Thu, 4 Aug 2022 09:58:34 +0000 (12:58 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 10 Aug 2022 07:32:58 +0000 (10:32 +0300)
Reduce the bloat of i915_reg.h. The registers are also only needed in a
few places, no need to have them defined everywhere.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ce8334342e8bdf92c17c714aa13574e66cad93bb.1659607033.git.jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_dp_hdcp.c
drivers/gpu/drm/i915/display/intel_hdcp.c
drivers/gpu/drm/i915/display/intel_hdcp_regs.h [new file with mode: 0644]
drivers/gpu/drm/i915/display/intel_hdmi.c
drivers/gpu/drm/i915/i915_reg.h

index a7640dbcf00ec7a60a0da6f79ebda53579cf414a..88689124c013d1f84b857b3a093ae61d21423903 100644 (file)
@@ -17,6 +17,7 @@
 #include "intel_dp.h"
 #include "intel_dp_hdcp.h"
 #include "intel_hdcp.h"
+#include "intel_hdcp_regs.h"
 
 static unsigned int transcoder_to_stream_enc_status(enum transcoder cpu_transcoder)
 {
index 8ea66a2e1b09d73e89e1b7b6ff8c0b9c49f5f154..c5e9e86bb4cb2a2cd0f2ecfcea3f6800c5d56b85 100644 (file)
@@ -23,6 +23,7 @@
 #include "intel_display_power_well.h"
 #include "intel_display_types.h"
 #include "intel_hdcp.h"
+#include "intel_hdcp_regs.h"
 #include "intel_pcode.h"
 
 #define KEY_LOAD_TRIES 5
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_regs.h b/drivers/gpu/drm/i915/display/intel_hdcp_regs.h
new file mode 100644 (file)
index 0000000..cbeab64
--- /dev/null
@@ -0,0 +1,270 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_HDCP_REGS_H__
+#define __INTEL_HDCP_REGS_H__
+
+#include "i915_reg_defs.h"
+
+/* HDCP Key Registers */
+#define HDCP_KEY_CONF                  _MMIO(0x66c00)
+#define  HDCP_AKSV_SEND_TRIGGER                BIT(31)
+#define  HDCP_CLEAR_KEYS_TRIGGER       BIT(30)
+#define  HDCP_KEY_LOAD_TRIGGER         BIT(8)
+#define HDCP_KEY_STATUS                        _MMIO(0x66c04)
+#define  HDCP_FUSE_IN_PROGRESS         BIT(7)
+#define  HDCP_FUSE_ERROR               BIT(6)
+#define  HDCP_FUSE_DONE                        BIT(5)
+#define  HDCP_KEY_LOAD_STATUS          BIT(1)
+#define  HDCP_KEY_LOAD_DONE            BIT(0)
+#define HDCP_AKSV_LO                   _MMIO(0x66c10)
+#define HDCP_AKSV_HI                   _MMIO(0x66c14)
+
+/* HDCP Repeater Registers */
+#define HDCP_REP_CTL                   _MMIO(0x66d00)
+#define  HDCP_TRANSA_REP_PRESENT       BIT(31)
+#define  HDCP_TRANSB_REP_PRESENT       BIT(30)
+#define  HDCP_TRANSC_REP_PRESENT       BIT(29)
+#define  HDCP_TRANSD_REP_PRESENT       BIT(28)
+#define  HDCP_DDIB_REP_PRESENT         BIT(30)
+#define  HDCP_DDIA_REP_PRESENT         BIT(29)
+#define  HDCP_DDIC_REP_PRESENT         BIT(28)
+#define  HDCP_DDID_REP_PRESENT         BIT(27)
+#define  HDCP_DDIF_REP_PRESENT         BIT(26)
+#define  HDCP_DDIE_REP_PRESENT         BIT(25)
+#define  HDCP_TRANSA_SHA1_M0           (1 << 20)
+#define  HDCP_TRANSB_SHA1_M0           (2 << 20)
+#define  HDCP_TRANSC_SHA1_M0           (3 << 20)
+#define  HDCP_TRANSD_SHA1_M0           (4 << 20)
+#define  HDCP_DDIB_SHA1_M0             (1 << 20)
+#define  HDCP_DDIA_SHA1_M0             (2 << 20)
+#define  HDCP_DDIC_SHA1_M0             (3 << 20)
+#define  HDCP_DDID_SHA1_M0             (4 << 20)
+#define  HDCP_DDIF_SHA1_M0             (5 << 20)
+#define  HDCP_DDIE_SHA1_M0             (6 << 20) /* Bspec says 5? */
+#define  HDCP_SHA1_BUSY                        BIT(16)
+#define  HDCP_SHA1_READY               BIT(17)
+#define  HDCP_SHA1_COMPLETE            BIT(18)
+#define  HDCP_SHA1_V_MATCH             BIT(19)
+#define  HDCP_SHA1_TEXT_32             (1 << 1)
+#define  HDCP_SHA1_COMPLETE_HASH       (2 << 1)
+#define  HDCP_SHA1_TEXT_24             (4 << 1)
+#define  HDCP_SHA1_TEXT_16             (5 << 1)
+#define  HDCP_SHA1_TEXT_8              (6 << 1)
+#define  HDCP_SHA1_TEXT_0              (7 << 1)
+#define HDCP_SHA_V_PRIME_H0            _MMIO(0x66d04)
+#define HDCP_SHA_V_PRIME_H1            _MMIO(0x66d08)
+#define HDCP_SHA_V_PRIME_H2            _MMIO(0x66d0C)
+#define HDCP_SHA_V_PRIME_H3            _MMIO(0x66d10)
+#define HDCP_SHA_V_PRIME_H4            _MMIO(0x66d14)
+#define HDCP_SHA_V_PRIME(h)            _MMIO((0x66d04 + (h) * 4))
+#define HDCP_SHA_TEXT                  _MMIO(0x66d18)
+
+/* HDCP Auth Registers */
+#define _PORTA_HDCP_AUTHENC            0x66800
+#define _PORTB_HDCP_AUTHENC            0x66500
+#define _PORTC_HDCP_AUTHENC            0x66600
+#define _PORTD_HDCP_AUTHENC            0x66700
+#define _PORTE_HDCP_AUTHENC            0x66A00
+#define _PORTF_HDCP_AUTHENC            0x66900
+#define _PORT_HDCP_AUTHENC(port, x)    _MMIO(_PICK(port, \
+                                         _PORTA_HDCP_AUTHENC, \
+                                         _PORTB_HDCP_AUTHENC, \
+                                         _PORTC_HDCP_AUTHENC, \
+                                         _PORTD_HDCP_AUTHENC, \
+                                         _PORTE_HDCP_AUTHENC, \
+                                         _PORTF_HDCP_AUTHENC) + (x))
+#define PORT_HDCP_CONF(port)           _PORT_HDCP_AUTHENC(port, 0x0)
+#define _TRANSA_HDCP_CONF              0x66400
+#define _TRANSB_HDCP_CONF              0x66500
+#define TRANS_HDCP_CONF(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP_CONF, \
+                                                   _TRANSB_HDCP_CONF)
+#define HDCP_CONF(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_CONF(trans) : \
+                                        PORT_HDCP_CONF(port))
+
+#define  HDCP_CONF_CAPTURE_AN          BIT(0)
+#define  HDCP_CONF_AUTH_AND_ENC                (BIT(1) | BIT(0))
+#define PORT_HDCP_ANINIT(port)         _PORT_HDCP_AUTHENC(port, 0x4)
+#define _TRANSA_HDCP_ANINIT            0x66404
+#define _TRANSB_HDCP_ANINIT            0x66504
+#define TRANS_HDCP_ANINIT(trans)       _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP_ANINIT, \
+                                                   _TRANSB_HDCP_ANINIT)
+#define HDCP_ANINIT(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_ANINIT(trans) : \
+                                        PORT_HDCP_ANINIT(port))
+
+#define PORT_HDCP_ANLO(port)           _PORT_HDCP_AUTHENC(port, 0x8)
+#define _TRANSA_HDCP_ANLO              0x66408
+#define _TRANSB_HDCP_ANLO              0x66508
+#define TRANS_HDCP_ANLO(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP_ANLO, \
+                                                   _TRANSB_HDCP_ANLO)
+#define HDCP_ANLO(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_ANLO(trans) : \
+                                        PORT_HDCP_ANLO(port))
+
+#define PORT_HDCP_ANHI(port)           _PORT_HDCP_AUTHENC(port, 0xC)
+#define _TRANSA_HDCP_ANHI              0x6640C
+#define _TRANSB_HDCP_ANHI              0x6650C
+#define TRANS_HDCP_ANHI(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP_ANHI, \
+                                                   _TRANSB_HDCP_ANHI)
+#define HDCP_ANHI(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_ANHI(trans) : \
+                                        PORT_HDCP_ANHI(port))
+
+#define PORT_HDCP_BKSVLO(port)         _PORT_HDCP_AUTHENC(port, 0x10)
+#define _TRANSA_HDCP_BKSVLO            0x66410
+#define _TRANSB_HDCP_BKSVLO            0x66510
+#define TRANS_HDCP_BKSVLO(trans)       _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP_BKSVLO, \
+                                                   _TRANSB_HDCP_BKSVLO)
+#define HDCP_BKSVLO(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_BKSVLO(trans) : \
+                                        PORT_HDCP_BKSVLO(port))
+
+#define PORT_HDCP_BKSVHI(port)         _PORT_HDCP_AUTHENC(port, 0x14)
+#define _TRANSA_HDCP_BKSVHI            0x66414
+#define _TRANSB_HDCP_BKSVHI            0x66514
+#define TRANS_HDCP_BKSVHI(trans)       _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP_BKSVHI, \
+                                                   _TRANSB_HDCP_BKSVHI)
+#define HDCP_BKSVHI(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_BKSVHI(trans) : \
+                                        PORT_HDCP_BKSVHI(port))
+
+#define PORT_HDCP_RPRIME(port)         _PORT_HDCP_AUTHENC(port, 0x18)
+#define _TRANSA_HDCP_RPRIME            0x66418
+#define _TRANSB_HDCP_RPRIME            0x66518
+#define TRANS_HDCP_RPRIME(trans)       _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP_RPRIME, \
+                                                   _TRANSB_HDCP_RPRIME)
+#define HDCP_RPRIME(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_RPRIME(trans) : \
+                                        PORT_HDCP_RPRIME(port))
+
+#define PORT_HDCP_STATUS(port)         _PORT_HDCP_AUTHENC(port, 0x1C)
+#define _TRANSA_HDCP_STATUS            0x6641C
+#define _TRANSB_HDCP_STATUS            0x6651C
+#define TRANS_HDCP_STATUS(trans)       _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP_STATUS, \
+                                                   _TRANSB_HDCP_STATUS)
+#define HDCP_STATUS(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP_STATUS(trans) : \
+                                        PORT_HDCP_STATUS(port))
+
+#define  HDCP_STATUS_STREAM_A_ENC      BIT(31)
+#define  HDCP_STATUS_STREAM_B_ENC      BIT(30)
+#define  HDCP_STATUS_STREAM_C_ENC      BIT(29)
+#define  HDCP_STATUS_STREAM_D_ENC      BIT(28)
+#define  HDCP_STATUS_AUTH              BIT(21)
+#define  HDCP_STATUS_ENC               BIT(20)
+#define  HDCP_STATUS_RI_MATCH          BIT(19)
+#define  HDCP_STATUS_R0_READY          BIT(18)
+#define  HDCP_STATUS_AN_READY          BIT(17)
+#define  HDCP_STATUS_CIPHER            BIT(16)
+#define  HDCP_STATUS_FRAME_CNT(x)      (((x) >> 8) & 0xff)
+
+/* HDCP2.2 Registers */
+#define _PORTA_HDCP2_BASE              0x66800
+#define _PORTB_HDCP2_BASE              0x66500
+#define _PORTC_HDCP2_BASE              0x66600
+#define _PORTD_HDCP2_BASE              0x66700
+#define _PORTE_HDCP2_BASE              0x66A00
+#define _PORTF_HDCP2_BASE              0x66900
+#define _PORT_HDCP2_BASE(port, x)      _MMIO(_PICK((port), \
+                                         _PORTA_HDCP2_BASE, \
+                                         _PORTB_HDCP2_BASE, \
+                                         _PORTC_HDCP2_BASE, \
+                                         _PORTD_HDCP2_BASE, \
+                                         _PORTE_HDCP2_BASE, \
+                                         _PORTF_HDCP2_BASE) + (x))
+
+#define PORT_HDCP2_AUTH(port)          _PORT_HDCP2_BASE(port, 0x98)
+#define _TRANSA_HDCP2_AUTH             0x66498
+#define _TRANSB_HDCP2_AUTH             0x66598
+#define TRANS_HDCP2_AUTH(trans)                _MMIO_TRANS(trans, _TRANSA_HDCP2_AUTH, \
+                                                   _TRANSB_HDCP2_AUTH)
+#define   AUTH_LINK_AUTHENTICATED      BIT(31)
+#define   AUTH_LINK_TYPE               BIT(30)
+#define   AUTH_FORCE_CLR_INPUTCTR      BIT(19)
+#define   AUTH_CLR_KEYS                        BIT(18)
+#define HDCP2_AUTH(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP2_AUTH(trans) : \
+                                        PORT_HDCP2_AUTH(port))
+
+#define PORT_HDCP2_CTL(port)           _PORT_HDCP2_BASE(port, 0xB0)
+#define _TRANSA_HDCP2_CTL              0x664B0
+#define _TRANSB_HDCP2_CTL              0x665B0
+#define TRANS_HDCP2_CTL(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP2_CTL, \
+                                                   _TRANSB_HDCP2_CTL)
+#define   CTL_LINK_ENCRYPTION_REQ      BIT(31)
+#define HDCP2_CTL(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP2_CTL(trans) : \
+                                        PORT_HDCP2_CTL(port))
+
+#define PORT_HDCP2_STATUS(port)                _PORT_HDCP2_BASE(port, 0xB4)
+#define _TRANSA_HDCP2_STATUS           0x664B4
+#define _TRANSB_HDCP2_STATUS           0x665B4
+#define TRANS_HDCP2_STATUS(trans)      _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP2_STATUS, \
+                                                   _TRANSB_HDCP2_STATUS)
+#define   LINK_TYPE_STATUS             BIT(22)
+#define   LINK_AUTH_STATUS             BIT(21)
+#define   LINK_ENCRYPTION_STATUS       BIT(20)
+#define HDCP2_STATUS(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP2_STATUS(trans) : \
+                                        PORT_HDCP2_STATUS(port))
+
+#define _PIPEA_HDCP2_STREAM_STATUS     0x668C0
+#define _PIPEB_HDCP2_STREAM_STATUS     0x665C0
+#define _PIPEC_HDCP2_STREAM_STATUS     0x666C0
+#define _PIPED_HDCP2_STREAM_STATUS     0x667C0
+#define PIPE_HDCP2_STREAM_STATUS(pipe)         _MMIO(_PICK((pipe), \
+                                                     _PIPEA_HDCP2_STREAM_STATUS, \
+                                                     _PIPEB_HDCP2_STREAM_STATUS, \
+                                                     _PIPEC_HDCP2_STREAM_STATUS, \
+                                                     _PIPED_HDCP2_STREAM_STATUS))
+
+#define _TRANSA_HDCP2_STREAM_STATUS            0x664C0
+#define _TRANSB_HDCP2_STREAM_STATUS            0x665C0
+#define TRANS_HDCP2_STREAM_STATUS(trans)       _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP2_STREAM_STATUS, \
+                                                   _TRANSB_HDCP2_STREAM_STATUS)
+#define   STREAM_ENCRYPTION_STATUS     BIT(31)
+#define   STREAM_TYPE_STATUS           BIT(30)
+#define HDCP2_STREAM_STATUS(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP2_STREAM_STATUS(trans) : \
+                                        PIPE_HDCP2_STREAM_STATUS(pipe))
+
+#define _PORTA_HDCP2_AUTH_STREAM               0x66F00
+#define _PORTB_HDCP2_AUTH_STREAM               0x66F04
+#define PORT_HDCP2_AUTH_STREAM(port)   _MMIO_PORT(port, \
+                                                  _PORTA_HDCP2_AUTH_STREAM, \
+                                                  _PORTB_HDCP2_AUTH_STREAM)
+#define _TRANSA_HDCP2_AUTH_STREAM              0x66F00
+#define _TRANSB_HDCP2_AUTH_STREAM              0x66F04
+#define TRANS_HDCP2_AUTH_STREAM(trans) _MMIO_TRANS(trans, \
+                                                   _TRANSA_HDCP2_AUTH_STREAM, \
+                                                   _TRANSB_HDCP2_AUTH_STREAM)
+#define   AUTH_STREAM_TYPE             BIT(31)
+#define HDCP2_AUTH_STREAM(dev_priv, trans, port) \
+                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
+                                        TRANS_HDCP2_AUTH_STREAM(trans) : \
+                                        PORT_HDCP2_AUTH_STREAM(port))
+
+#endif /* __INTEL_HDCP_REGS_H__ */
index a88f589351faea0690c2fbe7c8a313de330d39c6..09f85afeb2d494882da5db5a4e700435adfd8b9d 100644 (file)
@@ -50,6 +50,7 @@
 #include "intel_dp.h"
 #include "intel_gmbus.h"
 #include "intel_hdcp.h"
+#include "intel_hdcp_regs.h"
 #include "intel_hdmi.h"
 #include "intel_lspcon.h"
 #include "intel_panel.h"
index bf5c39d9f953072b66bfa485732644efa0ad6304..ad2c441acecaaa7e7183fafcc4001ab658809996 100644 (file)
@@ -6944,265 +6944,6 @@ enum skl_power_gate {
 #define   ICL_AUX_ANAOVRD1_LDO_BYPASS  (1 << 7)
 #define   ICL_AUX_ANAOVRD1_ENABLE      (1 << 0)
 
-/* HDCP Key Registers */
-#define HDCP_KEY_CONF                  _MMIO(0x66c00)
-#define  HDCP_AKSV_SEND_TRIGGER                BIT(31)
-#define  HDCP_CLEAR_KEYS_TRIGGER       BIT(30)
-#define  HDCP_KEY_LOAD_TRIGGER         BIT(8)
-#define HDCP_KEY_STATUS                        _MMIO(0x66c04)
-#define  HDCP_FUSE_IN_PROGRESS         BIT(7)
-#define  HDCP_FUSE_ERROR               BIT(6)
-#define  HDCP_FUSE_DONE                        BIT(5)
-#define  HDCP_KEY_LOAD_STATUS          BIT(1)
-#define  HDCP_KEY_LOAD_DONE            BIT(0)
-#define HDCP_AKSV_LO                   _MMIO(0x66c10)
-#define HDCP_AKSV_HI                   _MMIO(0x66c14)
-
-/* HDCP Repeater Registers */
-#define HDCP_REP_CTL                   _MMIO(0x66d00)
-#define  HDCP_TRANSA_REP_PRESENT       BIT(31)
-#define  HDCP_TRANSB_REP_PRESENT       BIT(30)
-#define  HDCP_TRANSC_REP_PRESENT       BIT(29)
-#define  HDCP_TRANSD_REP_PRESENT       BIT(28)
-#define  HDCP_DDIB_REP_PRESENT         BIT(30)
-#define  HDCP_DDIA_REP_PRESENT         BIT(29)
-#define  HDCP_DDIC_REP_PRESENT         BIT(28)
-#define  HDCP_DDID_REP_PRESENT         BIT(27)
-#define  HDCP_DDIF_REP_PRESENT         BIT(26)
-#define  HDCP_DDIE_REP_PRESENT         BIT(25)
-#define  HDCP_TRANSA_SHA1_M0           (1 << 20)
-#define  HDCP_TRANSB_SHA1_M0           (2 << 20)
-#define  HDCP_TRANSC_SHA1_M0           (3 << 20)
-#define  HDCP_TRANSD_SHA1_M0           (4 << 20)
-#define  HDCP_DDIB_SHA1_M0             (1 << 20)
-#define  HDCP_DDIA_SHA1_M0             (2 << 20)
-#define  HDCP_DDIC_SHA1_M0             (3 << 20)
-#define  HDCP_DDID_SHA1_M0             (4 << 20)
-#define  HDCP_DDIF_SHA1_M0             (5 << 20)
-#define  HDCP_DDIE_SHA1_M0             (6 << 20) /* Bspec says 5? */
-#define  HDCP_SHA1_BUSY                        BIT(16)
-#define  HDCP_SHA1_READY               BIT(17)
-#define  HDCP_SHA1_COMPLETE            BIT(18)
-#define  HDCP_SHA1_V_MATCH             BIT(19)
-#define  HDCP_SHA1_TEXT_32             (1 << 1)
-#define  HDCP_SHA1_COMPLETE_HASH       (2 << 1)
-#define  HDCP_SHA1_TEXT_24             (4 << 1)
-#define  HDCP_SHA1_TEXT_16             (5 << 1)
-#define  HDCP_SHA1_TEXT_8              (6 << 1)
-#define  HDCP_SHA1_TEXT_0              (7 << 1)
-#define HDCP_SHA_V_PRIME_H0            _MMIO(0x66d04)
-#define HDCP_SHA_V_PRIME_H1            _MMIO(0x66d08)
-#define HDCP_SHA_V_PRIME_H2            _MMIO(0x66d0C)
-#define HDCP_SHA_V_PRIME_H3            _MMIO(0x66d10)
-#define HDCP_SHA_V_PRIME_H4            _MMIO(0x66d14)
-#define HDCP_SHA_V_PRIME(h)            _MMIO((0x66d04 + (h) * 4))
-#define HDCP_SHA_TEXT                  _MMIO(0x66d18)
-
-/* HDCP Auth Registers */
-#define _PORTA_HDCP_AUTHENC            0x66800
-#define _PORTB_HDCP_AUTHENC            0x66500
-#define _PORTC_HDCP_AUTHENC            0x66600
-#define _PORTD_HDCP_AUTHENC            0x66700
-#define _PORTE_HDCP_AUTHENC            0x66A00
-#define _PORTF_HDCP_AUTHENC            0x66900
-#define _PORT_HDCP_AUTHENC(port, x)    _MMIO(_PICK(port, \
-                                         _PORTA_HDCP_AUTHENC, \
-                                         _PORTB_HDCP_AUTHENC, \
-                                         _PORTC_HDCP_AUTHENC, \
-                                         _PORTD_HDCP_AUTHENC, \
-                                         _PORTE_HDCP_AUTHENC, \
-                                         _PORTF_HDCP_AUTHENC) + (x))
-#define PORT_HDCP_CONF(port)           _PORT_HDCP_AUTHENC(port, 0x0)
-#define _TRANSA_HDCP_CONF              0x66400
-#define _TRANSB_HDCP_CONF              0x66500
-#define TRANS_HDCP_CONF(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP_CONF, \
-                                                   _TRANSB_HDCP_CONF)
-#define HDCP_CONF(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_CONF(trans) : \
-                                        PORT_HDCP_CONF(port))
-
-#define  HDCP_CONF_CAPTURE_AN          BIT(0)
-#define  HDCP_CONF_AUTH_AND_ENC                (BIT(1) | BIT(0))
-#define PORT_HDCP_ANINIT(port)         _PORT_HDCP_AUTHENC(port, 0x4)
-#define _TRANSA_HDCP_ANINIT            0x66404
-#define _TRANSB_HDCP_ANINIT            0x66504
-#define TRANS_HDCP_ANINIT(trans)       _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP_ANINIT, \
-                                                   _TRANSB_HDCP_ANINIT)
-#define HDCP_ANINIT(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_ANINIT(trans) : \
-                                        PORT_HDCP_ANINIT(port))
-
-#define PORT_HDCP_ANLO(port)           _PORT_HDCP_AUTHENC(port, 0x8)
-#define _TRANSA_HDCP_ANLO              0x66408
-#define _TRANSB_HDCP_ANLO              0x66508
-#define TRANS_HDCP_ANLO(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP_ANLO, \
-                                                   _TRANSB_HDCP_ANLO)
-#define HDCP_ANLO(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_ANLO(trans) : \
-                                        PORT_HDCP_ANLO(port))
-
-#define PORT_HDCP_ANHI(port)           _PORT_HDCP_AUTHENC(port, 0xC)
-#define _TRANSA_HDCP_ANHI              0x6640C
-#define _TRANSB_HDCP_ANHI              0x6650C
-#define TRANS_HDCP_ANHI(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP_ANHI, \
-                                                   _TRANSB_HDCP_ANHI)
-#define HDCP_ANHI(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_ANHI(trans) : \
-                                        PORT_HDCP_ANHI(port))
-
-#define PORT_HDCP_BKSVLO(port)         _PORT_HDCP_AUTHENC(port, 0x10)
-#define _TRANSA_HDCP_BKSVLO            0x66410
-#define _TRANSB_HDCP_BKSVLO            0x66510
-#define TRANS_HDCP_BKSVLO(trans)       _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP_BKSVLO, \
-                                                   _TRANSB_HDCP_BKSVLO)
-#define HDCP_BKSVLO(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_BKSVLO(trans) : \
-                                        PORT_HDCP_BKSVLO(port))
-
-#define PORT_HDCP_BKSVHI(port)         _PORT_HDCP_AUTHENC(port, 0x14)
-#define _TRANSA_HDCP_BKSVHI            0x66414
-#define _TRANSB_HDCP_BKSVHI            0x66514
-#define TRANS_HDCP_BKSVHI(trans)       _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP_BKSVHI, \
-                                                   _TRANSB_HDCP_BKSVHI)
-#define HDCP_BKSVHI(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_BKSVHI(trans) : \
-                                        PORT_HDCP_BKSVHI(port))
-
-#define PORT_HDCP_RPRIME(port)         _PORT_HDCP_AUTHENC(port, 0x18)
-#define _TRANSA_HDCP_RPRIME            0x66418
-#define _TRANSB_HDCP_RPRIME            0x66518
-#define TRANS_HDCP_RPRIME(trans)       _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP_RPRIME, \
-                                                   _TRANSB_HDCP_RPRIME)
-#define HDCP_RPRIME(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_RPRIME(trans) : \
-                                        PORT_HDCP_RPRIME(port))
-
-#define PORT_HDCP_STATUS(port)         _PORT_HDCP_AUTHENC(port, 0x1C)
-#define _TRANSA_HDCP_STATUS            0x6641C
-#define _TRANSB_HDCP_STATUS            0x6651C
-#define TRANS_HDCP_STATUS(trans)       _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP_STATUS, \
-                                                   _TRANSB_HDCP_STATUS)
-#define HDCP_STATUS(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP_STATUS(trans) : \
-                                        PORT_HDCP_STATUS(port))
-
-#define  HDCP_STATUS_STREAM_A_ENC      BIT(31)
-#define  HDCP_STATUS_STREAM_B_ENC      BIT(30)
-#define  HDCP_STATUS_STREAM_C_ENC      BIT(29)
-#define  HDCP_STATUS_STREAM_D_ENC      BIT(28)
-#define  HDCP_STATUS_AUTH              BIT(21)
-#define  HDCP_STATUS_ENC               BIT(20)
-#define  HDCP_STATUS_RI_MATCH          BIT(19)
-#define  HDCP_STATUS_R0_READY          BIT(18)
-#define  HDCP_STATUS_AN_READY          BIT(17)
-#define  HDCP_STATUS_CIPHER            BIT(16)
-#define  HDCP_STATUS_FRAME_CNT(x)      (((x) >> 8) & 0xff)
-
-/* HDCP2.2 Registers */
-#define _PORTA_HDCP2_BASE              0x66800
-#define _PORTB_HDCP2_BASE              0x66500
-#define _PORTC_HDCP2_BASE              0x66600
-#define _PORTD_HDCP2_BASE              0x66700
-#define _PORTE_HDCP2_BASE              0x66A00
-#define _PORTF_HDCP2_BASE              0x66900
-#define _PORT_HDCP2_BASE(port, x)      _MMIO(_PICK((port), \
-                                         _PORTA_HDCP2_BASE, \
-                                         _PORTB_HDCP2_BASE, \
-                                         _PORTC_HDCP2_BASE, \
-                                         _PORTD_HDCP2_BASE, \
-                                         _PORTE_HDCP2_BASE, \
-                                         _PORTF_HDCP2_BASE) + (x))
-
-#define PORT_HDCP2_AUTH(port)          _PORT_HDCP2_BASE(port, 0x98)
-#define _TRANSA_HDCP2_AUTH             0x66498
-#define _TRANSB_HDCP2_AUTH             0x66598
-#define TRANS_HDCP2_AUTH(trans)                _MMIO_TRANS(trans, _TRANSA_HDCP2_AUTH, \
-                                                   _TRANSB_HDCP2_AUTH)
-#define   AUTH_LINK_AUTHENTICATED      BIT(31)
-#define   AUTH_LINK_TYPE               BIT(30)
-#define   AUTH_FORCE_CLR_INPUTCTR      BIT(19)
-#define   AUTH_CLR_KEYS                        BIT(18)
-#define HDCP2_AUTH(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP2_AUTH(trans) : \
-                                        PORT_HDCP2_AUTH(port))
-
-#define PORT_HDCP2_CTL(port)           _PORT_HDCP2_BASE(port, 0xB0)
-#define _TRANSA_HDCP2_CTL              0x664B0
-#define _TRANSB_HDCP2_CTL              0x665B0
-#define TRANS_HDCP2_CTL(trans)         _MMIO_TRANS(trans, _TRANSA_HDCP2_CTL, \
-                                                   _TRANSB_HDCP2_CTL)
-#define   CTL_LINK_ENCRYPTION_REQ      BIT(31)
-#define HDCP2_CTL(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP2_CTL(trans) : \
-                                        PORT_HDCP2_CTL(port))
-
-#define PORT_HDCP2_STATUS(port)                _PORT_HDCP2_BASE(port, 0xB4)
-#define _TRANSA_HDCP2_STATUS           0x664B4
-#define _TRANSB_HDCP2_STATUS           0x665B4
-#define TRANS_HDCP2_STATUS(trans)      _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP2_STATUS, \
-                                                   _TRANSB_HDCP2_STATUS)
-#define   LINK_TYPE_STATUS             BIT(22)
-#define   LINK_AUTH_STATUS             BIT(21)
-#define   LINK_ENCRYPTION_STATUS       BIT(20)
-#define HDCP2_STATUS(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP2_STATUS(trans) : \
-                                        PORT_HDCP2_STATUS(port))
-
-#define _PIPEA_HDCP2_STREAM_STATUS     0x668C0
-#define _PIPEB_HDCP2_STREAM_STATUS     0x665C0
-#define _PIPEC_HDCP2_STREAM_STATUS     0x666C0
-#define _PIPED_HDCP2_STREAM_STATUS     0x667C0
-#define PIPE_HDCP2_STREAM_STATUS(pipe)         _MMIO(_PICK((pipe), \
-                                                     _PIPEA_HDCP2_STREAM_STATUS, \
-                                                     _PIPEB_HDCP2_STREAM_STATUS, \
-                                                     _PIPEC_HDCP2_STREAM_STATUS, \
-                                                     _PIPED_HDCP2_STREAM_STATUS))
-
-#define _TRANSA_HDCP2_STREAM_STATUS            0x664C0
-#define _TRANSB_HDCP2_STREAM_STATUS            0x665C0
-#define TRANS_HDCP2_STREAM_STATUS(trans)       _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP2_STREAM_STATUS, \
-                                                   _TRANSB_HDCP2_STREAM_STATUS)
-#define   STREAM_ENCRYPTION_STATUS     BIT(31)
-#define   STREAM_TYPE_STATUS           BIT(30)
-#define HDCP2_STREAM_STATUS(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP2_STREAM_STATUS(trans) : \
-                                        PIPE_HDCP2_STREAM_STATUS(pipe))
-
-#define _PORTA_HDCP2_AUTH_STREAM               0x66F00
-#define _PORTB_HDCP2_AUTH_STREAM               0x66F04
-#define PORT_HDCP2_AUTH_STREAM(port)   _MMIO_PORT(port, \
-                                                  _PORTA_HDCP2_AUTH_STREAM, \
-                                                  _PORTB_HDCP2_AUTH_STREAM)
-#define _TRANSA_HDCP2_AUTH_STREAM              0x66F00
-#define _TRANSB_HDCP2_AUTH_STREAM              0x66F04
-#define TRANS_HDCP2_AUTH_STREAM(trans) _MMIO_TRANS(trans, \
-                                                   _TRANSA_HDCP2_AUTH_STREAM, \
-                                                   _TRANSB_HDCP2_AUTH_STREAM)
-#define   AUTH_STREAM_TYPE             BIT(31)
-#define HDCP2_AUTH_STREAM(dev_priv, trans, port) \
-                                       (GRAPHICS_VER(dev_priv) >= 12 ? \
-                                        TRANS_HDCP2_AUTH_STREAM(trans) : \
-                                        PORT_HDCP2_AUTH_STREAM(port))
-
 /* Per-pipe DDI Function Control */
 #define _TRANS_DDI_FUNC_CTL_A          0x60400
 #define _TRANS_DDI_FUNC_CTL_B          0x61400