drm/i915: Consolidate ILK_DSPCLK_GATE and PCH_DSPCLK_GATE

Register 0x42020 was defined twice under the names PCH_DSPCLK_GATE_D and
ILK_DSPCLK_GATE. This patch consolidate the 2 sets of defines in one.

The transforms done are:

PCH_DSPCLK_GATE_D    -> ILK_DSPCLK_GATE_D
ILK_DSPCLK_GATE      -> ILK_DSPCLK_GATE_D

DPARBUNIT_CLOCK_GATE_DISABLE -> ILK_DPARBUNIT_CLOCK_GATE_DISABLE
ILK_DPARB_CLK_GATE           -> ILK_DPARBUNIT_CLOCK_GATE_DISABLE

DPFDUNIT_CLOCK_GATE_DISABLE -> ILK_DPFDUNIT_CLOCK_GATE_DISABLE
ILK_DPFD_CLK_GATE           -> ILK_DPFDUNIT_CLOCK_GATE_DISABLE
ILK_CLK_FBC                 -> ILK_DPFDUNIT_CLOCK_GATE_DISABLE

DPFCRUNIT_CLOCK_GATE_DISABLE -> ILK_DPFCRUNIT_CLOCK_GATE_DISABLE
ILK_DPFC_DIS1                -> ILK_DPFCRUNIT_CLOCK_GATE_DISABLE

DPFCUNIT_CLOCK_GATE_DISABLE -> ILK_DPFCUNIT_CLOCK_GATE_DISABLE
ILK_DPFC_DIS2               -> ILK_DPFCUNIT_CLOCK_GATE_DISABLE

We have a VHRUNIT_CLOCK_GATE_DISABLE define for the pre-ILK DSPCLK_GATE_D.
Even if the same bit is used in ILK_DSPCLK_GATE_D, other bits in the
register change, so I went with re-defining it, well more precisely rename
IVB_VRHUNIT_CLK_GATE, which is not specific to IVB+. So:

IVB_VRHUNIT_CLK_GATE       -> ILK_VHRUNIT_CLOCK_GATE_DISABLE
VHRUNIT_CLOCK_GATE_DISABLE -> ILK_VHRUNIT_CLOCK_GATE_DISABLE (ILK+ code)

This commit is only a renaming commit, further commits will clean up the
logic.

v2: Rename bit 5 and 7 to _ENABLE as setting them to 1 enables clock
    gating on their respective units, contrary to all of the other bits
    (Paulo Zanoni)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 7 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c31ee5bd1a56..08c51ab43c50 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3248,12 +3248,6 @@
 #define DISPLAY_PORT_PLL_BIOS_1         0x46010
 #define DISPLAY_PORT_PLL_BIOS_2         0x46014
 
-#define PCH_DSPCLK_GATE_D       0x42020
-# define DPFCUNIT_CLOCK_GATE_DISABLE            (1 << 9)
-# define DPFCRUNIT_CLOCK_GATE_DISABLE           (1 << 8)
-# define DPFDUNIT_CLOCK_GATE_DISABLE            (1 << 7)
-# define DPARBUNIT_CLOCK_GATE_DISABLE           (1 << 5)
-
 #define PCH_3DCGDIS0            0x46020
 # define MARIUNIT_CLOCK_GATE_DISABLE            (1 << 18)
 # define SVSMUNIT_CLOCK_GATE_DISABLE            (1 << 1)
@@ -3425,15 +3419,13 @@
 #define  ILK_HDCP_DISABLE               (1<<25)
 #define  ILK_eDP_A_DISABLE              (1<<24)
 #define  ILK_DESKTOP                    (1<<23)
-#define ILK_DSPCLK_GATE         0x42020
-#define  IVB_VRHUNIT_CLK_GATE   (1<<28)
-#define  ILK_DPARB_CLK_GATE     (1<<5)
-#define  ILK_DPFD_CLK_GATE      (1<<7)
-
-/* According to spec this bit 7/8/9 of 0x42020 should be set to enable FBC */
-#define   ILK_CLK_FBC           (1<<7)
-#define   ILK_DPFC_DIS1         (1<<8)
-#define   ILK_DPFC_DIS2         (1<<9)
+
+#define ILK_DSPCLK_GATE_D                       0x42020
+#define   ILK_VRHUNIT_CLOCK_GATE_DISABLE        (1 << 28)
+#define   ILK_DPFCUNIT_CLOCK_GATE_DISABLE       (1 << 9)
+#define   ILK_DPFCRUNIT_CLOCK_GATE_DISABLE      (1 << 8)
+#define   ILK_DPFDUNIT_CLOCK_GATE_ENABLE        (1 << 7)
+#define   ILK_DPARBUNIT_CLOCK_GATE_ENABLE       (1 << 5)
 
 #define IVB_CHICKEN3    0x4200c
 # define CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE      (1 << 5)