|
@@ -1925,7 +1925,6 @@ static int ironlake_irq_postinstall(struct drm_device *dev)
|
|
|
u32 render_irqs;
|
|
|
u32 hotplug_mask;
|
|
|
|
|
|
- dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
|
|
|
dev_priv->irq_mask = ~display_mask;
|
|
|
|
|
|
/* should always can generate irq */
|
|
@@ -1994,7 +1993,6 @@ static int ivybridge_irq_postinstall(struct drm_device *dev)
|
|
|
u32 render_irqs;
|
|
|
u32 hotplug_mask;
|
|
|
|
|
|
- dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
|
|
|
dev_priv->irq_mask = ~display_mask;
|
|
|
|
|
|
/* should always can generate irq */
|
|
@@ -2047,8 +2045,6 @@ static int valleyview_irq_postinstall(struct drm_device *dev)
|
|
|
dev_priv->pipestat[0] = 0;
|
|
|
dev_priv->pipestat[1] = 0;
|
|
|
|
|
|
- dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
|
|
|
-
|
|
|
/* Hack for broken MSIs on VLV */
|
|
|
pci_write_config_dword(dev_priv->dev->pdev, 0x94, 0xfee00000);
|
|
|
pci_read_config_word(dev->pdev, 0x98, &msid);
|
|
@@ -2123,8 +2119,6 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
|
|
|
if (!dev_priv)
|
|
|
return;
|
|
|
|
|
|
- dev_priv->vblank_pipe = 0;
|
|
|
-
|
|
|
for_each_pipe(pipe)
|
|
|
I915_WRITE(PIPESTAT(pipe), 0xffff);
|
|
|
|
|
@@ -2146,8 +2140,6 @@ static void ironlake_irq_uninstall(struct drm_device *dev)
|
|
|
if (!dev_priv)
|
|
|
return;
|
|
|
|
|
|
- dev_priv->vblank_pipe = 0;
|
|
|
-
|
|
|
I915_WRITE(HWSTAM, 0xffffffff);
|
|
|
|
|
|
I915_WRITE(DEIMR, 0xffffffff);
|
|
@@ -2181,8 +2173,6 @@ static int i8xx_irq_postinstall(struct drm_device *dev)
|
|
|
{
|
|
|
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
|
|
|
|
|
- dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
|
|
|
-
|
|
|
dev_priv->pipestat[0] = 0;
|
|
|
dev_priv->pipestat[1] = 0;
|
|
|
|
|
@@ -2297,8 +2287,6 @@ static void i8xx_irq_uninstall(struct drm_device * dev)
|
|
|
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
|
|
int pipe;
|
|
|
|
|
|
- dev_priv->vblank_pipe = 0;
|
|
|
-
|
|
|
for_each_pipe(pipe) {
|
|
|
/* Clear enable bits; then clear status bits */
|
|
|
I915_WRITE(PIPESTAT(pipe), 0);
|
|
@@ -2334,8 +2322,6 @@ static int i915_irq_postinstall(struct drm_device *dev)
|
|
|
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
|
|
u32 enable_mask;
|
|
|
|
|
|
- dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
|
|
|
-
|
|
|
dev_priv->pipestat[0] = 0;
|
|
|
dev_priv->pipestat[1] = 0;
|
|
|
|
|
@@ -2521,8 +2507,6 @@ static void i915_irq_uninstall(struct drm_device * dev)
|
|
|
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
|
|
int pipe;
|
|
|
|
|
|
- dev_priv->vblank_pipe = 0;
|
|
|
-
|
|
|
if (I915_HAS_HOTPLUG(dev)) {
|
|
|
I915_WRITE(PORT_HOTPLUG_EN, 0);
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
|
|
@@ -2566,8 +2550,6 @@ static int i965_irq_postinstall(struct drm_device *dev)
|
|
|
u32 enable_mask;
|
|
|
u32 error_mask;
|
|
|
|
|
|
- dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
|
|
|
-
|
|
|
/* Unmask the interrupts that we always want on. */
|
|
|
dev_priv->irq_mask = ~(I915_ASLE_INTERRUPT |
|
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
|
@@ -2778,8 +2760,6 @@ static void i965_irq_uninstall(struct drm_device * dev)
|
|
|
if (!dev_priv)
|
|
|
return;
|
|
|
|
|
|
- dev_priv->vblank_pipe = 0;
|
|
|
-
|
|
|
if (I915_HAS_HOTPLUG(dev)) {
|
|
|
I915_WRITE(PORT_HOTPLUG_EN, 0);
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
|