diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-28 10:02:45 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-28 10:02:45 +0200 |
| commit | 4adda532c05fa74602408cea319dcace884f7c67 (patch) | |
| tree | 4b48b611e1b49981428b73ee7267c61c92d2dd65 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 22f880ca8246c6c80c4f48731c6a7d5d15042f56 (diff) | |
| parent | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (diff) | |
| download | op-kernel-dev-4adda532c05fa74602408cea319dcace884f7c67.zip op-kernel-dev-4adda532c05fa74602408cea319dcace884f7c67.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at -rc4, which we need to land the 4.12 gvt
patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 3d2e623..d9d1969 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1104,6 +1104,7 @@ static u32 vlv_wa_c0_ei(struct drm_i915_private *dev_priv, u32 pm_iir) u32 render, media; time = ktime_us_delta(now.ktime, prev->ktime); + time *= dev_priv->czclk_freq; /* Workload can be split between render + media, |
