From 5aaeb2faaed5b8854b2759c1552e476d5af14f0d Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 30 Jun 2011 08:59:55 -0400 Subject: [PATCH] --- yaml --- r: 254249 b: refs/heads/master c: daf54f1f363a61c618662ef66d4bf09d2b090941 h: refs/heads/master i: 254247: 691235635a10559517c5031cf90910c6281b7bf6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/rv770.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c2ae2ec7de27..a185ee962a83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e90ed0e8b9b1c25040442f1d20c799751b1e727 +refs/heads/master: daf54f1f363a61c618662ef66d4bf09d2b090941 diff --git a/trunk/drivers/gpu/drm/radeon/rv770.c b/trunk/drivers/gpu/drm/radeon/rv770.c index 6f508ffd1035..8bb347d23ca6 100644 --- a/trunk/drivers/gpu/drm/radeon/rv770.c +++ b/trunk/drivers/gpu/drm/radeon/rv770.c @@ -575,6 +575,12 @@ static void rv770_program_channel_remap(struct radeon_device *rdev) else tcp_chan_steer = 0x00fac688; + /* RV770 CE has special chremap setup */ + if (rdev->pdev->device == 0x944e) { + tcp_chan_steer = 0x00b08b08; + mc_shared_chremap = 0x00b08b08; + } + WREG32(TCP_CHAN_STEER, tcp_chan_steer); WREG32(MC_SHARED_CHREMAP, mc_shared_chremap); }