From patchwork Mon Jun 7 16:40:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 54883 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id D499BB7D1B for ; Tue, 8 Jun 2010 02:40:36 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OLfN9-0000am-4z; Mon, 07 Jun 2010 17:40:23 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OLfN8-0000aa-7V for kernel-team@lists.ubuntu.com; Mon, 07 Jun 2010 17:40:22 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OLfN8-0005h9-1m for ; Mon, 07 Jun 2010 17:40:22 +0100 Received: from [70.114.236.114] (helo=hungry.local) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OLfN7-0005Em-Oa for kernel-team@lists.ubuntu.com; Mon, 07 Jun 2010 17:40:22 +0100 Date: Mon, 7 Jun 2010 11:40:14 -0500 (CDT) From: Manoj Iyer To: Ubuntu Kernel Team Subject: [SRU LUCID Bug #544590] drm/radeon/kms: initialize set_surface_reg reg for rs600 asic Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: Manoj Iyer List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 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 Signed-off-by: Dave Airlie (cherry picked from commit 32b3c2abaf8c61c80a8b02071c73f05252122ffe) Signed-off-by: Manoj Iyer BugLink: http://launchpad.net/bugs/544590 Acked-by: Tim Gardner Acked-by: Stefan Bader --- 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,