Patchwork kernel-team Digest, Vol 99, Issue 104

login
register
mail settings
Submitter =?ISO-8859-1?B?dHN1aWJpbg==?=
Date April 25, 2013, 6:51 a.m.
Message ID <tencent_7F2DD5563CBD8A0C5C3262FA@qq.com>
Download mbox | patch
Permalink /patch/239406/
State New
Headers show

Comments

=?ISO-8859-1?B?dHN1aWJpbg==?= - April 25, 2013, 6:51 a.m.
good




------------------ Original ------------------
From:  "kernel-team-request"<kernel-team-request@lists.ubuntu.com>;

Date:  Thu, Apr 25, 2013 03:37 AM
To:  "kernel-team"<kernel-team@lists.ubuntu.com>; 

Subject:  kernel-team Digest, Vol 99, Issue 104



Send kernel-team mailing list submissions to
	kernel-team@lists.ubuntu.com

To subscribe or unsubscribe via the World Wide Web, visit
	https://lists.ubuntu.com/mailman/listinfo/kernel-team
or, via email, send a message with subject or body 'help' to
	kernel-team-request@lists.ubuntu.com

You can reach the person managing the list at
	kernel-team-owner@lists.ubuntu.com

When replying, please edit your Subject line so it is more specific
than "Re: Contents of kernel-team digest..."


Today's Topics:

   1. [Quantal SRU] [PATCH] drm/i915: Use the correct size of the
      GTT for placing the, per-process entries (Chris J Arges)
   2. Re: [Quantal SRU] [PATCH] drm/i915: Use the correct size of
      the GTT for placing the, per-process entries (Chris J Arges)
   3. Ack: [Quantal SRU] [PATCH] drm/i915: Use the correct size of
      the GTT for placing the, per-process entries (Seth Forshee)
   4. [quantal] linux 3.5.0-28.48 uploaded (ABI bump)
      (brad.figg@canonical.com)
   5. Nak: [Quantal SRU] [PATCH] drm/i915: Use the correct size of
      the GTT for placing the, per-process entries (Brad Figg)
   6. [PATCH] drm/i915: Use the correct size of the GTT for placing
      the per-process entries (Chris J Arges)
   7. [PATCH] drm/i915: Use the correct size of the GTT for placing
      the per-process entries (Chris J Arges)
   8. [PATCH] drm/i915: Use the correct size of the GTT for placing
      the per-process entries (Chris J Arges)
   9. [PATCH] drm/i915: Use the correct size of the GTT for placing
      the per-process entries (Chris J Arges)
  10. Re: [PATCH] drm/i915: Use the correct size of the GTT for
      placing the per-process entries (Jonathan Nieder)
  11. [PATCH SRU Quantal/Raring] UBUNTU: SAUCE: alx: Don't check
      netif_running() before powering up (Tim Gardner)
  12. Re: [PATCH SRU Quantal/Raring] UBUNTU: SAUCE: alx: Don't
      check netif_running() before powering up (Tim Gardner)


----------------------------------------------------------------------

Message: 1
Date: Wed, 24 Apr 2013 11:07:23 -0500
From: Chris J Arges <chris.j.arges@canonical.com>

To: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
Subject: [Quantal SRU] [PATCH] drm/i915: Use the correct size of the
	GTT for placing the, per-process entries
Message-ID: <5178033B.6070909@canonical.com>
Content-Type: text/plain; charset=ISO-8859-1

BugLink: http://bugs.launchpad.net/bugs/1107642

SRU Justification:

Impact:
    When installing 32-bit images on an imac 12,1 with intel/ati
graphics, there may be crashes or blank screens.

Fix:
   bb588820ef421c6098dca1fec29c3b347f1c8c19 fixes the radeon blackout
issues; this is already in raring/quantal
   9a0f938bde74bf9e50bd75c8de9e38c1787398cd fixes the i915 issues. This
is in raring, but not in quantal.

Testcase:
    Update kernel on install iso, and try to install 32-bit ubuntu on
imac 12,1.

--chris j arges



------------------------------

Message: 2
Date: Wed, 24 Apr 2013 11:34:16 -0500
From: Chris J Arges <chris.j.arges@canonical.com>

To: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
Subject: Re: [Quantal SRU] [PATCH] drm/i915: Use the correct size of
	the GTT for placing the, per-process entries
Message-ID: <51780988.2040905@canonical.com>
Content-Type: text/plain; charset="iso-8859-1"

On 04/24/2013 11:07 AM, Chris J Arges wrote:
> BugLink: http://bugs.launchpad.net/bugs/1107642

> 

> SRU Justification:

> 

> Impact:

>     When installing 32-bit images on an imac 12,1 with intel/ati

> graphics, there may be crashes or blank screens.

> 

> Fix:

>    bb588820ef421c6098dca1fec29c3b347f1c8c19 fixes the radeon blackout

> issues; this is already in raring/quantal

>    9a0f938bde74bf9e50bd75c8de9e38c1787398cd fixes the i915 issues. This

> is in raring, but not in quantal.

> 

> Testcase:

>     Update kernel on install iso, and try to install 32-bit ubuntu on

> imac 12,1.

> 

> --chris j arges

> 


Patch attached.
--chris
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-drm-i915-Use-the-correct-size-of-the-GTT-for-placing.patch
Type: text/x-patch
Size: 1791 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20130424/04a693f1/attachment-0001.bin>

------------------------------

Message: 3
Date: Wed, 24 Apr 2013 12:42:16 -0500
From: Seth Forshee <seth.forshee@canonical.com>

To: Chris J Arges <chris.j.arges@canonical.com>
Cc: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
Subject: Ack: [Quantal SRU] [PATCH] drm/i915: Use the correct size of
	the GTT for placing the, per-process entries
Message-ID: <20130424174216.GA28797@thinkpad-t410>
Content-Type: text/plain; charset=us-ascii




------------------------------

Message: 4
From: brad.figg@canonical.com

To: kernel-team@lists.ubuntu.com, ubuntu-installer@lists.ubuntu.com,
	gema.gomez-solano@canonical.com
Subject: [quantal] linux 3.5.0-28.48 uploaded (ABI bump)
Message-ID:
	<mailman.28796.1366832256.30139.kernel-team@lists.ubuntu.com>
Content-Type: text/plain; charset="us-ascii"

A new quantal kernel has been uploaded into proposed. Note the ABI bump. 
The full changelog about all bug fixes contained in this upload can be found at:

https://launchpad.net/ubuntu/quantal/+source/linux/3.5.0-28.48

-- 
This message was created by an automated script, maintained by the
Ubuntu Kernel Team.



------------------------------

Message: 5
Date: Wed, 24 Apr 2013 11:11:50 -0700
From: Brad Figg <brad.figg@canonical.com>

To: Chris J Arges <chris.j.arges@canonical.com>
Cc: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
Subject: Nak: [Quantal SRU] [PATCH] drm/i915: Use the correct size of
	the GTT for placing the, per-process entries
Message-ID: <51782066.2080504@canonical.com>
Content-Type: text/plain; charset=ISO-8859-1

On 04/24/2013 09:07 AM, Chris J Arges wrote:
> BugLink: http://bugs.launchpad.net/bugs/1107642

> 

> SRU Justification:

> 

> Impact:

>     When installing 32-bit images on an imac 12,1 with intel/ati

> graphics, there may be crashes or blank screens.

> 

> Fix:

>    bb588820ef421c6098dca1fec29c3b347f1c8c19 fixes the radeon blackout

> issues; this is already in raring/quantal

>    9a0f938bde74bf9e50bd75c8de9e38c1787398cd fixes the i915 issues. This

> is in raring, but not in quantal.

> 

> Testcase:

>     Update kernel on install iso, and try to install 32-bit ubuntu on

> imac 12,1.

> 

> --chris j arges

> 


I prefer to get this via stable. Can you please submit it there? That
will get some additional eyes on it and maybe some additional testing.

-- 
Brad Figg brad.figg@canonical.com http://www.canonical.com



------------------------------

Message: 6
Date: Wed, 24 Apr 2013 13:56:41 -0500
From: Chris J Arges <chris.j.arges@canonical.com>

To: stable@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:
	<1366829802-15499-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: 7
Date: Wed, 24 Apr 2013 13:56:42 -0500
From: Chris J Arges <chris.j.arges@canonical.com>

To: stable@kernel.org
Cc: Ben Widawsky <ben@bwidawsk.net>, Daniel Vetter
	<daniel.vetter@ffwll.ch>, stable@vger.kernel.org, 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:
	<1366829802-15499-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(-)

-- 
1.7.9.5




------------------------------

Message: 12
Date: Wed, 24 Apr 2013 13:37:33 -0600
From: Tim Gardner <tim.gardner@canonical.com>

To: kernel-team@lists.ubuntu.com
Subject: Re: [PATCH SRU Quantal/Raring] UBUNTU: SAUCE: alx: Don't
	check netif_running() before powering up
Message-ID: <5178347D.8030003@canonical.com>
Content-Type: text/plain; charset=ISO-8859-1

On 04/24/2013 01:35 PM, Tim Gardner wrote:
> (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(-)

> 

> diff --git a/ubuntu/alx/alx_main.c b/ubuntu/alx/alx_main.c

> index 700ebf1..03bda8b 100644

> --- a/ubuntu/alx/alx_main.c

> +++ b/ubuntu/alx/alx_main.c

> @@ -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);

> 


http://bugs.launchpad.net/bugs/1172415

-- 
Tim Gardner tim.gardner@canonical.com



------------------------------

-- 
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team


End of kernel-team Digest, Vol 99, Issue 104
********************************************

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c

index eae804d..8096d577 100644

--- a/drivers/gpu/drm/i915/i915_gem_gtt.c

+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c

@@ -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(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c

index eae804d..8096d577 100644

--- a/drivers/gpu/drm/i915/i915_gem_gtt.c

+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c

@@ -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(-)

diff --git a/ubuntu/alx/alx_main.c b/ubuntu/alx/alx_main.c

index 700ebf1..03bda8b 100644

--- a/ubuntu/alx/alx_main.c

+++ b/ubuntu/alx/alx_main.c

@@ -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);