diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-03-02 20:07:40 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-03 11:57:03 +1000 |
| commit | 8aa75009bca5e700e9236c8e066d2f943069c883 (patch) | |
| tree | d2b7217036fd0928a0f32e9428d211a1a355f472 /drivers/gpu/drm/radeon/evergreen_cs.c | |
| parent | 9b91d18d20fbd3e907cee71d1acaba7943de887a (diff) | |
| download | kernel_samsung_smdk4412-8aa75009bca5e700e9236c8e066d2f943069c883.zip kernel_samsung_smdk4412-8aa75009bca5e700e9236c8e066d2f943069c883.tar.gz kernel_samsung_smdk4412-8aa75009bca5e700e9236c8e066d2f943069c883.tar.bz2 | |
drm/radeon/kms: cayman/evergreen cs checker updates
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_cs.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_cs.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 5021bd2..5e4f9f8 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -479,8 +479,24 @@ static inline int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u3 case SQ_VSTMP_RING_ITEMSIZE: case VGT_TF_RING_SIZE: /* get value to populate the IB don't remove */ - tmp =radeon_get_ib_value(p, idx); - ib[idx] = 0; + /*tmp =radeon_get_ib_value(p, idx); + ib[idx] = 0;*/ + break; + case SQ_ESGS_RING_BASE: + case SQ_GSVS_RING_BASE: + case SQ_ESTMP_RING_BASE: + case SQ_GSTMP_RING_BASE: + case SQ_HSTMP_RING_BASE: + case SQ_LSTMP_RING_BASE: + case SQ_PSTMP_RING_BASE: + case SQ_VSTMP_RING_BASE: + r = evergreen_cs_packet_next_reloc(p, &reloc); + if (r) { + dev_warn(p->dev, "bad SET_CONTEXT_REG " + "0x%04X\n", reg); + return -EINVAL; + } + ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); break; case DB_DEPTH_CONTROL: track->db_depth_control = radeon_get_ib_value(p, idx); |