From: Jani Nikula Date: Thu, 28 Aug 2025 12:21:02 +0000 (+0300) Subject: drm/i915/pps: prefer poll_timeout_us() over read_poll_timeout() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7e60f1570b4de044055e4269c30be826ef16a9b;p=users%2Fhch%2Fmisc.git drm/i915/pps: prefer poll_timeout_us() over read_poll_timeout() Unify on using poll_timeout_us() throughout instead of mixing with readx_poll_timeout(). Reviewed-by: Jouni Högander Link: https://lore.kernel.org/r/260fd455df743453f123d96fc01e7ca96a36f0fa.1756383233.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c index b84eb43bd2d0..327e0de86f1e 100644 --- a/drivers/gpu/drm/i915/display/intel_pps.c +++ b/drivers/gpu/drm/i915/display/intel_pps.c @@ -627,11 +627,9 @@ static void wait_panel_status(struct intel_dp *intel_dp, intel_de_read(display, pp_stat_reg), intel_de_read(display, pp_ctrl_reg)); - ret = read_poll_timeout(intel_de_read, val, - (val & mask) == value, - 10 * 1000, 5000 * 1000, true, - display, pp_stat_reg); - + ret = poll_timeout_us(val = intel_de_read(display, pp_stat_reg), + (val & mask) == value, + 10 * 1000, 5000 * 1000, true); if (ret) { drm_err(display->drm, "[ENCODER:%d:%s] %s panel status timeout: PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",