Commit 47cd3af6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2022-09-16-1' of... 

Merge tag 'drm-intel-next-2022-09-16-1' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

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

Features and functionality:
- More Meteorlake platform enabling (Radhakrishna, Imre, Madhumitha)
- Allow seamless M/N changes on eDP panels that support it (Ville)
- Switch DSC debugfs from output bpp to input bpc (Swati)

Refactoring and cleanups:
- Clocking and DPLL refactoring and cleanups to support seamless M/N (Ville)
- Plenty of VBT definition and parsing updates and cleanups (Ville)
- Extract SKL watermark code to a separate file, and clean up (Ville)
- Clean up IPC interfaces and debugfs (Jani)
- Continue moving display data under drm_i915_private display sub-struct (Jani)
- Display quirk handling refactoring and abstractions (Jani)
- Stop using implicit dev_priv in gmbus registers (Jani)
- BUG_ON() removals and conversions to drm_WARN_ON() and BUILD_BUG_ON() (Jani)
- Use drm_dp_phy_name() for logging (Jani)
- Use REG_BIT() macros for CDCLK registers (Stan)
- Move display and media IP versions to runtime info (Radhakrishna)

Fixes:
- Fix DP MST suspend to avoid use-after-free (Andrzej)
- Fix HPD suspend to avoid use-after-free for fbdev (Andrzej)
- Fix various PSR issues regarding selective update and damage clips (Jouni)
- Fix runtime pm wakerefs for driver remove and release (Mitul Golani)
- Fix conditions for filtering fixed modes for panels (Ville)
- Fix TV encoder clock computation (Ville)
- Fix dvo mode_valid hook return type (Nathan Huckleberry)

Merges:
- Backmerge drm-next to sync the DP MST atomic changes (Jani)

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

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87o7vfr064.fsf@intel.com
parents 72ca70ac 21f0b7da

drivers/gpu/drm/i915/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ i915-y += \ 
	display/intel_vga.o \

	display/i9xx_plane.o \

	display/skl_scaler.o \

	display/skl_universal_plane.o

	display/skl_universal_plane.o \

	display/skl_watermark.o

i915-$(CONFIG_ACPI) += \

	display/intel_acpi.o \

	display/intel_opregion.o

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state) 
	 * Should measure whether using a lower cdclk w/o IPS

	 */

	if (IS_BROADWELL(i915) &&

	    crtc_state->pixel_rate > i915->max_cdclk_freq * 95 / 100)

	    crtc_state->pixel_rate > i915->display.cdclk.max_cdclk_freq * 95 / 100)

		return false;



	return true;

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct intel_fbc *i9xx_plane_fbc(struct drm_i915_private *dev_priv, 
					enum i9xx_plane_id i9xx_plane)

{

	if (i9xx_plane_has_fbc(dev_priv, i9xx_plane))

		return dev_priv->fbc[INTEL_FBC_A];

		return dev_priv->display.fbc[INTEL_FBC_A];

	else

		return NULL;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,8 @@ static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder, 
	/* FIXME: initialize from VBT */

	vdsc_cfg->rc_model_size = DSC_RC_MODEL_SIZE_CONST;



	vdsc_cfg->pic_height = crtc_state->hw.adjusted_mode.crtc_vdisplay;



	ret = intel_dsc_compute_params(crtc_state);

	if (ret)

		return ret;

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

+4 −4
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector, 
	struct intel_digital_connector_state *intel_conn_state =

		to_intel_digital_connector_state(state);



	if (property == dev_priv->force_audio_property)

	if (property == dev_priv->display.properties.force_audio)

		*val = intel_conn_state->force_audio;

	else if (property == dev_priv->broadcast_rgb_property)

	else if (property == dev_priv->display.properties.broadcast_rgb)

		*val = intel_conn_state->broadcast_rgb;

	else {

		drm_dbg_atomic(&dev_priv->drm,
@@ -95,12 +95,12 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector, 
	struct intel_digital_connector_state *intel_conn_state =

		to_intel_digital_connector_state(state);



	if (property == dev_priv->force_audio_property) {

	if (property == dev_priv->display.properties.force_audio) {

		intel_conn_state->force_audio = val;

		return 0;

	}



	if (property == dev_priv->broadcast_rgb_property) {

	if (property == dev_priv->display.properties.broadcast_rgb) {

		intel_conn_state->broadcast_rgb = val;

		return 0;

	}