Commit 3a7e2d58 authored Jan 17, 2023 by Jani Nikula

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

parent e5405178

drivers/gpu/drm/i915/display/intel_ddi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));

drivers/gpu/drm/i915/display/intel_display_core.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -428,6 +428,14 @@ struct intel_display {
		u32 block_time_us;
		} 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;

drivers/gpu/drm/i915/display/intel_snps_phy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

drivers/gpu/drm/i915/i915_drv.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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;