Skip to content

Commit 7f8e976

Browse files
committed
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>
1 parent d7659d9 commit 7f8e976

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,6 +1358,7 @@ static void assert_chv_phy_status(struct intel_display *display)
13581358
u32 phy_control = display->power.chv_phy_control;
13591359
u32 phy_status = 0;
13601360
u32 phy_status_mask = 0xffffffff;
1361+
u32 val;
13611362

13621363
/*
13631364
* The BIOS can leave the PHY is some weird state
@@ -1446,11 +1447,10 @@ static void assert_chv_phy_status(struct intel_display *display)
14461447
* so the power state can take a while to actually change.
14471448
*/
14481449
if (intel_de_wait_ms(display, DISPLAY_PHY_STATUS,
1449-
phy_status_mask, phy_status, 10, NULL))
1450+
phy_status_mask, phy_status, 10, &val))
14501451
drm_err(display->drm,
14511452
"Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n",
1452-
intel_de_read(display, DISPLAY_PHY_STATUS) & phy_status_mask,
1453-
phy_status, display->power.chv_phy_control);
1453+
val & phy_status_mask, phy_status, display->power.chv_phy_control);
14541454
}
14551455

14561456
#undef BITS_SET

0 commit comments

Comments
 (0)