drm/i915/dsi: add separate init timer mask definition for ICL DSI

Having a separate definition will be useful for splitting VLV and ICL
register files.

Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220217224023.3994777-2-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 479d5e1165d944f57c0b81509cef2081b86412d0..3c01565e62b2d82814ed4d053e6730bb49497335 100644 (file)
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -570,7 +570,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,
        /* Program T-INIT master registers */
        for_each_dsi_port(port, intel_dsi->ports) {
                tmp = intel_de_read(dev_priv, ICL_DSI_T_INIT_MASTER(port));
-               tmp &= ~MASTER_INIT_TIMER_MASK;
+               tmp &= ~DSI_T_INIT_MASTER_MASK;
                tmp |= intel_dsi->init_count;
                intel_de_write(dev_priv, ICL_DSI_T_INIT_MASTER(port), tmp);
        }

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 580763515b16fa65c921ad13fccf977fbacbe815..6f359229ecdb9ad8b0687d8d863fcee0bf28e8c3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -9008,6 +9008,7 @@ enum skl_power_gate {
 #define ICL_DSI_T_INIT_MASTER(port)    _MMIO_PORT(port,        \
                                                   _ICL_DSI_T_INIT_MASTER_0,\
                                                   _ICL_DSI_T_INIT_MASTER_1)
+#define   DSI_T_INIT_MASTER_MASK       REG_GENMASK(15, 0)
 
 #define _DPHY_CLK_TIMING_PARAM_0       0x162180
 #define _DPHY_CLK_TIMING_PARAM_1       0x6c180