[SRU LUCID Bug #544590] drm/radeon/kms: initialize set_surface_reg reg for rs600 asic

[Manoj Iyer]

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 at 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 at redhat.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 32b3c2abaf8c61c80a8b02071c73f05252122ffe)

Signed-off-by: Manoj Iyer <manoj.iyer at 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