d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix offset handling

Browse Source 
MFC after:	1 week
This commit is contained in:
rnoland 2009-09-28 22:41:28 +00:00
parent ac4eceb715
commit d19f2a3393
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/drm/radeon_cs.c
View File

@ -403,8 +403,8 @@ static inline int r600_cs_packet3(struct drm_radeon_cs_parser *parser, uint32_t
DRM_ERROR("bad DRAW_INDEX\n"); DRM_ERROR("bad DRAW_INDEX\n");
break; break;
} }
ib_chunk->kdata[offset_dw + 1] = (offset & 0xffffffff); ib_chunk->kdata[offset_dw + 1] += (offset & 0xffffffff);
ib_chunk->kdata[offset_dw + 2] = (upper_32_bits(offset) & 0xff); ib_chunk->kdata[offset_dw + 2] += (upper_32_bits(offset) & 0xff);
break; break;
case R600_IT_DRAW_INDEX_AUTO: case R600_IT_DRAW_INDEX_AUTO:
//DRM_INFO("R600_IT_DRAW_INDEX_AUTO\n"); //DRM_INFO("R600_IT_DRAW_INDEX_AUTO\n");
@ -433,8 +433,8 @@ static inline int r600_cs_packet3(struct drm_radeon_cs_parser *parser, uint32_t
DRM_ERROR("bad WAIT_REG_MEM\n"); DRM_ERROR("bad WAIT_REG_MEM\n");
break; break;
} }
ib_chunk->kdata[offset_dw + 2] = (offset & 0xffffffff); ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff);
ib_chunk->kdata[offset_dw + 3] = (upper_32_bits(offset) & 0xff); ib_chunk->kdata[offset_dw + 3] += (upper_32_bits(offset) & 0xff);
} }
if (ret) if (ret)
DRM_ERROR("bad WAIT_REG_MEM\n"); DRM_ERROR("bad WAIT_REG_MEM\n");
@ -469,7 +469,7 @@ static inline int r600_cs_packet3(struct drm_radeon_cs_parser *parser, uint32_t
break; break;
} }
ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff); ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff);
ib_chunk->kdata[offset_dw + 3] |= (upper_32_bits(offset) & 0xff); ib_chunk->kdata[offset_dw + 3] += (upper_32_bits(offset) & 0xff);
} }
if (ret) if (ret)
DRM_ERROR("bad EVENT_WRITE\n"); DRM_ERROR("bad EVENT_WRITE\n");
@ -488,7 +488,7 @@ static inline int r600_cs_packet3(struct drm_radeon_cs_parser *parser, uint32_t
break; break;
} }
ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff); ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff);
ib_chunk->kdata[offset_dw + 3] |= (upper_32_bits(offset) & 0xff); ib_chunk->kdata[offset_dw + 3] += (upper_32_bits(offset) & 0xff);
break; break;
case R600_IT_SET_CONFIG_REG: case R600_IT_SET_CONFIG_REG:
//DRM_INFO("R600_IT_SET_CONFIG_REG\n"); //DRM_INFO("R600_IT_SET_CONFIG_REG\n");
@ -628,7 +628,7 @@ static inline int r600_cs_packet3(struct drm_radeon_cs_parser *parser, uint32_t
if (ret) if (ret)
break; break;
ib_chunk->kdata[offset_dw + (i * 7) + 0 + 2] += (offset & 0xffffffff); ib_chunk->kdata[offset_dw + (i * 7) + 0 + 2] += (offset & 0xffffffff);
ib_chunk->kdata[offset_dw + (i * 7) + 2 + 2] |= (upper_32_bits(offset) & 0xff); ib_chunk->kdata[offset_dw + (i * 7) + 2 + 2] += (upper_32_bits(offset) & 0xff);
break; break;
} }
if (ret) if (ret)