[Intel-gfx] [PULL] topic/intel-gen-to-ver -> drm-intel-next and drm-intel-gt-next

Joonas Lahtinen joonas.lahtinen at linux.intel.com
Tue Apr 20 09:47:36 UTC 2021


Quoting Jani Nikula (2021-04-19 12:53:11)
> 
> Hi Joonas and Rodrigo -
> 
> Here's the gen to ver conversion topic branch to be merged to both
> drm-intel-next and drm-intel-gt-next.

Pulled.

Regards, Joonas

> Lots of Cc's for heads up.
> 
> 
> BR,
> Jani.
> 
> 
> topic/intel-gen-to-ver-2021-04-19:
> Gen to ver conversions across the driver
> 
> The main change is Lucas' series [1], with Ville's GLK fixes [2] and a
> cherry-pick of Matt's commit [3] from drm-intel-next as a base to avoid
> conflicts.
> 
> [1] https://patchwork.freedesktop.org/series/88825/
> [2] https://patchwork.freedesktop.org/series/88938/
> [3] 70bfb30743d5 ("drm/i915/display: Eliminate IS_GEN9_{BC,LP}")
> 
> BR,
> Jani.
> 
> The following changes since commit 9c0fed84d5750e1eea6c664e073ffa2534a17743:
> 
>   Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-04-08 14:02:21 +1000)
> 
> are available in the Git repository at:
> 
>   git://anongit.freedesktop.org/drm/drm-intel tags/topic/intel-gen-to-ver-2021-04-19
> 
> for you to fetch changes up to 425390c5dce6da76578389629d19517fcd79c959:
> 
>   drm/i915: split dgfx features from gen 12 (2021-04-14 13:05:06 +0300)
> 
> ----------------------------------------------------------------
> Gen to ver conversions across the driver
> 
> The main change is Lucas' series [1], with Ville's GLK fixes [2] and a
> cherry-pick of Matt's commit [3] from drm-intel-next as a base to avoid
> conflicts.
> 
> [1] https://patchwork.freedesktop.org/series/88825/
> [2] https://patchwork.freedesktop.org/series/88938/
> [3] 70bfb30743d5 ("drm/i915/display: Eliminate IS_GEN9_{BC,LP}")
> 
> ----------------------------------------------------------------
> Lucas De Marchi (12):
>       drm/i915/display: use DISPLAY_VER() on remaining users
>       drm/i915: rename display.version to display.ver
>       drm/i915/display: rename display version macros
>       drm/i915: add macros for graphics and media versions
>       drm/i915/gt: replace gen use in intel_engine_cs
>       drm/i915/selftests: replace unused mask with simple version
>       drm/i915/selftests: eliminate use of gen_mask
>       drm/i915: finish removal of gen_mask
>       drm/i915: eliminate remaining uses of intel_device_info->gen
>       drm/i915: finish removal of gen from intel_device_info
>       drm/i915: add media and display versions to device_info print
>       drm/i915: split dgfx features from gen 12
> 
> Matt Roper (1):
>       drm/i915/display: Eliminate IS_GEN9_{BC,LP}
> 
> Ville Syrjälä (5):
>       drm/i915: Restore lost glk FBC 16bpp w/a
>       drm/i915: Restore lost glk ccs w/a
>       drm/i915: Disable LTTPR detection on GLK once again
>       drm/i915: Don't use {skl, cnl}_hpd_pin() for bxt/glk
>       drm/i915: Remove a few redundant glk checks
> 
>  drivers/gpu/drm/i915/display/i9xx_plane.c          |  2 +-
>  drivers/gpu/drm/i915/display/icl_dsi.c             |  4 +-
>  drivers/gpu/drm/i915/display/intel_atomic.c        |  2 +-
>  drivers/gpu/drm/i915/display/intel_audio.c         |  4 +-
>  drivers/gpu/drm/i915/display/intel_bios.c          |  9 +--
>  drivers/gpu/drm/i915/display/intel_bw.c            |  8 +--
>  drivers/gpu/drm/i915/display/intel_cdclk.c         | 42 +++++++-------
>  drivers/gpu/drm/i915/display/intel_color.c         |  6 +-
>  drivers/gpu/drm/i915/display/intel_crt.c           |  6 +-
>  drivers/gpu/drm/i915/display/intel_crtc.c          |  4 +-
>  drivers/gpu/drm/i915/display/intel_csr.c           |  4 +-
>  drivers/gpu/drm/i915/display/intel_ddi.c           | 53 +++++++++---------
>  drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 10 ++--
>  drivers/gpu/drm/i915/display/intel_display.c       | 64 +++++++++++-----------
>  .../gpu/drm/i915/display/intel_display_debugfs.c   |  2 +-
>  drivers/gpu/drm/i915/display/intel_display_power.c | 57 ++++++++++---------
>  drivers/gpu/drm/i915/display/intel_dp.c            | 10 ++--
>  .../gpu/drm/i915/display/intel_dp_link_training.c  |  2 +-
>  drivers/gpu/drm/i915/display/intel_dp_mst.c        |  2 +-
>  drivers/gpu/drm/i915/display/intel_dpll.c          |  8 +--
>  drivers/gpu/drm/i915/display/intel_dpll_mgr.c      |  6 +-
>  drivers/gpu/drm/i915/display/intel_fb.c            |  2 +-
>  drivers/gpu/drm/i915/display/intel_fbc.c           | 21 +++----
>  drivers/gpu/drm/i915/display/intel_fifo_underrun.c |  4 +-
>  drivers/gpu/drm/i915/display/intel_gmbus.c         | 12 ++--
>  drivers/gpu/drm/i915/display/intel_hdcp.c          |  9 +--
>  drivers/gpu/drm/i915/display/intel_hdmi.c          |  9 +--
>  drivers/gpu/drm/i915/display/intel_lvds.c          |  2 +-
>  drivers/gpu/drm/i915/display/intel_overlay.c       | 10 ++--
>  drivers/gpu/drm/i915/display/intel_panel.c         | 10 ++--
>  drivers/gpu/drm/i915/display/intel_pipe_crc.c      |  4 +-
>  drivers/gpu/drm/i915/display/intel_pps.c           | 14 ++---
>  drivers/gpu/drm/i915/display/intel_psr.c           |  4 +-
>  drivers/gpu/drm/i915/display/intel_tc.c            |  6 +-
>  drivers/gpu/drm/i915/display/intel_tv.c            |  6 +-
>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 10 ++--
>  drivers/gpu/drm/i915/display/vlv_dsi.c             | 46 ++++++++--------
>  drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     | 22 ++++----
>  drivers/gpu/drm/i915/gt/intel_engine_cs.c          | 40 +++++++-------
>  drivers/gpu/drm/i915/gt/selftest_engine_cs.c       | 18 +++---
>  drivers/gpu/drm/i915/gt/selftest_workarounds.c     | 10 ++--
>  drivers/gpu/drm/i915/i915_drv.c                    |  4 +-
>  drivers/gpu/drm/i915/i915_drv.h                    | 42 ++++++++------
>  drivers/gpu/drm/i915/i915_irq.c                    | 23 ++++----
>  drivers/gpu/drm/i915/i915_pci.c                    | 13 +++--
>  drivers/gpu/drm/i915/intel_device_info.c           |  4 +-
>  drivers/gpu/drm/i915/intel_device_info.h           |  6 +-
>  drivers/gpu/drm/i915/intel_pm.c                    | 50 ++++++++---------
>  drivers/gpu/drm/i915/intel_uncore.c                |  8 ++-
>  drivers/gpu/drm/i915/selftests/intel_uncore.c      |  8 ++-
>  drivers/gpu/drm/i915/selftests/mock_gem_device.c   |  2 +-
>  51 files changed, 376 insertions(+), 348 deletions(-)
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center


More information about the Intel-gfx mailing list