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

Commit 63ba534e authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Handle cdclk limits on broadwell. 

As the comment indicates this can only fail gracefully when
called from compute_config. Fortunately this is now what's happening,
so the fixme can be removed and the DRM_ERROR downgraded.

Link: http://patchwork.freedesktop.org/patch/msgid/1448360945-5723-3-git-send-email-maarten.lankhorst@linux.intel.com


Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 3c28ff22

drivers/gpu/drm/i915/intel_display.c

+3 −7
Original line number Diff line number Diff line
@@ -9719,14 +9719,10 @@ static int broadwell_modeset_calc_cdclk(struct drm_atomic_state *state) 
	else

		cdclk = 337500;



	/*

	 * FIXME move the cdclk caclulation to

	 * compute_config() so we can fail gracegully.

	 */

	if (cdclk > dev_priv->max_cdclk_freq) {

		DRM_ERROR("requested cdclk (%d kHz) exceeds max (%d kHz)\n",

		DRM_DEBUG_KMS("requested cdclk (%d kHz) exceeds max (%d kHz)\n",

			      cdclk, dev_priv->max_cdclk_freq);

		cdclk = dev_priv->max_cdclk_freq;

		return -EINVAL;

	}



	to_intel_atomic_state(state)->cdclk = cdclk;