drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
 

IMPACT:
[RS600] video freeze with KMS (X and plymouth).

FIX:
Fix cherry-picked from upstream.

TEST:
Test kernel was tested by originator and reported to fix the problem. Test
kernel is available at http://people.canonical.com/~manjo/lp544590-lucid/


The following changes since commit
4861550e13645bbc3c83dbf8061f976d75dfa717:
Rafi Rubin (1):
HID: ntrig: Remove unused macro, TripleTap and QuadTap

are available in the git repository at:


git://kernel.ubuntu.com/manjo/ubuntu-lucid.git lp544590

Jerome Glisse (1):
drm/radeon/kms: initialize set_surface_reg reg for rs600 asic

drivers/gpu/drm/radeon/radeon_asic.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

>From 5d0a340882b3dfbb776c086996911f8fa978ac31 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Fri, 26 Feb 2010 19:14:12 +0000
Subject: [PATCH] drm/radeon/kms: initialize set_surface_reg reg for rs600 asic

rs600 asic was missing set_surface_reg callback leading to
oops.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 32b3c2abaf8c61c80a8b02071c73f05252122ffe)

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>

BugLink: http://launchpad.net/bugs/544590
---
drivers/gpu/drm/radeon/radeon_asic.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 05ee1ae..ad368b9 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -322,6 +322,8 @@ static struct radeon_asic rs600_asic = {
.set_memory_clock = &radeon_atom_set_memory_clock,
.set_pcie_lanes = NULL,
.set_clock_gating = &radeon_atom_set_clock_gating,
+ .set_surface_reg = r100_set_surface_reg,
+ .clear_surface_reg = r100_clear_surface_reg,
.bandwidth_update = &rs600_bandwidth_update,
.hpd_init = &rs600_hpd_init,
.hpd_fini = &rs600_hpd_fini,
--
1.7.0.4


Cheers
--- manjo

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

drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
 

On 06/07/2010 10:40 AM, Manoj Iyer wrote:
>
> IMPACT:
> [RS600] video freeze with KMS (X and plymouth).
>
> FIX:
> Fix cherry-picked from upstream.
>
> TEST:
> Test kernel was tested by originator and reported to fix the problem. Test
> kernel is available at http://people.canonical.com/~manjo/lp544590-lucid/
>
>
> The following changes since commit
> 4861550e13645bbc3c83dbf8061f976d75dfa717:
> Rafi Rubin (1):
> HID: ntrig: Remove unused macro, TripleTap and QuadTap
>
> are available in the git repository at:
>
>
> git://kernel.ubuntu.com/manjo/ubuntu-lucid.git lp544590
>
> Jerome Glisse (1):
> drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
>
> drivers/gpu/drm/radeon/radeon_asic.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
>> From 5d0a340882b3dfbb776c086996911f8fa978ac31 Mon Sep 17 00:00:00 2001
> From: Jerome Glisse<jglisse@redhat.com>
> Date: Fri, 26 Feb 2010 19:14:12 +0000
> Subject: [PATCH] drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
>
> rs600 asic was missing set_surface_reg callback leading to
> oops.
>
> Signed-off-by: Jerome Glisse<jglisse@redhat.com>
> Signed-off-by: Dave Airlie<airlied@redhat.com>
> (cherry picked from commit 32b3c2abaf8c61c80a8b02071c73f05252122ffe)
>
> Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com>
>
> BugLink: http://launchpad.net/bugs/544590
> ---
> drivers/gpu/drm/radeon/radeon_asic.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
> index 05ee1ae..ad368b9 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.h
> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
> @@ -322,6 +322,8 @@ static struct radeon_asic rs600_asic = {
> .set_memory_clock =&radeon_atom_set_memory_clock,
> .set_pcie_lanes = NULL,
> .set_clock_gating =&radeon_atom_set_clock_gating,
> + .set_surface_reg = r100_set_surface_reg,
> + .clear_surface_reg = r100_clear_surface_reg,
> .bandwidth_update =&rs600_bandwidth_update,
> .hpd_init =&rs600_hpd_init,
> .hpd_fini =&rs600_hpd_fini,

Looks right.

Acked-by: Tim Gardner <tim.gardner@canonical.com>

--
Tim Gardner tim.gardner@canonical.com

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

drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
 

Looks ok but also like something I would like to be confirmed as sent to
upstream stable. Though 2.6.33 might be coming to an end soon. There is a queue
open for it currently.

Otherwise looks sensible.

On 06/07/2010 06:40 PM, Manoj Iyer wrote:
>
> IMPACT:
> [RS600] video freeze with KMS (X and plymouth).
>
> FIX:
> Fix cherry-picked from upstream.
>
> TEST:
> Test kernel was tested by originator and reported to fix the problem. Test
> kernel is available at http://people.canonical.com/~manjo/lp544590-lucid/
>
>
> The following changes since commit
> 4861550e13645bbc3c83dbf8061f976d75dfa717:
> Rafi Rubin (1):
> HID: ntrig: Remove unused macro, TripleTap and QuadTap
>
> are available in the git repository at:
>
>
> git://kernel.ubuntu.com/manjo/ubuntu-lucid.git lp544590
>
> Jerome Glisse (1):
> drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
>
> drivers/gpu/drm/radeon/radeon_asic.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
>>From 5d0a340882b3dfbb776c086996911f8fa978ac31 Mon Sep 17 00:00:00 2001
> From: Jerome Glisse <jglisse@redhat.com>
> Date: Fri, 26 Feb 2010 19:14:12 +0000
> Subject: [PATCH] drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
>
> rs600 asic was missing set_surface_reg callback leading to
> oops.
>
> Signed-off-by: Jerome Glisse <jglisse@redhat.com>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> (cherry picked from commit 32b3c2abaf8c61c80a8b02071c73f05252122ffe)
>
> Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
>
> BugLink: http://launchpad.net/bugs/544590
> ---
> drivers/gpu/drm/radeon/radeon_asic.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
> index 05ee1ae..ad368b9 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.h
> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
> @@ -322,6 +322,8 @@ static struct radeon_asic rs600_asic = {
> .set_memory_clock = &radeon_atom_set_memory_clock,
> .set_pcie_lanes = NULL,
> .set_clock_gating = &radeon_atom_set_clock_gating,
> + .set_surface_reg = r100_set_surface_reg,
> + .clear_surface_reg = r100_clear_surface_reg,
> .bandwidth_update = &rs600_bandwidth_update,
> .hpd_init = &rs600_hpd_init,
> .hpd_fini = &rs600_hpd_fini,


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