diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-08-22 17:02:42 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2012-08-29 18:11:00 +0200 |
| commit | 305a3d204aae15eddf1988e50e33aee4119b710d (patch) | |
| tree | dc40e94170e71a8ab9c3b5068bcb8403cc7a09a8 | |
| parent | Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-in... (diff) | |
| download | linux-305a3d204aae15eddf1988e50e33aee4119b710d.tar.xz linux-305a3d204aae15eddf1988e50e33aee4119b710d.zip | |
drm/radeon: fix reading CB_COLORn_MASK from the CS
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index ab74e6b149e7..7799e283811f 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -1416,7 +1416,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) case R_028118_CB_COLOR6_MASK: case R_02811C_CB_COLOR7_MASK: tmp = (reg - R_028100_CB_COLOR0_MASK) / 4; - track->cb_color_mask[tmp] = ib[idx]; + track->cb_color_mask[tmp] = radeon_get_ib_value(p, idx); if (G_0280A0_TILE_MODE(track->cb_color_info[tmp])) { track->cb_dirty = true; } |