On Thu, Jan 5, 2012 at 5:08 AM, Dave Airlie <airlied at gmail.com> wrote: > Can you rebase this onto -next, I've no idea what it applies against.
You can skip this. I just rolled it into the VM patch. Alex > > Dave. > >> Signed-off-by: Alex Deucher <alexander.deucher at amd.com> >> --- >> ?drivers/gpu/drm/radeon/radeon_cs.c | ? ?7 +++---- >> ?1 files changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c >> b/drivers/gpu/drm/radeon/radeon_cs.c >> index de3cac0..e30a36f 100644 >> --- a/drivers/gpu/drm/radeon/radeon_cs.c >> +++ b/drivers/gpu/drm/radeon/radeon_cs.c >> @@ -203,10 +203,9 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, >> void *data) >> ? ? ? ? ? ? ? ?} >> ? ? ? ? ? ? ? ?if (p->chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS) { >> ? ? ? ? ? ? ? ? ? ? ? ?p->chunk_flags_idx = i; >> - ? ? ? ? ? ? ? } >> - ? ? ? ? ? ? ? if (p->chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS && >> - ? ? ? ? ? ? ? ? ? !p->chunks[i].length_dw) { >> - ? ? ? ? ? ? ? ? ? ? ? return -EINVAL; >> + ? ? ? ? ? ? ? ? ? ? ? /* zero length flags aren't useful */ >> + ? ? ? ? ? ? ? ? ? ? ? if (p->chunks[i].length_dw == 0) >> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? return -EINVAL; >> ? ? ? ? ? ? ? ?} >> >> ? ? ? ? ? ? ? ?p->chunks[i].length_dw = user_chunk.length_dw; >> -- >> 1.7.3.4 >>