korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-25 07:14:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: fix open coded gen5_gt_irq_preinstall

Browse Source 
The duplicate was at an _uninstall function, so rename it to
gen5_gt_irq_reset.

v2: - Rebase.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Paulo Zanoni 2014-04-01 15:37:19 -03:00 committed by Daniel Vetter
parent c6d954c173
commit 7c4d664e03
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/i915_irq.c
View File

@ -2886,7 +2886,7 @@ static void ibx_irq_preinstall(struct drm_device *dev)
POSTING_READ(SDEIER); POSTING_READ(SDEIER);
} }
static void gen5_gt_irq_preinstall(struct drm_device *dev) static void gen5_gt_irq_reset(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
@ -2908,7 +2908,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
if (IS_GEN7(dev)) if (IS_GEN7(dev))
I915_WRITE(GEN7_ERR_INT, 0xffffffff); I915_WRITE(GEN7_ERR_INT, 0xffffffff);
gen5_gt_irq_preinstall(dev); gen5_gt_irq_reset(dev);
ibx_irq_preinstall(dev); ibx_irq_preinstall(dev);
} }
@ -2928,7 +2928,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
I915_WRITE(GTIIR, I915_READ(GTIIR)); I915_WRITE(GTIIR, I915_READ(GTIIR));
I915_WRITE(GTIIR, I915_READ(GTIIR)); I915_WRITE(GTIIR, I915_READ(GTIIR));
gen5_gt_irq_preinstall(dev); gen5_gt_irq_reset(dev);
I915_WRITE(DPINVGTT, 0xff); I915_WRITE(DPINVGTT, 0xff);
@ -3346,9 +3346,7 @@ static void ironlake_irq_uninstall(struct drm_device *dev)
if (IS_GEN7(dev)) if (IS_GEN7(dev))
I915_WRITE(GEN7_ERR_INT, 0xffffffff); I915_WRITE(GEN7_ERR_INT, 0xffffffff);
GEN5_IRQ_RESET(GT); gen5_gt_irq_reset(dev);
if (INTEL_INFO(dev)->gen >= 6)
GEN5_IRQ_RESET(GEN6_PM);
if (HAS_PCH_NOP(dev)) if (HAS_PCH_NOP(dev))
return; return;