Skip to content

Commit

Permalink
drm/i915: Nuke the VLV/CHV PFI programming power domain workaround
Browse files Browse the repository at this point in the history
The hack to grab the pipe A power domain around VLV/CHV cdclk
programming has surely outlived its usefulness. We should be
holding sufficient power domains during any modeset, so let's
just nuke this hack.

v2: Fix typo in commit message (Ander)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170120182205.8141-13-ville.syrjala@linux.intel.com
  • Loading branch information
Ville Syrjälä committed Feb 8, 2017
1 parent 1a5301a commit 63ff304
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions drivers/gpu/drm/i915/intel_cdclk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1512,24 +1512,10 @@ static void vlv_modeset_commit_cdclk(struct drm_atomic_state *old_state)
{
struct drm_i915_private *dev_priv = to_i915(old_state->dev);

/*
* FIXME: We can end up here with all power domains off, yet
* with a CDCLK frequency other than the minimum. To account
* for this take the PIPE-A power domain, which covers the HW
* blocks needed for the following programming. This can be
* removed once it's guaranteed that we get here either with
* the minimum CDCLK set, or the required power domains
* enabled.
*/
intel_display_power_get(dev_priv, POWER_DOMAIN_PIPE_A);

if (IS_CHERRYVIEW(dev_priv))
chv_set_cdclk(dev_priv, &dev_priv->cdclk.actual);
else
vlv_set_cdclk(dev_priv, &dev_priv->cdclk.actual);


intel_display_power_put(dev_priv, POWER_DOMAIN_PIPE_A);
}

static int bdw_modeset_calc_cdclk(struct drm_atomic_state *state)
Expand Down

0 comments on commit 63ff304

Please sign in to comment.