@@ -72,7 +72,7 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)
/* ppgtt PDEs reside in the global gtt pagetable, which has 512*1024
* entries. For aliasing ppgtt support we just steal them at the end for
* now. */
- first_pd_entry_in_global_pt = 512*1024 - I915_PPGTT_PD_ENTRIES;
+ first_pd_entry_in_global_pt = dev_priv->mm.gtt->gtt_total_entries - I915_PPGTT_PD_ENTRIES;
ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);
if (!ppgtt)
--
1.7.9.5
------------------------------
Message: 8
Date: Wed, 24 Apr 2013 14:01:05 -0500
From: Chris J Arges <chris.j.arges@canonical.com>
To: stable@vger.kernel.org
Cc: kernel-team@lists.ubuntu.com
Subject: [PATCH] drm/i915: Use the correct size of the GTT for placing
the per-process entries
Message-ID:
<1366830066-16705-1-git-send-email-chris.j.arges@canonical.com>
This patch fixes the following bug:
http://bugs.launchpad.net/bugs/1107642
It has been tested against the Ubuntu Quantal 3.5 kernel.
I'd like to include it in the 3.5.y stable tree.
The fix is present in v3.6-rc4 and beyond.
Chris Wilson (1):
drm/i915: Use the correct size of the GTT for placing the per-process
entries
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.7.9.5
------------------------------
Message: 9
Date: Wed, 24 Apr 2013 14:01:06 -0500
From: Chris J Arges <chris.j.arges@canonical.com>
To: stable@vger.kernel.org
Cc: Ben Widawsky <ben@bwidawsk.net>, Daniel Vetter
<daniel.vetter@ffwll.ch>, Chris Wilson <chris@chris-wilson.co.uk>,
kernel-team@lists.ubuntu.com, Matthew Garret <mjg@redhat.com>
Subject: [PATCH] drm/i915: Use the correct size of the GTT for placing
the per-process entries
Message-ID:
<1366830066-16705-2-git-send-email-chris.j.arges@canonical.com>
From: Chris Wilson <chris@chris-wilson.co.uk>
The current layout is to place the per-process tables at the end of the
GTT. However, this is currently using a hardcoded maximum size for the GTT
and not taking in account limitations imposed by the BIOS. Use the value
for the total number of entries allocated in the table as provided by
the configuration registers.
Reported-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Matthew Garret <mjg@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 9a0f938bde74bf9e50bd75c8de9e38c1787398cd)
Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -72,7 +72,7 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)
/* ppgtt PDEs reside in the global gtt pagetable, which has 512*1024
* entries. For aliasing ppgtt support we just steal them at the end for
* now. */
- first_pd_entry_in_global_pt = 512*1024 - I915_PPGTT_PD_ENTRIES;
+ first_pd_entry_in_global_pt = dev_priv->mm.gtt->gtt_total_entries - I915_PPGTT_PD_ENTRIES;
ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);
if (!ppgtt)
--
1.7.9.5
------------------------------
Message: 10
Date: Wed, 24 Apr 2013 12:13:13 -0700
From: Jonathan Nieder <jrnieder@gmail.com>
To: Chris J Arges <chris.j.arges@canonical.com>
Cc: kernel-team@lists.ubuntu.com, stable@vger.kernel.org
Subject: Re: [PATCH] drm/i915: Use the correct size of the GTT for
placing the per-process entries
Message-ID: <20130424191313.GF29963@google.com>
Content-Type: text/plain; charset=us-ascii
Hi Chris,
Chris J Arges wrote:
> This patch fixes the following bug:
> http://bugs.launchpad.net/bugs/1107642
>
> It has been tested against the Ubuntu Quantal 3.5 kernel.
> I'd like to include it in the 3.5.y stable tree.
Thanks. For future reference, it's easier to understand proposals
like this if they have [3.5.7.y] or similar in the message subject.
See the list archive for examples, like this one:
http://www.mail-archive.com/stable@vger.kernel.org/msg38099.html
Regards,
Jonathan
------------------------------
Message: 11
Date: Wed, 24 Apr 2013 13:35:41 -0600
From: Tim Gardner <tim.gardner@canonical.com>
To: kernel-team@lists.ubuntu.com
Subject: [PATCH SRU Quantal/Raring] UBUNTU: SAUCE: alx: Don't check
netif_running() before powering up
Message-ID:
<1366832141-34735-1-git-send-email-tim.gardner@canonical.com>
(sent upstream to unified-drivers@lists.infradead.org)
The resume function must power up the device regardless of the state
of the network stack.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
Tested on an AMD system with HW that exhibits the problem.
ubuntu/alx/alx_main.c | 3 ---
1 file changed, 3 deletions(-)
@@ -1694,9 +1694,6 @@ static int alx_resume(struct device *dev)
struct alx_hw *hw = &adpt->hw;
int err;
- if (!netif_running(netdev))
- return 0;
-
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
pci_save_state(pdev);