| From 98fe2cb687466b92fce162dfc0058656d4881557 Mon Sep 17 00:00:00 2001 |
| From: James Ausmus <james.ausmus@intel.com> |
| Date: Thu, 10 Oct 2013 18:30:59 -0700 |
| Subject: Re-create dirty merge cb54b53 |
| |
| Fix code up to post-merge state after cb54b53adae70701bdd77d848cea4b9b39b61cf9 |
| ("Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'") |
| |
| Signed-off-by: James Ausmus <james.ausmus@intel.com> |
| (cherry picked from |
| https://chromium.googlesource.com/chromiumos/third_party/kernel-next |
| chromeos-3.10, e362220fa6a86569cf3c2dfa47ce24935da661d6) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_dma.c | 2 +- |
| drivers/gpu/drm/i915/i915_gem.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/i915/i915_dma.c |
| +++ b/drivers/gpu/drm/i915/i915_dma.c |
| @@ -1500,8 +1500,8 @@ int i915_driver_load(struct drm_device * |
| |
| spin_lock_init(&dev_priv->irq_lock); |
| spin_lock_init(&dev_priv->gpu_error.lock); |
| - spin_lock_init(&dev_priv->gt_lock); |
| spin_lock_init(&dev_priv->backlight.lock); |
| + spin_lock_init(&dev_priv->gt_lock); |
| mutex_init(&dev_priv->dpio_lock); |
| mutex_init(&dev_priv->rps.hw_lock); |
| mutex_init(&dev_priv->modeset_restore_lock); |
| --- a/drivers/gpu/drm/i915/i915_gem.c |
| +++ b/drivers/gpu/drm/i915/i915_gem.c |
| @@ -4643,7 +4643,7 @@ i915_gem_inactive_shrink(struct shrinker |
| list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) |
| if (obj->pages_pin_count == 0) |
| cnt += obj->base.size >> PAGE_SHIFT; |
| - list_for_each_entry(obj, &vm->inactive_list, global_list) |
| + list_for_each_entry(obj, &vm->inactive_list, mm_list) |
| if (obj->pin_count == 0 && obj->pages_pin_count == 0) |
| cnt += obj->base.size >> PAGE_SHIFT; |
| |
