Commit 4552a6a4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2024-06-19' of... 

Merge tag 'drm-intel-next-2024-06-19' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

drm/i915 feature pull for v6.11:

Features and functionality:
- Battlemage (BMG) Xe2 HPD display enabling (Balasubramani, Clint, Gustavo,
  José, Matt, Anusha, Lucas, Ravi, Radhakrishna, Nirmoy, Ankit, Matthew)
- Panel Replay enabling (Jouni, Animesh)
- DP AUX-less ALPM (Advanced Link Power Management) and LOBF (Link off between
  frames) enabling (Animesh, Jouni)
- Enable link training failure fallback for DP MST links (Imre)
- CMRR (Content Match Refresh Rate) enabling (Mitul)
- Allow the first async flip to change modifier (Ville)
- Enable eDP AUX based HDR backlight (Suraj)
- Increase ADL-S/ADL-P/DG2+ max TMDS bitrate to 6 Gbps (Ville)

Refactoring and cleanups:
- Stop using implicit dev_priv local variable in macros (Jani)
- Expand and clean up VBT table definitions (Ville)
- PSR/ALPM refactoring (Jouni, Animesh)
- Plane fb refactoring (Ville)
- Rawclk, FSB, and mem frequency refactoring (Jani)
- GVT register macro usage cleanups (Jani, Ville)
- Plane, cursor, wm and ddb register macro and usage cleanups (Ville)
- Pipe CRC register macro cleanups (Ville)
- PCI ID macro cleanups and refactoring to match xe style (Jani)
- Move drm-intel repo to gitlab.freedesktop.org (Ryszard)
- Identify all platforms/subplatforms in display probe (Jani)
- Move Intel drm headers under include/drm/intel (Jani)
- Drop local redundant W=1 warnings in favour of drm subsystem warnigs (Jani)
- Include cleanups; include what you use (Jani)
- Convert overlay and DMC error state printing to drm_printer (Jani)
- Joiner renames (Stan)
- DSB interface cleanups (Ville)
- Improve workaround for disabling FBC when VT-d is active (Vinod)
- State checker refactoring and cleanups for color, planes and cdclk (Ville)
- Cleanups around scanline arithmetic (Ville)
- Use drm_crtc_vblank_crtc() instead of open coding (Ville)
- DSC cleanups (Ville)

Fixes:
- Improve VBT array bounds check (Luca)
- LNL PSR fixes (Jouni)
- Audio workaround, disable min hblank fix (Uma)
- Stop selecting ACPI_BUTTON config (Jani)
- Add MTL Cx0 PHY config compare (Mika)
- Fix MTL C20 PHY port clock verification (Mika)
- Fix static analyzer warning for uapi.event access (Luca)
- HDCP fixes and workarounds (Suraj)
- Fix DP MST DSC input BPP computation (Imre)
- Fix assert on pending async-put power domain work (Imre)
- Fix documentation build for DMC wakelocks (Luca)
- Disable DSC on eDP when indicated by VBT (Ville)

DRM Core changes:
- Various DPCD register additions for panel replay and ALPM (Jouni)
- Add target_rr_divider to adaptive sync SDP (Mitul)

Xe driver changes:
- Remove unused xe->enabled_irq_mask and xe->sb_lock members (Jani)
- i915 display compat header cleanups (Jani)
- Remove redundant copy of intel_fbdev_fb.h (Ville)
- Add process name to devcoredump (José)
- Add xe_gt_err_once() (Matthew)
- Implement transient flush for BMG/Xe3 (Nirmoy)

Merges:
- Backmerges to sync with xe, drm-misc and upstream (Rodrigo, Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y170eu80.fsf@intel.com
parents ab3d8479 d754ed28

Documentation/gpu/i915.rst

+1 −4
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ High Definition Audio 
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c

   :internal:



.. kernel-doc:: include/drm/i915_component.h

.. kernel-doc:: include/drm/intel/i915_component.h

   :internal:



Intel HDMI LPE Audio Support
@@ -210,9 +210,6 @@ DMC wakelock support 
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc_wl.c

   :doc: DMC wakelock support



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc_wl.c

   :internal:



Video BIOS Table (VBT)

----------------------

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -11012,6 +11012,7 @@ S: Supported 
F:	drivers/gpu/drm/i915/display/

F:	drivers/gpu/drm/xe/display/

F:	drivers/gpu/drm/xe/compat-i915-headers

F:	include/drm/intel/









INTEL DRM I915 DRIVER (Meteor Lake, DG2 and older excluding Poulsbo, Moorestown and derivative)









M:	Jani Nikula <jani.nikula@linux.intel.com>








@@ -11024,12 +11025,12 @@ W:	https://drm.pages.freedesktop.org/intel-docs/







Q:	http://patchwork.freedesktop.org/project/intel-gfx/









B:	https://drm.pages.freedesktop.org/intel-docs/how-to-file-i915-bugs.html









C:	irc://irc.oftc.net/intel-gfx









T:	git git://anongit.freedesktop.org/drm-intel









T:	git https://gitlab.freedesktop.org/drm/i915/kernel.git









F:	Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon









F:	Documentation/gpu/i915.rst









F:	drivers/gpu/drm/ci/xfails/i915*









F:	drivers/gpu/drm/i915/









F:	include/drm/i915*









F:	include/drm/intel/









F:	include/uapi/drm/i915_drm.h

















INTEL DRM XE DRIVER (Lunar Lake and newer)








@@ -11045,7 +11046,7 @@ T:	git https://gitlab.freedesktop.org/drm/xe/kernel.git







F:	Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon









F:	Documentation/gpu/xe/









F:	drivers/gpu/drm/xe/









F:	include/drm/xe*









F:	include/drm/intel/









F:	include/uapi/drm/xe_drm.h

















INTEL ETHERNET DRIVERS
































arch/x86/kernel/early-quirks.c



+42
−43






























Original line number
Diff line number
Diff line







@@ -17,8 +17,8 @@







#include <linux/bcma/bcma.h>









#include <linux/bcma/bcma_regs.h>









#include <linux/platform_data/x86/apple.h>









#include <drm/i915_drm.h>









#include <drm/i915_pciids.h>









#include <drm/intel/i915_drm.h>









#include <drm/intel/i915_pciids.h>









#include <asm/pci-direct.h>









#include <asm/dma.h>









#include <asm/io_apic.h>








@@ -518,47 +518,46 @@ static const struct intel_early_ops gen11_early_ops __initconst = {

















/* Intel integrated GPUs for which we need to reserve "stolen memory" */









static const struct pci_device_id intel_early_ids[] __initconst = {









	INTEL_I830_IDS(&i830_early_ops),









	INTEL_I845G_IDS(&i845_early_ops),









	INTEL_I85X_IDS(&i85x_early_ops),









	INTEL_I865G_IDS(&i865_early_ops),









	INTEL_I915G_IDS(&gen3_early_ops),









	INTEL_I915GM_IDS(&gen3_early_ops),









	INTEL_I945G_IDS(&gen3_early_ops),









	INTEL_I945GM_IDS(&gen3_early_ops),









	INTEL_VLV_IDS(&gen6_early_ops),









	INTEL_PINEVIEW_G_IDS(&gen3_early_ops),









	INTEL_PINEVIEW_M_IDS(&gen3_early_ops),









	INTEL_I965G_IDS(&gen3_early_ops),









	INTEL_G33_IDS(&gen3_early_ops),









	INTEL_I965GM_IDS(&gen3_early_ops),









	INTEL_GM45_IDS(&gen3_early_ops),









	INTEL_G45_IDS(&gen3_early_ops),









	INTEL_IRONLAKE_D_IDS(&gen3_early_ops),









	INTEL_IRONLAKE_M_IDS(&gen3_early_ops),









	INTEL_SNB_D_IDS(&gen6_early_ops),









	INTEL_SNB_M_IDS(&gen6_early_ops),









	INTEL_IVB_M_IDS(&gen6_early_ops),









	INTEL_IVB_D_IDS(&gen6_early_ops),









	INTEL_HSW_IDS(&gen6_early_ops),









	INTEL_BDW_IDS(&gen8_early_ops),









	INTEL_CHV_IDS(&chv_early_ops),









	INTEL_SKL_IDS(&gen9_early_ops),









	INTEL_BXT_IDS(&gen9_early_ops),









	INTEL_KBL_IDS(&gen9_early_ops),









	INTEL_CFL_IDS(&gen9_early_ops),









	INTEL_GLK_IDS(&gen9_early_ops),









	INTEL_CNL_IDS(&gen9_early_ops),









	INTEL_ICL_11_IDS(&gen11_early_ops),









	INTEL_EHL_IDS(&gen11_early_ops),









	INTEL_JSL_IDS(&gen11_early_ops),









	INTEL_TGL_12_IDS(&gen11_early_ops),









	INTEL_RKL_IDS(&gen11_early_ops),









	INTEL_ADLS_IDS(&gen11_early_ops),









	INTEL_ADLP_IDS(&gen11_early_ops),









	INTEL_ADLN_IDS(&gen11_early_ops),









	INTEL_RPLS_IDS(&gen11_early_ops),









	INTEL_RPLP_IDS(&gen11_early_ops),









	INTEL_I830_IDS(INTEL_VGA_DEVICE, &i830_early_ops),









	INTEL_I845G_IDS(INTEL_VGA_DEVICE, &i845_early_ops),









	INTEL_I85X_IDS(INTEL_VGA_DEVICE, &i85x_early_ops),









	INTEL_I865G_IDS(INTEL_VGA_DEVICE, &i865_early_ops),









	INTEL_I915G_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_I915GM_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_I945G_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_I945GM_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_VLV_IDS(INTEL_VGA_DEVICE, &gen6_early_ops),









	INTEL_PNV_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_I965G_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_G33_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_I965GM_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_GM45_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_G45_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_ILK_IDS(INTEL_VGA_DEVICE, &gen3_early_ops),









	INTEL_SNB_IDS(INTEL_VGA_DEVICE, &gen6_early_ops),









	INTEL_IVB_IDS(INTEL_VGA_DEVICE, &gen6_early_ops),









	INTEL_HSW_IDS(INTEL_VGA_DEVICE, &gen6_early_ops),









	INTEL_BDW_IDS(INTEL_VGA_DEVICE, &gen8_early_ops),









	INTEL_CHV_IDS(INTEL_VGA_DEVICE, &chv_early_ops),









	INTEL_SKL_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_BXT_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_KBL_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_CFL_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_WHL_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_CML_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_GLK_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_CNL_IDS(INTEL_VGA_DEVICE, &gen9_early_ops),









	INTEL_ICL_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_EHL_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_JSL_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_TGL_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_RKL_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_ADLS_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_ADLP_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_ADLN_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_RPLS_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_RPLU_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









	INTEL_RPLP_IDS(INTEL_VGA_DEVICE, &gen11_early_ops),









};



















struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0);
































drivers/char/agp/intel-agp.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -12,7 +12,7 @@







#include <asm/smp.h>









#include "agp.h"









#include "intel-agp.h"









#include <drm/intel-gtt.h>









#include <drm/intel/intel-gtt.h>



















static int intel_fetch_size(void)









{
































drivers/char/agp/intel-gtt.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -25,7 +25,7 @@







#include <asm/smp.h>









#include "agp.h"









#include "intel-agp.h"









#include <drm/intel-gtt.h>









#include <drm/intel/intel-gtt.h>









#include <asm/set_memory.h>



















/*