As noted in the beginning of the Xe-LPD and ADL-P patch series, going forward we need to track platforms' display versions separately from their graphics/media versions or "INTEL_GEN()" number. Since the first few patches that add DISPLAY_VER() and related conversions already have some good review feedback from Lucas, Jani, and Ville, I'm resending an updated copy of those patches as their own series while we wait for the rest of the Xe-LPD and ADL-P to get reviewed. Due to the nature of these early patches they'll likely accumulate new conflicts rapidly, so it makes sense to try to land them early if possible. Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxx> Matt Roper (6): drm/i915/display: Convert gen5/gen6 tests to IS_IRONLAKE/IS_SANDYBRIDGE drm/i915: Add DISPLAY_VER() and related macros drm/i915/display: Eliminate most usage of INTEL_GEN() drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in intel_pm.c drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in i915_irq.c drm/i915/display: Simplify GLK display version tests drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- drivers/gpu/drm/i915/display/i9xx_plane.c | 56 ++-- drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- drivers/gpu/drm/i915/display/intel_audio.c | 18 +- drivers/gpu/drm/i915/display/intel_bios.c | 15 +- drivers/gpu/drm/i915/display/intel_bw.c | 10 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 64 ++--- drivers/gpu/drm/i915/display/intel_color.c | 32 +-- .../gpu/drm/i915/display/intel_combo_phy.c | 8 +- drivers/gpu/drm/i915/display/intel_crt.c | 12 +- drivers/gpu/drm/i915/display/intel_crtc.c | 20 +- drivers/gpu/drm/i915/display/intel_csr.c | 4 +- drivers/gpu/drm/i915/display/intel_cursor.c | 14 +- drivers/gpu/drm/i915/display/intel_ddi.c | 104 ++++---- .../drm/i915/display/intel_ddi_buf_trans.c | 4 +- drivers/gpu/drm/i915/display/intel_display.c | 251 +++++++++--------- .../drm/i915/display/intel_display_debugfs.c | 44 +-- .../drm/i915/display/intel_display_power.c | 52 ++-- drivers/gpu/drm/i915/display/intel_dp.c | 48 ++-- drivers/gpu/drm/i915/display/intel_dp_aux.c | 12 +- .../drm/i915/display/intel_dp_link_training.c | 2 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 20 +- drivers/gpu/drm/i915/display/intel_dpll.c | 12 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +- drivers/gpu/drm/i915/display/intel_fbc.c | 62 ++--- drivers/gpu/drm/i915/display/intel_fdi.c | 6 +- .../drm/i915/display/intel_fifo_underrun.c | 8 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 11 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 29 +- drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 18 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 16 +- drivers/gpu/drm/i915/display/intel_pps.c | 6 +- drivers/gpu/drm/i915/display/intel_psr.c | 47 ++-- drivers/gpu/drm/i915/display/intel_sdvo.c | 8 +- drivers/gpu/drm/i915/display/intel_sprite.c | 16 +- drivers/gpu/drm/i915/display/intel_tc.c | 8 +- drivers/gpu/drm/i915/display/intel_tv.c | 8 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 8 +- drivers/gpu/drm/i915/display/intel_vga.c | 4 +- drivers/gpu/drm/i915/display/skl_scaler.c | 8 +- .../drm/i915/display/skl_universal_plane.c | 69 ++--- drivers/gpu/drm/i915/i915_drv.h | 6 + drivers/gpu/drm/i915/i915_irq.c | 66 ++--- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_device_info.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 132 ++++----- 51 files changed, 710 insertions(+), 707 deletions(-) -- 2.25.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx