diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-02 14:55:07 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-11 17:51:40 -0500 |
commit | a4da4fa4e55a8cea7fe603e7564e72db97b77a89 (patch) | |
tree | 2d8dc78dfdc218c5bf872477db79b6fd227d08fc /drivers/gpu/drm/i915/i915_irq.c | |
parent | 231f42a48f744c9a4f53752948fad2d793638937 (diff) |
drm/i915: extract l3_parity substruct from dev_priv
Pretty astonishing how far apart these two members landed ... Especially since
I've already removed almost 200 lines in between.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index b92e6bfbb97c..2c40127573e2 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -409,7 +409,7 @@ static void gen6_pm_rps_work(struct work_struct *work) | |||
409 | static void ivybridge_parity_work(struct work_struct *work) | 409 | static void ivybridge_parity_work(struct work_struct *work) |
410 | { | 410 | { |
411 | drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t, | 411 | drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t, |
412 | parity_error_work); | 412 | l3_parity.error_work); |
413 | u32 error_status, row, bank, subbank; | 413 | u32 error_status, row, bank, subbank; |
414 | char *parity_event[5]; | 414 | char *parity_event[5]; |
415 | uint32_t misccpctl; | 415 | uint32_t misccpctl; |
@@ -473,7 +473,7 @@ static void ivybridge_handle_parity_error(struct drm_device *dev) | |||
473 | I915_WRITE(GTIMR, dev_priv->gt_irq_mask); | 473 | I915_WRITE(GTIMR, dev_priv->gt_irq_mask); |
474 | spin_unlock_irqrestore(&dev_priv->irq_lock, flags); | 474 | spin_unlock_irqrestore(&dev_priv->irq_lock, flags); |
475 | 475 | ||
476 | queue_work(dev_priv->wq, &dev_priv->parity_error_work); | 476 | queue_work(dev_priv->wq, &dev_priv->l3_parity.error_work); |
477 | } | 477 | } |
478 | 478 | ||
479 | static void snb_gt_irq_handler(struct drm_device *dev, | 479 | static void snb_gt_irq_handler(struct drm_device *dev, |
@@ -2681,7 +2681,7 @@ void intel_irq_init(struct drm_device *dev) | |||
2681 | INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); | 2681 | INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); |
2682 | INIT_WORK(&dev_priv->error_work, i915_error_work_func); | 2682 | INIT_WORK(&dev_priv->error_work, i915_error_work_func); |
2683 | INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work); | 2683 | INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work); |
2684 | INIT_WORK(&dev_priv->parity_error_work, ivybridge_parity_work); | 2684 | INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work); |
2685 | 2685 | ||
2686 | dev->driver->get_vblank_counter = i915_get_vblank_counter; | 2686 | dev->driver->get_vblank_counter = i915_get_vblank_counter; |
2687 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ | 2687 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ |