Commit 3d335a52 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2022-11-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



GVT Changes:
- gvt-next stuff mostly with refactor for the new MDEV interface.

i915 Changes:
- PSR fixes and improvements (Jouni)
- DP DSC fixes (Vinod, Jouni)
- More general display cleanups (Jani)
- More display collor management cleanup targetting degamma (Ville)
- remove circ_buf.h includes (Jiri)
- wait power off delay at driver remove to optimize probe (Jani)
- More audio cleanup targeting the ELD precompute readout (Ville)
- Enable DC power states on all eDP ports (Imre)
- RPL-P stepping info (Matt Atwood)
- MTL enabling patches (RK)
- Removal of DG2 force_probe (Matt)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y3f71obyEkImXoUF@intel.com
parents 242eb7b0 d2eae8e9

drivers/gpu/drm/i915/Makefile

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

	display/intel_hdcp.o \

	display/intel_hotplug.o \

	display/intel_hti.o \

	display/intel_lpe_audio.o \

	display/intel_modeset_verify.o \

	display/intel_modeset_setup.o \

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/string_helpers.h>



#include "g4x_dp.h"

#include "i915_reg.h"

#include "intel_audio.h"

#include "intel_backlight.h"

#include "intel_connector.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <linux/types.h>



#include "i915_reg.h"

#include "i915_reg_defs.h"



enum pipe;

enum port;

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

+14 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include "g4x_hdmi.h"

#include "i915_reg.h"

#include "intel_audio.h"

#include "intel_connector.h"

#include "intel_crtc.h"
@@ -78,6 +79,18 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, 
	return ret;

}



static int g4x_hdmi_compute_config(struct intel_encoder *encoder,

				   struct intel_crtc_state *crtc_state,

				   struct drm_connector_state *conn_state)

{

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



	if (HAS_PCH_SPLIT(i915))

		crtc_state->has_pch_encoder = true;



	return intel_hdmi_compute_config(encoder, crtc_state, conn_state);

}



static void intel_hdmi_get_config(struct intel_encoder *encoder,

				  struct intel_crtc_state *pipe_config)

{
@@ -543,7 +556,7 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv, 
			 "HDMI %c", port_name(port));



	intel_encoder->hotplug = intel_hdmi_hotplug;

	intel_encoder->compute_config = intel_hdmi_compute_config;

	intel_encoder->compute_config = g4x_hdmi_compute_config;

	if (HAS_PCH_SPLIT(dev_priv)) {

		intel_encoder->disable = pch_disable_hdmi;

		intel_encoder->post_disable = pch_post_disable_hdmi;

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

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
#include <drm/drm_blend.h>

#include <drm/drm_fourcc.h>



#include "i915_irq.h"

#include "i915_reg.h"

#include "i9xx_plane.h"

#include "intel_atomic.h"

#include "intel_atomic_plane.h"

#include "intel_de.h"
@@ -15,7 +18,6 @@ 
#include "intel_fb.h"

#include "intel_fbc.h"

#include "intel_sprite.h"

#include "i9xx_plane.h"



/* Primary plane formats for gen <= 3 */

static const u32 i8xx_primary_formats[] = {