drm/i915: move snps_phy_failed_calibration to display sub-struct under snps

Move the display related member to the struct drm_i915_private display
sub-struct.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230117143946.2426043-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 1f5a471..0034a43 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4323,7 +4323,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
        }
 
        if (intel_phy_is_snps(dev_priv, phy) &&
-           dev_priv->snps_phy_failed_calibration & BIT(phy)) {
+           dev_priv->display.snps.phy_failed_calibration & BIT(phy)) {
                drm_dbg_kms(&dev_priv->drm,
                            "SNPS PHY %c failed to calibrate, proceeding anyway\n",
                            phy_name(phy));

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 57ddce3..2e85dd0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -429,6 +429,14 @@ struct intel_display {
        } sagv;
 
        struct {
+               /*
+                * DG2: Mask of PHYs that were not calibrated by the firmware
+                * and should not be used.
+                */
+               u8 phy_failed_calibration;
+       } snps;
+
+       struct {
                /* ordered wq for modesets */
                struct workqueue_struct *modeset;
 

diff --git a/drivers/gpu/drm/i915/display/intel_snps_phy.c b/drivers/gpu/drm/i915/display/intel_snps_phy.c
index 9494cfd..c65c771 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_snps_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c
@@ -40,7 +40,7 @@ void intel_snps_phy_wait_for_calibration(struct drm_i915_private *i915)
                 */
                if (intel_de_wait_for_clear(i915, DG2_PHY_MISC(phy),
                                            DG2_PHY_DP_TX_ACK_MASK, 25))
-                       i915->snps_phy_failed_calibration |= BIT(phy);
+                       i915->display.snps.phy_failed_calibration |= BIT(phy);
        }
 }
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 83bc698..bedcd08 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -381,12 +381,6 @@ struct drm_i915_private {
 
        bool irq_enabled;
 
-       /*
-        * DG2: Mask of PHYs that were not calibrated by the firmware
-        * and should not be used.
-        */
-       u8 snps_phy_failed_calibration;
-
        struct i915_pmu pmu;
 
        struct i915_drm_clients clients;