Commit 7971debd authored by Dave Airlie's avatar Dave Airlie
Browse files

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



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

Features and functionality:
- Preparation for i915 display code reuse in upcoming Xe driver (Jani)
- Drop the fastboot module parameter and use the platform defaults (Arun)
- Enable new LNL FBC features (Vinod)
- Add LNL display feature capability reads (Vinod)

Refactoring and cleanups:
- Locally enable W=1 warnings by default in i915 (Jani)
- Move HDCP GSC message code to a separate file (Suraj)
- GVT include cleanups (Jani)
- Move more display init under display/ (Jani)
- DPLL ID refactoring (Ville)
- Better abstraction of GT0 (Jani)
- Move VGA decode function to GMCH code (Uma)
- Use local64_try_cmpxchg() to optimize PMU event read (Uros Bizjak)
- Clean up FBC checks (Ville)
- Constify and unify state checker calling conventions (Ville)
- Add display step name helper (Chaitanya)

Documentation:
- Update CCS and GSC CS documentation (Rodrigo)
- Fix a number of documentation typos (Randy Dunlap)

Fixes:
- VLV DSI fixes and quirks (Hans)
- Fix crtc state memory leaks (Suraj)
- Increase LSPCON mode settle timeout (Niko Tsirakis)
- Stop clobbering old crtc state during state check (Ville)
- Fix VLV color state readout (Ville)
- Fix cx0 PHY pipe reset to allow S0iX (Khaled)
- Ensure DP MST pbn_div is up-to-date after sink reconnect (Imre)
- Drop an unnecessary NULL check to fix static analyzer warning (Suraj)
- Use an explicit rather than implicit include for frontbuffer tracking (Jouni)

Merges:
- Backmerge drm-next to fix a conflict (Jani)

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

Documentation/gpu/i915.rst

+16 −13
Original line number Diff line number Diff line
@@ -267,19 +267,22 @@ i915 driver. 
Intel GPU Basics

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



An Intel GPU has multiple engines. There are several engine types.



- RCS engine is for rendering 3D and performing compute, this is named

  `I915_EXEC_RENDER` in user space.

- BCS is a blitting (copy) engine, this is named `I915_EXEC_BLT` in user

  space.

- VCS is a video encode and decode engine, this is named `I915_EXEC_BSD`

  in user space

- VECS is video enhancement engine, this is named `I915_EXEC_VEBOX` in user

  space.

- The enumeration `I915_EXEC_DEFAULT` does not refer to specific engine;

  instead it is to be used by user space to specify a default rendering

  engine (for 3D) that may or may not be the same as RCS.

An Intel GPU has multiple engines. There are several engine types:



- Render Command Streamer (RCS). An engine for rendering 3D and

  performing compute.

- Blitting Command Streamer (BCS). An engine for performing blitting and/or

  copying operations.

- Video Command Streamer. An engine used for video encoding and decoding. Also

  sometimes called 'BSD' in hardware documentation.

- Video Enhancement Command Streamer (VECS). An engine for video enhancement.

  Also sometimes called 'VEBOX' in hardware documentation.

- Compute Command Streamer (CCS). An engine that has access to the media and

  GPGPU pipelines, but not the 3D pipeline.

- Graphics Security Controller (GSCCS). A dedicated engine for internal

  communication with GSC controller on security related tasks like

  High-bandwidth Digital Content Protection (HDCP), Protected Xe Path (PXP),

  and HuC firmware authentication.



The Intel GPU family is a family of integrated GPU's using Unified

Memory Access. For having the GPU "do work", user space will feed the

drivers/gpu/drm/i915/Makefile

+31 −16
Original line number Diff line number Diff line
@@ -3,24 +3,34 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



# Add a set of useful warning flags and enable -Werror for CI to prevent

# trivial mistakes from creeping in. We have to do this piecemeal as we reject

# any patch that isn't warning clean, so turning on -Wall -Wextra (or W=1) we

# need to filter out dubious warnings.  Still it is our interest

# to keep running locally with W=1 C=1 until we are completely clean.

#

# Note the danger in using -Wall -Wextra is that when CI updates gcc we

# will most likely get a sudden build breakage... Hopefully we will fix

# new warnings before CI updates!

subdir-ccflags-y := -Wall -Wextra

subdir-ccflags-y += -Wno-format-security

subdir-ccflags-y += -Wno-unused-parameter

subdir-ccflags-y += -Wno-type-limits

# Unconditionally enable W=1 warnings locally

# --- begin copy-paste W=1 warnings from scripts/Makefile.extrawarn

subdir-ccflags-y += -Wextra -Wunused -Wno-unused-parameter

subdir-ccflags-y += -Wmissing-declarations

subdir-ccflags-y += $(call cc-option, -Wrestrict)

subdir-ccflags-y += -Wmissing-format-attribute

subdir-ccflags-y += -Wmissing-prototypes

subdir-ccflags-y += -Wold-style-definition

subdir-ccflags-y += -Wmissing-include-dirs

subdir-ccflags-y += $(call cc-option, -Wunused-but-set-variable)

subdir-ccflags-y += $(call cc-option, -Wunused-const-variable)

subdir-ccflags-y += $(call cc-option, -Wpacked-not-aligned)

subdir-ccflags-y += $(call cc-option, -Wformat-overflow)

subdir-ccflags-y += $(call cc-option, -Wformat-truncation)

subdir-ccflags-y += $(call cc-option, -Wstringop-overflow)

subdir-ccflags-y += $(call cc-option, -Wstringop-truncation)

# The following turn off the warnings enabled by -Wextra

ifeq ($(findstring 2, $(KBUILD_EXTRA_WARN)),)

subdir-ccflags-y += -Wno-missing-field-initializers

subdir-ccflags-y += -Wno-sign-compare

subdir-ccflags-y += -Wno-type-limits

subdir-ccflags-y += -Wno-shift-negative-value

subdir-ccflags-y += $(call cc-option, -Wunused-but-set-variable)

subdir-ccflags-y += $(call cc-disable-warning, frame-address)

endif

ifeq ($(findstring 3, $(KBUILD_EXTRA_WARN)),)

subdir-ccflags-y += -Wno-sign-compare

endif

# --- end copy-paste



# Enable -Werror in CI and development

subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror



# Fine grained warnings disable
@@ -28,6 +38,10 @@ CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init) 
CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init)

CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init)



# Support compiling the display code separately for both i915 and xe

# drivers. Define I915 when building i915.

subdir-ccflags-y += -DI915



subdir-ccflags-y += -I$(srctree)/$(src)



# Please keep these build lists sorted!
@@ -265,6 +279,7 @@ i915-y += \ 
	display/intel_global_state.o \

	display/intel_hdcp.o \

	display/intel_hdcp_gsc.o \

	display/intel_hdcp_gsc_message.o \

	display/intel_hotplug.o \

	display/intel_hotplug_irq.o \

	display/intel_hti.o \

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

+26 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct intel_crtc_state; 
struct intel_dp;

struct intel_encoder;



#ifdef I915

const struct dpll *vlv_get_dpll(struct drm_i915_private *i915);

enum pipe vlv_active_pipe(struct intel_dp *intel_dp);

void g4x_dp_set_clock(struct intel_encoder *encoder,
@@ -26,5 +27,30 @@ bool g4x_dp_port_enabled(struct drm_i915_private *dev_priv, 
			 enum pipe *pipe);

bool g4x_dp_init(struct drm_i915_private *dev_priv,

		 i915_reg_t output_reg, enum port port);

#else

static inline const struct dpll *vlv_get_dpll(struct drm_i915_private *i915)

{

	return NULL;

}

static inline int vlv_active_pipe(struct intel_dp *intel_dp)

{

	return 0;

}

static inline void g4x_dp_set_clock(struct intel_encoder *encoder,

				    struct intel_crtc_state *pipe_config)

{

}

static inline bool g4x_dp_port_enabled(struct drm_i915_private *dev_priv,

				       i915_reg_t dp_reg, int port,

				       enum pipe *pipe)

{

	return false;

}

static inline bool g4x_dp_init(struct drm_i915_private *dev_priv,

			       i915_reg_t output_reg, int port)

{

	return false;

}

#endif



#endif

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

+12 −0
Original line number Diff line number Diff line
@@ -15,9 +15,21 @@ struct drm_atomic_state; 
struct drm_connector;

struct drm_i915_private;



#ifdef I915

void g4x_hdmi_init(struct drm_i915_private *dev_priv,

		   i915_reg_t hdmi_reg, enum port port);

int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,

				    struct drm_atomic_state *state);

#else

static inline void g4x_hdmi_init(struct drm_i915_private *dev_priv,

				 i915_reg_t hdmi_reg, int port)

{

}

static inline int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,

						  struct drm_atomic_state *state)

{

	return 0;

}

#endif



#endif

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

+35 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct intel_atomic_state; 
struct intel_crtc;

struct intel_crtc_state;



#ifdef I915

bool hsw_ips_disable(const struct intel_crtc_state *crtc_state);

bool hsw_ips_pre_update(struct intel_atomic_state *state,

			struct intel_crtc *crtc);
@@ -23,5 +24,39 @@ int hsw_ips_compute_config(struct intel_atomic_state *state, 
			   struct intel_crtc *crtc);

void hsw_ips_get_config(struct intel_crtc_state *crtc_state);

void hsw_ips_crtc_debugfs_add(struct intel_crtc *crtc);

#else

static inline bool hsw_ips_disable(const struct intel_crtc_state *crtc_state)

{

	return false;

}

static inline bool hsw_ips_pre_update(struct intel_atomic_state *state,

				      struct intel_crtc *crtc)

{

	return false;

}

static inline void hsw_ips_post_update(struct intel_atomic_state *state,

				       struct intel_crtc *crtc)

{

}

static inline bool hsw_crtc_supports_ips(struct intel_crtc *crtc)

{

	return false;

}

static inline bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)

{

	return false;

}

static inline int hsw_ips_compute_config(struct intel_atomic_state *state,

					 struct intel_crtc *crtc)

{

	return 0;

}

static inline void hsw_ips_get_config(struct intel_crtc_state *crtc_state)

{

}

static inline void hsw_ips_crtc_debugfs_add(struct intel_crtc *crtc)

{

}

#endif



#endif /* __HSW_IPS_H__ */