| 2385,8 → 2385,6 |
|---|
| if (!dev_priv) |
| return; |
| |
| del_timer_sync(&dev_priv->hotplug_reenable_timer); |
| |
| for_each_pipe(pipe) |
| I915_WRITE(PIPESTAT(pipe), 0xffff); |
| |
| 2408,8 → 2406,6 |
|---|
| if (!dev_priv) |
| return; |
| |
| del_timer_sync(&dev_priv->hotplug_reenable_timer); |
| |
| I915_WRITE(HWSTAM, 0xffffffff); |
| |
| I915_WRITE(DEIMR, 0xffffffff); |
| 2792,8 → 2788,6 |
|---|
| drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| int pipe; |
| |
| del_timer_sync(&dev_priv->hotplug_reenable_timer); |
| |
| if (I915_HAS_HOTPLUG(dev)) { |
| I915_WRITE(PORT_HOTPLUG_EN, 0); |
| I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); |
| 3042,8 → 3036,6 |
|---|
| if (!dev_priv) |
| return; |
| |
| del_timer_sync(&dev_priv->hotplug_reenable_timer); |
| |
| I915_WRITE(PORT_HOTPLUG_EN, 0); |
| I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); |
| |
| 3106,34 → 3098,18 |
|---|
| setup_timer(&dev_priv->hotplug_reenable_timer, i915_reenable_hotplug_timer_func, |
| (unsigned long) dev_priv); |
| |
| dev->driver->get_vblank_counter = i915_get_vblank_counter; |
| dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ |
| if (IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5) { |
| dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */ |
| dev->driver->get_vblank_counter = gm45_get_vblank_counter; |
| } |
| |
| if (drm_core_check_feature(dev, DRIVER_MODESET)) |
| dev->driver->get_vblank_timestamp = i915_get_vblank_timestamp; |
| else |
| dev->driver->get_vblank_timestamp = NULL; |
| dev->driver->get_scanout_position = i915_get_crtc_scanoutpos; |
| // dev->driver->get_scanout_position = i915_get_crtc_scanoutpos; |
| |
| if (IS_VALLEYVIEW(dev)) { |
| dev->driver->irq_handler = valleyview_irq_handler; |
| dev->driver->irq_preinstall = valleyview_irq_preinstall; |
| dev->driver->irq_postinstall = valleyview_irq_postinstall; |
| dev->driver->irq_uninstall = valleyview_irq_uninstall; |
| dev->driver->enable_vblank = valleyview_enable_vblank; |
| dev->driver->disable_vblank = valleyview_disable_vblank; |
| dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup; |
| } else if (HAS_PCH_SPLIT(dev)) { |
| dev->driver->irq_handler = ironlake_irq_handler; |
| dev->driver->irq_preinstall = ironlake_irq_preinstall; |
| dev->driver->irq_postinstall = ironlake_irq_postinstall; |
| dev->driver->irq_uninstall = ironlake_irq_uninstall; |
| dev->driver->enable_vblank = ironlake_enable_vblank; |
| dev->driver->disable_vblank = ironlake_disable_vblank; |
| dev_priv->display.hpd_irq_setup = ibx_hpd_irq_setup; |
| } else { |
| if (INTEL_INFO(dev)->gen == 2) { |
| 3140,18 → 3116,14 |
|---|
| } else if (INTEL_INFO(dev)->gen == 3) { |
| dev->driver->irq_preinstall = i915_irq_preinstall; |
| dev->driver->irq_postinstall = i915_irq_postinstall; |
| dev->driver->irq_uninstall = i915_irq_uninstall; |
| dev->driver->irq_handler = i915_irq_handler; |
| dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup; |
| } else { |
| dev->driver->irq_preinstall = i965_irq_preinstall; |
| dev->driver->irq_postinstall = i965_irq_postinstall; |
| dev->driver->irq_uninstall = i965_irq_uninstall; |
| dev->driver->irq_handler = i965_irq_handler; |
| dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup; |
| } |
| dev->driver->enable_vblank = i915_enable_vblank; |
| dev->driver->disable_vblank = i915_disable_vblank; |
| } |
| } |
| |