Hi Dave, Daniel, Some fixes for the merge window - one EHL MOCS table fix and the rest is in the display area around modifier handling and PSR on Gen12+, one fixup for g4x+ and one fixing recent fastset refactoring. Regards, Tvrtko drm-intel-next-fixes-2022-10-06-1: - Round to closest in g4x+ HDMI clock readout (Ville Syrjälä) - Update MOCS table for EHL (Tejas Upadhyay) - Fix PSR_IMR/IIR field handling (Jouni Högander) - Fix watermark calculations for gen12+ RC CCS modifier (Ville Syrjälä) - Fix watermark calculations for gen12+ MC CCS modifier (Ville Syrjälä) - Fix watermark calculations for gen12+ CCS+CC modifier (Ville Syrjälä) - Fix watermark calculations for DG2 CCS modifiers (Ville Syrjälä) - Fix watermark calculations for DG2 CCS+CC modifier (Ville Syrjälä) - Reject excessive dotclocks early (Ville Syrjälä) The following changes since commit 20e377e7b2e7c327039f10db80ba5bcc1f6c882d: drm/i915/gt: Use i915_vm_put on ppgtt_create error paths (2022-09-27 11:05:33 +0100) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-fixes-2022-10-06-1 for you to fetch changes up to cdf6428dd518435a05739abf7659589de30970f4: drm/i915: Reject excessive dotclocks early (2022-10-03 17:55:32 +0100) ---------------------------------------------------------------- - Round to closest in g4x+ HDMI clock readout (Ville Syrjälä) - Update MOCS table for EHL (Tejas Upadhyay) - Fix PSR_IMR/IIR field handling (Jouni Högander) - Fix watermark calculations for gen12+ RC CCS modifier (Ville Syrjälä) - Fix watermark calculations for gen12+ MC CCS modifier (Ville Syrjälä) - Fix watermark calculations for gen12+ CCS+CC modifier (Ville Syrjälä) - Fix watermark calculations for DG2 CCS modifiers (Ville Syrjälä) - Fix watermark calculations for DG2 CCS+CC modifier (Ville Syrjälä) - Reject excessive dotclocks early (Ville Syrjälä) ---------------------------------------------------------------- Jouni Högander (1): drm/i915/psr: Fix PSR_IMR/IIR field handling Tejas Upadhyay (1): drm/i915/ehl: Update MOCS table for EHL Ville Syrjälä (7): drm/i915: Round to closest in g4x+ HDMI clock readout drm/i915: Fix watermark calculations for gen12+ RC CCS modifier drm/i915: Fix watermark calculations for gen12+ MC CCS modifier drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier drm/i915: Fix watermark calculations for DG2 CCS modifiers drm/i915: Fix watermark calculations for DG2 CCS+CC modifier drm/i915: Reject excessive dotclocks early drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++ drivers/gpu/drm/i915/display/intel_psr.c | 78 +++++++++++++++++----------- drivers/gpu/drm/i915/display/skl_watermark.c | 16 +++++- drivers/gpu/drm/i915/gt/intel_mocs.c | 8 +++ drivers/gpu/drm/i915/i915_reg.h | 16 ++++-- 6 files changed, 100 insertions(+), 38 deletions(-)