Commit 49ed9f39 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2023-01-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



drm/i915 feature pull #2 v6.3:

Features and functionality:
- Enable HF-EEODB by switching HDMI, DP and LVDS to use struct drm_edid (Jani)
- Start using unversioned DMC firmware paths for new platforms (Gustavo)

Refactoring and cleanups:
- ELD refactor: Stop using hardware buffer, precompute ELD, and wire up ELD in
  the state checker (Ville)
- Use generics for debugfs device parameters (Jani)
- DSB refactoring and fixes (Ville)
- Header refactoring, add new intel_display_limits.h (Jani)
- Split out GMCH code to a new file (Jani)
- Split out vblank code to a new file (Jani)
- i915_drv.h and struct drm_i915_private cleanups (Jani)
- Simplify FBC and DRRS debug attributes (Deepak R Varma)
- Remove some single-use macros (Rodrigo)

Fixes:
- Fix scaler limits for display versions 12 and 13 (Luca)
- Fix plane source size check for zero height (Drew Davenport)
- Implement PSR2 selective fetch workaround (Jouni)
- Expand a PSR workaound to more platforms and pipes (Jouni)
- Expand an HDMI infoframe workaround to all MTL steppings (Jouni)
- Enable PIPEDMC whenever its corresponding pipe is enabled (Imre)

Merges:
- Backmerge drm-next (Jani)

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

drivers/gpu/drm/i915/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ i915-y += i915_driver.o \ 
# core peripheral code

i915-y += \

	soc/intel_dram.o \

	soc/intel_gmch.o \

	soc/intel_pch.o



# core library code
@@ -266,6 +267,7 @@ i915-y += \ 
	display/intel_quirks.o \

	display/intel_sprite.o \

	display/intel_tc.o \

	display/intel_vblank.o \

	display/intel_vga.o \

	display/i9xx_plane.o \

	display/skl_scaler.o \

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

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder, 


	if (intel_dp_is_edp(intel_dp))

		intel_edp_fixup_vbt_bpp(encoder, pipe_config->pipe_bpp);



	intel_audio_codec_get_config(encoder, pipe_config);

}



static void

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

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, 
	intel_read_infoframe(encoder, pipe_config,

			     HDMI_INFOFRAME_TYPE_VENDOR,

			     &pipe_config->infoframes.hdmi);



	intel_audio_codec_get_config(encoder, pipe_config);

}



static void g4x_hdmi_enable_port(struct intel_encoder *encoder,

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

+1 −1
Original line number Diff line number Diff line
@@ -2054,7 +2054,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 
		goto err;

	}



	intel_panel_init(intel_connector);

	intel_panel_init(intel_connector, NULL);



	intel_backlight_setup(intel_connector, INVALID_PIPE);

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


#include "gt/intel_rps.h"



#include "i915_config.h"

#include "intel_atomic_plane.h"

#include "intel_cdclk.h"

#include "intel_display_trace.h"