github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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
This commit is contained in:
Jani Nikula 2023-01-17 16:39:44 +02:00
parent e54051782e
commit 3a7e2d58f8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@ -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) && 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, drm_dbg_kms(&dev_priv->drm,
"SNPS PHY %c failed to calibrate, proceeding anyway\n", "SNPS PHY %c failed to calibrate, proceeding anyway\n",
phy_name(phy)); phy_name(phy));

8
drivers/gpu/drm/i915/display/intel_display_core.h
View File

@ -428,6 +428,14 @@ struct intel_display {
u32 block_time_us; u32 block_time_us;
} sagv; } sagv;
struct {
/*
* DG2: Mask of PHYs that were not calibrated by the firmware
* and should not be used.
*/
u8 phy_failed_calibration;
} snps;
struct { struct {
/* ordered wq for modesets */ /* ordered wq for modesets */
struct workqueue_struct *modeset; struct workqueue_struct *modeset;

2
drivers/gpu/drm/i915/display/intel_snps_phy.c
View File

@ -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), if (intel_de_wait_for_clear(i915, DG2_PHY_MISC(phy),
DG2_PHY_DP_TX_ACK_MASK, 25)) DG2_PHY_DP_TX_ACK_MASK, 25))
i915->snps_phy_failed_calibration |= BIT(phy); i915->display.snps.phy_failed_calibration |= BIT(phy);
} }
} }

6
drivers/gpu/drm/i915/i915_drv.h
View File

@ -381,12 +381,6 @@ struct drm_i915_private {
bool irq_enabled; 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_pmu pmu;
struct i915_drm_clients clients; struct i915_drm_clients clients;