← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to ubuntu/i915/i915_gem_gtt.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2013-07-11 18:35:20 UTC
  • Revision ID: package-import@ubuntu.com-20130711183520-htnf1x4y5r11hndr
Tags: 3.5.0-229.42
https://launchpad.net/bugs/1199276
* Release Tracking Bug
  - LP: #1199276

[ Paolo Pisati ]

* [Config] CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu/i915/i915_gem_gtt.c
508
508
        undo_idling(dev_priv, interruptible);
509
509
}
510
510
 
511
 
static void i915_gtt_color_adjust(struct drm_mm_hsw_node *node,
 
511
static void i915_gtt_color_adjust(struct drm_mm_node_hsw *node,
512
512
                                  unsigned long color,
513
513
                                  unsigned long *start,
514
514
                                  unsigned long *end)
518
518
 
519
519
        if (!list_empty(&node->node_list)) {
520
520
                node = list_entry(node->node_list.next,
521
 
                                  struct drm_mm_hsw_node,
 
521
                                  struct drm_mm_node_hsw,
522
522
                                  node_list);
523
523
                if (node->allocated && node->color != color)
524
524
                        *end -= 4096;
533
533
        drm_i915_private_t *dev_priv = dev->dev_private;
534
534
 
535
535
        /* Substract the guard page ... */
536
 
        drm_mm_hsw_init(&dev_priv->mm.gtt_space, start, end - start - PAGE_SIZE);
 
536
        drm_mm_init_hsw(&dev_priv->mm.gtt_space, start, end - start - PAGE_SIZE);
537
537
        if (!HAS_LLC(dev))
538
538
                dev_priv->mm.gtt_space.color_adjust = i915_gtt_color_adjust;
539
539