Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c90c275c authored by Dhinakaran Pandiyan's avatar Dhinakaran Pandiyan Committed by Rodrigo Vivi
Browse files

drm/i915/psr: Update PSR2 resolution check for Cannonlake 



In fact, apply the Cannonlake resolution check for all >= Gen-10 platforms
to be safe.

v3: Update GLK too. (Ville)
    Longer variable names.
    if-else in place of ternary operator.
v2: Use local variables for resolution limits and print them (Ville)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Elio Martinez Monroy <elio.martinez.monroy@intel.com>
Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180306203355.29292-1-dhinakaran.pandiyan@intel.com
parent f41d19be

drivers/gpu/drm/i915/intel_psr.c

+15 −6
Original line number Original line Diff line number Diff line
@@ -451,8 +451,9 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, 
{

{

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	const struct drm_display_mode *adjusted_mode =

	int crtc_hdisplay = crtc_state->base.adjusted_mode.crtc_hdisplay;

		&crtc_state->base.adjusted_mode;

	int crtc_vdisplay = crtc_state->base.adjusted_mode.crtc_vdisplay;

	int psr_max_h = 0, psr_max_v = 0;





	/*

	/*

	 * FIXME psr2_support is messed up. It's both computed

	 * FIXME psr2_support is messed up. It's both computed
@@ -462,10 +463,18 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, 
	if (!dev_priv->psr.psr2_support)

	if (!dev_priv->psr.psr2_support)

		return false;

		return false;





	/* PSR2 is restricted to work with panel resolutions up to 3640x2304 */

	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {

	if (adjusted_mode->crtc_hdisplay > 3640 ||

		psr_max_h = 4096;

	    adjusted_mode->crtc_vdisplay > 2304) {

		psr_max_v = 2304;

		DRM_DEBUG_KMS("PSR2 not enabled, panel resolution too big\n");

	} else if (IS_GEN9(dev_priv)) {

		psr_max_h = 3640;

		psr_max_v = 2304;

	}



	if (crtc_hdisplay > psr_max_h || crtc_vdisplay > psr_max_v) {

		DRM_DEBUG_KMS("PSR2 not enabled, resolution %dx%d > max supported %dx%d\n",

			      crtc_hdisplay, crtc_vdisplay,

			      psr_max_h, psr_max_v);

		return false;

		return false;

	}

	}