diff mbox

drm/radeon: force dma32 to fix regression rs4xx,rs6xx,rs740

Message ID 1346187022-3455-1-git-send-email-j.glisse@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jerome Glisse Aug. 28, 2012, 8:50 p.m. UTC
From: Jerome Glisse <jglisse@redhat.com>

It seems some of those IGP dislike non dma32 page despite what
documentation says. Fix regression since we allowed non dma32
pages. It seems it only affect some revision of those IGP chips
as we don't know which one just force dma32 for all of them.

https://bugzilla.redhat.com/show_bug.cgi?id=785375

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Cc: <stable@vger.kernel.org>
---
 drivers/gpu/drm/radeon/radeon_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Josh Boyer Sept. 21, 2012, 12:56 p.m. UTC | #1
On Tue, Aug 28, 2012 at 4:50 PM,  <j.glisse@gmail.com> wrote:
> From: Jerome Glisse <jglisse@redhat.com>
>
> It seems some of those IGP dislike non dma32 page despite what
> documentation says. Fix regression since we allowed non dma32
> pages. It seems it only affect some revision of those IGP chips
> as we don't know which one just force dma32 for all of them.
>
> https://bugzilla.redhat.com/show_bug.cgi?id=785375
>
> Signed-off-by: Jerome Glisse <jglisse@redhat.com>
> Cc: <stable@vger.kernel.org>


This is upstream commit 4a2b6662c3632176b4fdf012243dd3751367bf1f.  I
don't see it queued up in the stable-queue, so I thought I'd point it
out in case it was missed.

josh

> ---
>  drivers/gpu/drm/radeon/radeon_device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index 066c98b..8867400 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -774,7 +774,7 @@ int radeon_device_init(struct radeon_device *rdev,
>         if (rdev->flags & RADEON_IS_AGP)
>                 rdev->need_dma32 = true;
>         if ((rdev->flags & RADEON_IS_PCI) &&
> -           (rdev->family < CHIP_RS400))
> +           (rdev->family <= CHIP_RS740))
>                 rdev->need_dma32 = true;
>
>         dma_bits = rdev->need_dma32 ? 32 : 40;
> --
> 1.7.11.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman Sept. 21, 2012, 11 p.m. UTC | #2
On Fri, Sep 21, 2012 at 08:56:27AM -0400, Josh Boyer wrote:
> On Tue, Aug 28, 2012 at 4:50 PM,  <j.glisse@gmail.com> wrote:
> > From: Jerome Glisse <jglisse@redhat.com>
> >
> > It seems some of those IGP dislike non dma32 page despite what
> > documentation says. Fix regression since we allowed non dma32
> > pages. It seems it only affect some revision of those IGP chips
> > as we don't know which one just force dma32 for all of them.
> >
> > https://bugzilla.redhat.com/show_bug.cgi?id=785375
> >
> > Signed-off-by: Jerome Glisse <jglisse@redhat.com>
> > Cc: <stable@vger.kernel.org>
> 
> 
> This is upstream commit 4a2b6662c3632176b4fdf012243dd3751367bf1f.  I
> don't see it queued up in the stable-queue, so I thought I'd point it
> out in case it was missed.

I am way behind on the drm patches for stable, I have a ton of them in
my todo-queue, but have been traveling all week at a conference and
haven't had the chance to get to them.  Hopefully I'll be able to flush
them all out next week, but don't worry, it's not lost.

thanks,

greg k-h
Greg Kroah-Hartman Sept. 26, 2012, 11:37 p.m. UTC | #3
On Fri, Sep 21, 2012 at 04:00:51PM -0700, Greg KH wrote:
> On Fri, Sep 21, 2012 at 08:56:27AM -0400, Josh Boyer wrote:
> > On Tue, Aug 28, 2012 at 4:50 PM,  <j.glisse@gmail.com> wrote:
> > > From: Jerome Glisse <jglisse@redhat.com>
> > >
> > > It seems some of those IGP dislike non dma32 page despite what
> > > documentation says. Fix regression since we allowed non dma32
> > > pages. It seems it only affect some revision of those IGP chips
> > > as we don't know which one just force dma32 for all of them.
> > >
> > > https://bugzilla.redhat.com/show_bug.cgi?id=785375
> > >
> > > Signed-off-by: Jerome Glisse <jglisse@redhat.com>
> > > Cc: <stable@vger.kernel.org>
> > 
> > 
> > This is upstream commit 4a2b6662c3632176b4fdf012243dd3751367bf1f.  I
> > don't see it queued up in the stable-queue, so I thought I'd point it
> > out in case it was missed.
> 
> I am way behind on the drm patches for stable, I have a ton of them in
> my todo-queue, but have been traveling all week at a conference and
> haven't had the chance to get to them.  Hopefully I'll be able to flush
> them all out next week, but don't worry, it's not lost.

It's now applied, thanks,

greg k-h
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 066c98b..8867400 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -774,7 +774,7 @@  int radeon_device_init(struct radeon_device *rdev,
 	if (rdev->flags & RADEON_IS_AGP)
 		rdev->need_dma32 = true;
 	if ((rdev->flags & RADEON_IS_PCI) &&
-	    (rdev->family < CHIP_RS400))
+	    (rdev->family <= CHIP_RS740))
 		rdev->need_dma32 = true;
 
 	dma_bits = rdev->need_dma32 ? 32 : 40;