Commit 418eda8f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2020-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



drm/i915 features for v5.9, batch #2

Highlights:
- Very early DG1 enabling (Abdiel, Lucas, Anusha)

Gem/GT:
- Fix spinlock recursion on signaling a signaled request (Chris)
- Perf: Use GTT when saving/restoring engine GPR (Umesh Nerlige Ramappa)

- SSEU refactoring, debugfs move under gt/ (Daniele, Venkata Sandeep Dhanalakota)
- Various GT refactoring and cleanup, preparation for future changes (Daniele)
- Adjust HuC state accordingly after GuC fetch error (Michał Winiarski)
- UC debugfs updates (Michał Winiarski)
- Only revoke the GGTT mmappings on aperture detiling changes (Chris)
- Only revoke mmap handlers if active (Chris)
- Split the context's obj:vma lut into its own mutex (Chris)
- Various memory, mmap and performance optimisations (Chris)
- Improve system stability in case of false CS events (Chris)
- Various refactorings and cleanup (Chris)
- Always reset the engine on execlist failures (Chris)
- Trace placement of timeline HWSP (Chris)
- Update dma-attributes for our sg DMA (Chris)

Display:
- TGL CDCLK workaround tweaks to unbreak 8K display support (Stanislav)
- A number of FBC fixes, along with i865 FBC enabling (Ville)
- Validate MST modes against PBN limits (Lyude, Shawn Lee)
- Do not access non-existing swizzle registers (Lucas)
- Revert GEN11+ HBR3 rate fix that caused issues on TGL (Matt Atwood)
- Update TGL+ combo phy initialization to match spec update (José)
- Fix HDCP Content Protection property state machine (Anshuman)
- Fix HDCP revoked keys handling (Ram)
- Improve DDI BUF status checks and waits (Manasi)
- Various SDVO+HDMI+DVI fixes around colorimetry, clocking, pixel repeat etc. (Ville)
- DP voltage swing function refactoring (José)
- WARN if max vswing/pre-emphasis violates the DP spec (Ville)

Other:
- Add new EHL PCI IDs (José)
- Unify struct intel_digital_port variable naming (Lucas)
- Various taint updates to aid debugging and improve CI (Michał Winiarski)
- Straggler conversions to new mmio register accessors (Daniele)

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

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87a70029vz.fsf@intel.com
parents 5de5b6ec e57bd05e

drivers/gpu/drm/drm_crtc_helper_internal.h

+5 −2
Original line number Diff line number Diff line
@@ -73,8 +73,11 @@ enum drm_mode_status drm_crtc_mode_valid(struct drm_crtc *crtc, 
					 const struct drm_display_mode *mode);

enum drm_mode_status drm_encoder_mode_valid(struct drm_encoder *encoder,

					    const struct drm_display_mode *mode);

enum drm_mode_status drm_connector_mode_valid(struct drm_connector *connector,

					      struct drm_display_mode *mode);

int

drm_connector_mode_valid(struct drm_connector *connector,

			 struct drm_display_mode *mode,

			 struct drm_modeset_acquire_ctx *ctx,

			 enum drm_mode_status *status);



struct drm_encoder *

drm_connector_get_single_encoder(struct drm_connector *connector);

drivers/gpu/drm/drm_probe_helper.c

+66 −35
Original line number Diff line number Diff line
@@ -86,17 +86,19 @@ drm_mode_validate_flag(const struct drm_display_mode *mode, 
	return MODE_OK;

}



static enum drm_mode_status

static int

drm_mode_validate_pipeline(struct drm_display_mode *mode,

			    struct drm_connector *connector)

			   struct drm_connector *connector,

			   struct drm_modeset_acquire_ctx *ctx,

			   enum drm_mode_status *status)

{

	struct drm_device *dev = connector->dev;

	enum drm_mode_status ret = MODE_OK;

	struct drm_encoder *encoder;

	int ret;



	/* Step 1: Validate against connector */

	ret = drm_connector_mode_valid(connector, mode);

	if (ret != MODE_OK)

	ret = drm_connector_mode_valid(connector, mode, ctx, status);

	if (ret || *status != MODE_OK)

		return ret;



	/* Step 2: Validate against encoders and crtcs */
@@ -104,8 +106,8 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode, 
		struct drm_bridge *bridge;

		struct drm_crtc *crtc;



		ret = drm_encoder_mode_valid(encoder, mode);

		if (ret != MODE_OK) {

		*status = drm_encoder_mode_valid(encoder, mode);

		if (*status != MODE_OK) {

			/* No point in continuing for crtc check as this encoder

			 * will not accept the mode anyway. If all encoders

			 * reject the mode then, at exit, ret will not be
@@ -114,10 +116,10 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode, 
		}



		bridge = drm_bridge_chain_get_first_bridge(encoder);

		ret = drm_bridge_chain_mode_valid(bridge,

		*status = drm_bridge_chain_mode_valid(bridge,

						      &connector->display_info,

						      mode);

		if (ret != MODE_OK) {

		if (*status != MODE_OK) {

			/* There is also no point in continuing for crtc check

			 * here. */

			continue;
@@ -127,17 +129,17 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode, 
			if (!drm_encoder_crtc_ok(encoder, crtc))

				continue;



			ret = drm_crtc_mode_valid(crtc, mode);

			if (ret == MODE_OK) {

			*status = drm_crtc_mode_valid(crtc, mode);

			if (*status == MODE_OK) {

				/* If we get to this point there is at least

				 * one combination of encoder+crtc that works

				 * for this mode. Lets return now. */

				return ret;

				return 0;

			}

		}

	}



	return ret;

	return 0;

}



static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector)
@@ -198,16 +200,27 @@ enum drm_mode_status drm_encoder_mode_valid(struct drm_encoder *encoder, 
	return encoder_funcs->mode_valid(encoder, mode);

}



enum drm_mode_status drm_connector_mode_valid(struct drm_connector *connector,

					      struct drm_display_mode *mode)

int

drm_connector_mode_valid(struct drm_connector *connector,

			 struct drm_display_mode *mode,

			 struct drm_modeset_acquire_ctx *ctx,

			 enum drm_mode_status *status)

{

	const struct drm_connector_helper_funcs *connector_funcs =

		connector->helper_private;

	int ret = 0;



	if (!connector_funcs)

		*status = MODE_OK;

	else if (connector_funcs->mode_valid_ctx)

		ret = connector_funcs->mode_valid_ctx(connector, mode, ctx,

						      status);

	else if (connector_funcs->mode_valid)

		*status = connector_funcs->mode_valid(connector, mode);

	else

		*status = MODE_OK;



	if (!connector_funcs || !connector_funcs->mode_valid)

		return MODE_OK;



	return connector_funcs->mode_valid(connector, mode);

	return ret;

}



#define DRM_OUTPUT_POLL_PERIOD (10*HZ)
@@ -385,8 +398,9 @@ EXPORT_SYMBOL(drm_helper_probe_detect); 
 *      (if specified)

 *    - drm_mode_validate_flag() checks the modes against basic connector

 *      capabilities (interlace_allowed,doublescan_allowed,stereo_allowed)

 *    - the optional &drm_connector_helper_funcs.mode_valid helper can perform

 *      driver and/or sink specific checks

 *    - the optional &drm_connector_helper_funcs.mode_valid or

 *      &drm_connector_helper_funcs.mode_valid_ctx helpers can perform driver

 *      and/or sink specific checks

 *    - the optional &drm_crtc_helper_funcs.mode_valid,

 *      &drm_bridge_funcs.mode_valid and &drm_encoder_helper_funcs.mode_valid

 *      helpers can perform driver and/or source specific checks which are also
@@ -517,22 +531,39 @@ retry: 
		mode_flags |= DRM_MODE_FLAG_3D_MASK;



	list_for_each_entry(mode, &connector->modes, head) {

		if (mode->status == MODE_OK)

		if (mode->status != MODE_OK)

			continue;



		mode->status = drm_mode_validate_driver(dev, mode);

		if (mode->status != MODE_OK)

			continue;



		if (mode->status == MODE_OK)

		mode->status = drm_mode_validate_size(mode, maxX, maxY);

		if (mode->status != MODE_OK)

			continue;



		if (mode->status == MODE_OK)

		mode->status = drm_mode_validate_flag(mode, mode_flags);

		if (mode->status != MODE_OK)

			continue;



		ret = drm_mode_validate_pipeline(mode, connector, &ctx,

						 &mode->status);

		if (ret) {

			drm_dbg_kms(dev,

				    "drm_mode_validate_pipeline failed: %d\n",

				    ret);



		if (mode->status == MODE_OK)

			mode->status = drm_mode_validate_pipeline(mode,

								  connector);

			if (drm_WARN_ON_ONCE(dev, ret != -EDEADLK)) {

				mode->status = MODE_ERROR;

			} else {

				drm_modeset_backoff(&ctx);

				goto retry;

			}

		}



		if (mode->status == MODE_OK)

			mode->status = drm_mode_validate_ycbcr420(mode,

								  connector);

		if (mode->status != MODE_OK)

			continue;

		mode->status = drm_mode_validate_ycbcr420(mode, connector);

	}



prune:

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ gt-y += \ 
	gt/intel_ring_submission.o \

	gt/intel_rps.o \

	gt/intel_sseu.o \

	gt/intel_sseu_debugfs.o \

	gt/intel_timeline.o \

	gt/intel_workarounds.o \

	gt/shmem_utils.o \

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

+3 −0
Original line number Diff line number Diff line
@@ -722,6 +722,9 @@ parse_power_conservation_features(struct drm_i915_private *dev_priv, 
	 */

	if (!(power->drrs & BIT(panel_type)))

		dev_priv->vbt.drrs_type = DRRS_NOT_SUPPORTED;



	if (bdb->version >= 232)

		dev_priv->vbt.edp.hobl = power->hobl & BIT(panel_type);

}



static void

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

+9 −2
Original line number Diff line number Diff line
@@ -2080,8 +2080,15 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state) 
	 * Explicitly stating here that this seems to be currently

	 * rather a Hack, than final solution.

	 */

	if (IS_TIGERLAKE(dev_priv))

		min_cdclk = max(min_cdclk, (int)crtc_state->pixel_rate);

	if (IS_TIGERLAKE(dev_priv)) {

		/*

		 * Clamp to max_cdclk_freq in case pixel rate is higher,

		 * in order not to break an 8K, but still leave W/A at place.

		 */

		min_cdclk = max_t(int, min_cdclk,

				  min_t(int, crtc_state->pixel_rate,

					dev_priv->max_cdclk_freq));

	}



	if (min_cdclk > dev_priv->max_cdclk_freq) {

		drm_dbg_kms(&dev_priv->drm,

CRA Git | Maintained and supported by SUSTech CRA and CCSE