mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
drm/i915/power: Use the intel_de_wait_ms() out value
Utilize the 'out_value' output parameter of intel_de_wait_ms() instead of re-reading the PHY_CONTROL register after polling has finished. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20251110172756.2132-16-ville.syrjala@linux.intel.com Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
@@ -1358,6 +1358,7 @@ static void assert_chv_phy_status(struct intel_display *display)
|
||||
u32 phy_control = display->power.chv_phy_control;
|
||||
u32 phy_status = 0;
|
||||
u32 phy_status_mask = 0xffffffff;
|
||||
u32 val;
|
||||
|
||||
/*
|
||||
* The BIOS can leave the PHY is some weird state
|
||||
@@ -1446,11 +1447,10 @@ static void assert_chv_phy_status(struct intel_display *display)
|
||||
* so the power state can take a while to actually change.
|
||||
*/
|
||||
if (intel_de_wait_ms(display, DISPLAY_PHY_STATUS,
|
||||
phy_status_mask, phy_status, 10, NULL))
|
||||
phy_status_mask, phy_status, 10, &val))
|
||||
drm_err(display->drm,
|
||||
"Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n",
|
||||
intel_de_read(display, DISPLAY_PHY_STATUS) & phy_status_mask,
|
||||
phy_status, display->power.chv_phy_control);
|
||||
val & phy_status_mask, phy_status, display->power.chv_phy_control);
|
||||
}
|
||||
|
||||
#undef BITS_SET
|
||||
|
||||
Reference in New Issue
Block a user