From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 2/4] drm/i915: Handle cdclk limits on broadwell.
Date: Tue, 24 Nov 2015 11:29:03 +0100 [thread overview]
Message-ID: <1448360945-5723-3-git-send-email-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <1448360945-5723-1-git-send-email-maarten.lankhorst@linux.intel.com>
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.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 351ecb69e5eb..3c46037b6e55 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9677,14 +9677,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",
- cdclk, dev_priv->max_cdclk_freq);
- cdclk = dev_priv->max_cdclk_freq;
+ DRM_INFO("requested cdclk (%d kHz) exceeds max (%d kHz)\n",
+ cdclk, dev_priv->max_cdclk_freq);
+ return -EINVAL;
}
to_intel_atomic_state(state)->cdclk = cdclk;
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-11-24 10:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-24 10:29 [PATCH 0/4] cdclk fixes Maarten Lankhorst
2015-11-24 10:29 ` [PATCH 1/4] drm/i915/skl: Do not allow scaling when crtc is disabled Maarten Lankhorst
2015-12-14 12:07 ` Mika Kahola
2015-11-24 10:29 ` Maarten Lankhorst [this message]
2015-11-24 10:36 ` [PATCH 2/4] drm/i915: Handle cdclk limits on broadwell Chris Wilson
2015-11-24 10:29 ` [PATCH 3/4] drm/i915: Do not acquire crtc state to check clock during modeset, v3 Maarten Lankhorst
2015-12-15 10:22 ` Mika Kahola
2015-12-15 10:26 ` Chris Wilson
2015-12-16 12:48 ` Mika Kahola
2015-12-16 10:10 ` Maarten Lankhorst
2015-11-24 10:29 ` [PATCH 4/4] drm/i915/bxt: Use the bypass frequency if there are no active pipes Maarten Lankhorst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448360945-5723-3-git-send-email-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).