| Message ID | 1372699150-2661-2-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jul 01, 2013 at 10:19:10AM -0700, Jesse Barnes wrote: > We need to get the current hw state so we can compare against the > expected state. > > References: https://bugs.freedesktop.org/show_bug.cgi?id=66444 > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Both patches merged. I'll squash this one here into the original commit to avoid undue amounts of dmesg noise when bisecting. -Daniel
On Mon, 1 Jul 2013 19:36:32 +0200 Daniel Vetter <daniel@ffwll.ch> wrote: > On Mon, Jul 01, 2013 at 10:19:10AM -0700, Jesse Barnes wrote: > > We need to get the current hw state so we can compare against the > > expected state. > > > > References: https://bugs.freedesktop.org/show_bug.cgi?id=66444 > > > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > Both patches merged. I'll squash this one here into the original commit to > avoid undue amounts of dmesg noise when bisecting. Ta, you need a jbarnes-owes-me-two-beers branch now.
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f1eaf8e..6b0013c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8377,8 +8377,12 @@ check_crtc_state(struct drm_device *dev) base.head) { if (encoder->base.crtc != &crtc->base) continue; - if (encoder->get_config) + if (encoder->get_config && + dev_priv->display.get_clock) { encoder->get_config(encoder, &pipe_config); + dev_priv->display.get_clock(crtc, + &pipe_config); + } } WARN(crtc->active != active,
We need to get the current hw state so we can compare against the expected state. References: https://bugs.freedesktop.org/show_bug.cgi?id=66444 Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_display.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)