Commit bf99ceb6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2024-11-04' of... 

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

 into drm-next

drm/i915 feature pull #2 for v6.13:

Features and functionality:

- Pantherlake (PTL) Xe3 LPD display enabling for xe driver (Clint, Suraj,
  Dnyaneshwar, Matt, Gustavo, Radhakrishna, Chaitanya, Haridhar, Juha-Pekka, Ravi)
- Enable dbuf overlap detection on Lunarlake and later (Stanislav, Vinod)
- Allow fastset for HDR infoframe changes (Chaitanya)
- Write DP source OUI also for non-eDP sinks (Imre)

Refactoring and cleanups:
- Independent platform identification for display (Jani)
- Display tracepoint fixes and cleanups (Gustavo)
- Share PCI ID headers between i915 and xe drivers (Jani)
- Use x100 version for full version and release checks (Jani)
- Conversions to struct intel_display (Jani, Ville)
- Reuse DP DPCD and AUX macros in gvt instead of duplication (Jani)
- Use string choice helpers (R Sundar, Sai Teja)
- Remove unused underrun detection irq code (Sai Teja)
- Color management debug improvements and other cleanups (Ville)
- Refactor panel fitter code to a separate file (Ville)
- Use try_cmpxchg() instead of open-coding (Uros Bizjak)

Fixes:
- PSR and Panel Replay fixes and workarounds (Jouni)
- Fix panel power during connector detection (Imre)
- Fix connector detection and modeset races (Imre)
- Fix C20 PHY TX MISC configuration (Gustavo)
- Improve panel fitter validity checks (Ville)
- Fix eDP short HPD interrupt handling while runtime suspended (Imre)
- Propagate DP MST DSC BW overhead/slice calculation errors (Imre)
- Stop hotplug polling for eDP connectors (Imre)
- Workaround panels reporting bad link status after PSR enable (Jouni)
- Panel Replay VRR VSC SDP related workaround and refactor (Animesh, Mitul)
- Fix memory leak on eDP init error path (Shuicheng)
- Fix GVT KVMGT Kconfig dependencies (Arnd Bergmann)
- Fix irq function documentation build warning (Rodrigo)
- Add platform check to power management fuse bit read (Clint)
- Revert kstrdup_const() and kfree_const() usage for clarity (Christophe JAILLET)
- Workaround horizontal odd panning issues in display versions 20 and 30 (Nemesa)
- Fix xe drive HDCP GSC firmware check (Suraj)

Merges:
- Backmerge drm-next to get some KVM changes (Rodrigo)
- Fix a build failure originating from previous backmerge (Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# Conflicts:
#	drivers/gpu/drm/i915/display/intel_dp_mst.c
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87h68ni0wd.fsf@intel.com
parents 9bed494c 82ab75c4

Documentation/gpu/i915.rst

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ Interrupt Handling 
   :functions: intel_irq_init intel_irq_init_hw intel_hpd_init



.. kernel-doc:: drivers/gpu/drm/i915/i915_irq.c

   :functions: intel_runtime_pm_disable_interrupts

   :functions: intel_irq_suspend



.. kernel-doc:: drivers/gpu/drm/i915/i915_irq.c

   :functions: intel_runtime_pm_enable_interrupts

   :functions: intel_irq_resume



Intel GVT-g Guest Support(vGPU)

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

arch/x86/kernel/early-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/bcma/bcma_regs.h>

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

#include <drm/intel/i915_drm.h>

#include <drm/intel/i915_pciids.h>

#include <drm/intel/pciids.h>

#include <asm/pci-direct.h>

#include <asm/dma.h>

#include <asm/io_apic.h>

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ i915-y += \ 
	display/intel_lspcon.o \

	display/intel_lvds.o \

	display/intel_panel.o \

	display/intel_pfit.o \

	display/intel_pps.o \

	display/intel_qp_tables.o \

	display/intel_sdvo.o \

drivers/gpu/drm/i915/display/g4x_dp.c

+9 −10
Original line number Diff line number Diff line
@@ -170,10 +170,9 @@ static void assert_dp_port(struct intel_dp *intel_dp, bool state) 
{

	struct intel_display *display = to_intel_display(intel_dp);

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	bool cur_state = intel_de_read(display, intel_dp->output_reg) & DP_PORT_EN;



	I915_STATE_WARN(dev_priv, cur_state != state,

	INTEL_DISPLAY_STATE_WARN(display, cur_state != state,

				 "[ENCODER:%d:%s] state assertion failure (expected %s, current %s)\n",

				 dig_port->base.base.base.id, dig_port->base.base.name,

				 str_on_off(state), str_on_off(cur_state));
@@ -185,7 +184,7 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state) 
	struct intel_display *display = &dev_priv->display;

	bool cur_state = intel_de_read(display, DP_A) & DP_PLL_ENABLE;



	I915_STATE_WARN(dev_priv, cur_state != state,

	INTEL_DISPLAY_STATE_WARN(display, cur_state != state,

				 "eDP PLL state assertion failure (expected %s, current %s)\n",

				 str_on_off(state), str_on_off(cur_state));

}
@@ -706,8 +705,7 @@ static void intel_enable_dp(struct intel_atomic_state *state, 
		if (IS_CHERRYVIEW(dev_priv))

			lane_mask = intel_dp_unused_lane_mask(pipe_config->lane_count);



		vlv_wait_port_ready(dev_priv, dp_to_dig_port(intel_dp),

				    lane_mask);

		vlv_wait_port_ready(display, dp_to_dig_port(intel_dp), lane_mask);

	}



	intel_dp_set_power(intel_dp, DP_SET_POWER_D0);
@@ -1251,6 +1249,7 @@ static void intel_dp_encoder_reset(struct drm_encoder *encoder) 
	intel_dp->DP = intel_de_read(display, intel_dp->output_reg);



	intel_dp->reset_link_params = true;

	intel_dp_invalidate_source_oui(intel_dp);



	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		vlv_pps_pipe_reset(intel_dp);

drivers/gpu/drm/i915/display/g4x_hdmi.c

+4 −5
Original line number Diff line number Diff line
@@ -480,8 +480,8 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state, 
				const struct intel_crtc_state *pipe_config,

				const struct drm_connector_state *conn_state)

{

	struct intel_display *display = to_intel_display(encoder);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	vlv_phy_pre_encoder_enable(encoder, pipe_config);
@@ -496,7 +496,7 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state, 


	g4x_hdmi_enable_port(encoder, pipe_config);



	vlv_wait_port_ready(dev_priv, dig_port, 0x0);

	vlv_wait_port_ready(display, dig_port, 0x0);

}



static void vlv_hdmi_pre_pll_enable(struct intel_atomic_state *state,
@@ -557,9 +557,8 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state, 
				const struct intel_crtc_state *pipe_config,

				const struct drm_connector_state *conn_state)

{

	struct intel_display *display = to_intel_display(encoder);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct drm_device *dev = encoder->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);



	chv_phy_pre_encoder_enable(encoder, pipe_config);
@@ -573,7 +572,7 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state, 


	g4x_hdmi_enable_port(encoder, pipe_config);



	vlv_wait_port_ready(dev_priv, dig_port, 0x0);

	vlv_wait_port_ready(display, dig_port, 0x0);



	/* Second common lane will stay alive on its own now */

	chv_phy_release_cl2_override(encoder);