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

Merge tag 'drm-intel-next-2021-12-14' of ssh://git.freedesktop.org/git/drm/drm-intel into drm-next 



drm/i915 feature pull #2 for v5.17:

Features and functionality:
- Add eDP privacy screen support (Hans)
- Add Raptor Lake S (RPL-S) support (Anusha)
- Add CD clock squashing support (Mika)
- Properly support ADL-P without force probe (Clint)
- Enable pipe color support (10 bit gamma) for display 13 platforms (Uma)
- Update ADL-P DMC firmware to v2.14 (Madhumitha)

Refactoring and cleanups:
- More FBC refactoring preparing for multiple FBC instances (Ville)
- Plane register cleanups (Ville)
- Header refactoring and include cleanups (Jani)
- Crtc helper and vblank wait function cleanups (Jani, Ville)
- Move pipe/transcoder/abox masks under intel_device_info.display (Ville)

Fixes:
- Add a delay to let eDP source OUI write take effect (Lyude)
- Use div32 version of MPLLB word clock for UHBR on SNPS PHY (Jani)
- Fix DMC firmware loader overflow check (Harshit Mogalapalli)
- Fully disable FBC on FIFO underruns (Ville)
- Disable FBC with double wide pipe as mutually exclusive (Ville)
- DG2 workarounds (Matt)
- Non-x86 build fixes (Siva)
- Fix HDR plane max width for NV12 (Vidya)
- Disable IRQ for selftest timestamp calculation (Anshuman)
- ADL-P VBT DDC pin mapping fix (Tejas)

Merges:
- Backmerge drm-next for privacy screen plumbing (Jani)

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

arch/x86/kernel/early-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { 
	INTEL_RKL_IDS(&gen11_early_ops),

	INTEL_ADLS_IDS(&gen11_early_ops),

	INTEL_ADLP_IDS(&gen11_early_ops),

	INTEL_RPLS_IDS(&gen11_early_ops),

};



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

drivers/gpu/drm/i915/Makefile

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

	display/intel_ddi.o \

	display/intel_ddi_buf_trans.o \

	display/intel_display_trace.o \

	display/intel_dp.o \

	display/intel_dp_aux.o \

	display/intel_dp_aux_backlight.o \

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "intel_audio.h"

#include "intel_backlight.h"

#include "intel_connector.h"

#include "intel_crtc.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dp.h"

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "g4x_hdmi.h"

#include "intel_audio.h"

#include "intel_connector.h"

#include "intel_crtc.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dpio_phy.h"

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

+11 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_fb.h"

#include "intel_fbc.h"

#include "intel_sprite.h"

#include "i9xx_plane.h"
@@ -120,6 +121,15 @@ static bool i9xx_plane_has_fbc(struct drm_i915_private *dev_priv, 
		return i9xx_plane == PLANE_A;

}



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;

	else

		return NULL;

}



static bool i9xx_plane_has_windowing(struct intel_plane *plane)

{

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
@@ -807,10 +817,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
	plane->id = PLANE_PRIMARY;

	plane->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, plane->id);



	if (i9xx_plane_has_fbc(dev_priv, plane->i9xx_plane))

		plane->fbc = &dev_priv->fbc;

	if (plane->fbc)

		plane->fbc->possible_framebuffer_bits |= plane->frontbuffer_bit;

	intel_fbc_add_plane(i9xx_plane_fbc(dev_priv, plane->i9xx_plane), plane);



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

		formats = vlv_primary_formats;