Skip to content

Commit

Permalink
drm/i915: Initialize dev_priv->atomic_cdclk_freq at init time
Browse files Browse the repository at this point in the history
Looks like we're only initializing dev_priv->atomic_cdclk_freq
at resume and commit times, not at init time. Let's do that as
well.

We're now hitting the 'WARN_ON(intel_state->cdclk == 0)' in
hsw_compute_linetime_wm() on account of populating
intel_state->cdclk from dev_priv->atomic_cdclk_freq.
Previously we were mispopulating intel_state->cdclk with
dev_priv->cdclk_freq which always had a proper value at init
time and hence the WARN_ON() didn't trigger.

Cc: [email protected]
Cc: Matthew Auld <[email protected]>
Reported-by: Matthew Auld <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98902
Fixes: e0ca7a6 ("drm/i915: Fix cdclk vs. dev_cdclk mess when not recomputing things")
Signed-off-by: Ville Syrjälä <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Tested-by: Matthew Auld <[email protected]>
Reviewed-by: Matthew Auld <[email protected]>
  • Loading branch information
vsyrjala committed Nov 29, 2016
1 parent 34ba5a8 commit 6a259b1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -16516,6 +16516,7 @@ int intel_modeset_init(struct drm_device *dev)

intel_update_czclk(dev_priv);
intel_update_cdclk(dev_priv);
dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq;

intel_shared_dpll_init(dev);

Expand Down

0 comments on commit 6a259b1

Please sign in to comment.