Skip to content

Commit

Permalink
Partially revert "drm/i915: s/mdelay/msleep/" in ilk rps code
Browse files Browse the repository at this point in the history
This reverts commit 6adfb1e.

Ironlake RPS code runs under an irqsave spinlock and hence sleeping
isn't allowed. Not a this long delay while blocking irqs isn't great
at all, but fixing the locking scheme is a lot more involved.

So just revert for now.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reported-by: kernel test robot <ying.huang@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
  • Loading branch information
Daniel Vetter committed Jul 20, 2015
1 parent e0548f1 commit dd92d8d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/intel_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -4266,7 +4266,7 @@ static void ironlake_enable_drps(struct drm_device *dev)

if (wait_for_atomic((I915_READ(MEMSWCTL) & MEMCTL_CMD_STS) == 0, 10))
DRM_ERROR("stuck trying to change perf mode\n");
msleep(1);
mdelay(1);

ironlake_set_drps(dev, fstart);

Expand Down Expand Up @@ -4297,10 +4297,10 @@ static void ironlake_disable_drps(struct drm_device *dev)

/* Go back to the starting frequency */
ironlake_set_drps(dev, dev_priv->ips.fstart);
msleep(1);
mdelay(1);
rgvswctl |= MEMCTL_CMD_STS;
I915_WRITE(MEMSWCTL, rgvswctl);
msleep(1);
mdelay(1);

spin_unlock_irq(&mchdev_lock);
}
Expand Down

0 comments on commit dd92d8d

Please sign in to comment.