I must have read the series several times over without spotting the issue, but finally figured it out with the help of [1]. Return value and check added to intel_compute_global_watermarks() in patch 4, and a couple of patches rebased. Seems so obvious now... Fingers crossed. BR, Jani. [1] https://patchwork.freedesktop.org/patch/msgid/20210928223241.22149-1-jani.nikula@xxxxxxxxx Cc: Dave Airlie <airlied@xxxxxxxxx> Dave Airlie (24): drm/i915/uncore: split the fw get function into separate vfunc drm/i915/pm: drop get_fifo_size vfunc. drm/i915: make update_wm take a dev_priv. drm/i915/wm: provide wrappers around watermark vfuncs calls (v3) drm/i915: add wrappers around cdclk vtable funcs. drm/i915/display: add intel_fdi_link_train wrapper. drm/i915: split clock gating init from display vtable drm/i915: split watermark vfuncs from display vtable. drm/i915: split color functions from display vtable drm/i915: split audio functions from display vtable drm/i915: split cdclk functions from display vtable. drm/i915: split irq hotplug function from display vtable drm/i915: split fdi link training from display vtable. drm/i915: split the dpll clock compute out from display vtable. drm/i915: constify fdi link training vtable drm/i915: constify hotplug function vtable. drm/i915: constify color function vtable. drm/i915: constify the audio function vtable drm/i915: constify the dpll clock vtable drm/i915: constify the cdclk vtable drm/i915: drop unused function ptr and comments. drm/i915: constify display function vtable drm/i915: constify clock gating init vtable. drm/i915: constify display wm vtable drivers/gpu/drm/i915/display/intel_audio.c | 43 ++- drivers/gpu/drm/i915/display/intel_cdclk.c | 337 +++++++++++++----- drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +- drivers/gpu/drm/i915/display/intel_color.c | 138 ++++--- drivers/gpu/drm/i915/display/intel_display.c | 289 +++++++++------ .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll.c | 48 ++- drivers/gpu/drm/i915/display/intel_fdi.c | 26 +- drivers/gpu/drm/i915/display/intel_fdi.h | 2 + drivers/gpu/drm/i915/display/intel_hotplug.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 124 ++++--- drivers/gpu/drm/i915/i915_irq.c | 28 +- drivers/gpu/drm/i915/intel_pm.c | 231 ++++++------ drivers/gpu/drm/i915/intel_pm.h | 1 - drivers/gpu/drm/i915/intel_uncore.c | 70 ++-- drivers/gpu/drm/i915/intel_uncore.h | 7 +- 16 files changed, 888 insertions(+), 466 deletions(-) -- 2.30.2
