Commit a3a88a66 authored by Paul Bolle's avatar Paul Bolle Committed by Dave Airlie

drm: radeon: *_cs_packet_parse_vline() cleanup

Simplify the way the return value is set a number of times (mostly on
error).
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 3409fc1b
...@@ -293,33 +293,28 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -293,33 +293,28 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p)
if (wait_reg_mem.type != PACKET_TYPE3 || if (wait_reg_mem.type != PACKET_TYPE3 ||
wait_reg_mem.opcode != PACKET3_WAIT_REG_MEM) { wait_reg_mem.opcode != PACKET3_WAIT_REG_MEM) {
DRM_ERROR("vline wait missing WAIT_REG_MEM segment\n"); DRM_ERROR("vline wait missing WAIT_REG_MEM segment\n");
r = -EINVAL; return -EINVAL;
return r;
} }
wait_reg_mem_info = radeon_get_ib_value(p, wait_reg_mem.idx + 1); wait_reg_mem_info = radeon_get_ib_value(p, wait_reg_mem.idx + 1);
/* bit 4 is reg (0) or mem (1) */ /* bit 4 is reg (0) or mem (1) */
if (wait_reg_mem_info & 0x10) { if (wait_reg_mem_info & 0x10) {
DRM_ERROR("vline WAIT_REG_MEM waiting on MEM rather than REG\n"); DRM_ERROR("vline WAIT_REG_MEM waiting on MEM rather than REG\n");
r = -EINVAL; return -EINVAL;
return r;
} }
/* waiting for value to be equal */ /* waiting for value to be equal */
if ((wait_reg_mem_info & 0x7) != 0x3) { if ((wait_reg_mem_info & 0x7) != 0x3) {
DRM_ERROR("vline WAIT_REG_MEM function not equal\n"); DRM_ERROR("vline WAIT_REG_MEM function not equal\n");
r = -EINVAL; return -EINVAL;
return r;
} }
if ((radeon_get_ib_value(p, wait_reg_mem.idx + 2) << 2) != EVERGREEN_VLINE_STATUS) { if ((radeon_get_ib_value(p, wait_reg_mem.idx + 2) << 2) != EVERGREEN_VLINE_STATUS) {
DRM_ERROR("vline WAIT_REG_MEM bad reg\n"); DRM_ERROR("vline WAIT_REG_MEM bad reg\n");
r = -EINVAL; return -EINVAL;
return r;
} }
if (radeon_get_ib_value(p, wait_reg_mem.idx + 5) != EVERGREEN_VLINE_STAT) { if (radeon_get_ib_value(p, wait_reg_mem.idx + 5) != EVERGREEN_VLINE_STAT) {
DRM_ERROR("vline WAIT_REG_MEM bad bit mask\n"); DRM_ERROR("vline WAIT_REG_MEM bad bit mask\n");
r = -EINVAL; return -EINVAL;
return r;
} }
/* jump over the NOP */ /* jump over the NOP */
...@@ -337,8 +332,7 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -337,8 +332,7 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p)
obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) { if (!obj) {
DRM_ERROR("cannot find crtc %d\n", crtc_id); DRM_ERROR("cannot find crtc %d\n", crtc_id);
r = -EINVAL; return -EINVAL;
goto out;
} }
crtc = obj_to_crtc(obj); crtc = obj_to_crtc(obj);
radeon_crtc = to_radeon_crtc(crtc); radeon_crtc = to_radeon_crtc(crtc);
...@@ -363,12 +357,10 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -363,12 +357,10 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p)
break; break;
default: default:
DRM_ERROR("unknown crtc reloc\n"); DRM_ERROR("unknown crtc reloc\n");
r = -EINVAL; return -EINVAL;
goto out;
} }
} }
out: return 0;
return r;
} }
static int evergreen_packet0_check(struct radeon_cs_parser *p, static int evergreen_packet0_check(struct radeon_cs_parser *p,
......
...@@ -1205,14 +1205,12 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -1205,14 +1205,12 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
if (waitreloc.reg != RADEON_WAIT_UNTIL || if (waitreloc.reg != RADEON_WAIT_UNTIL ||
waitreloc.count != 0) { waitreloc.count != 0) {
DRM_ERROR("vline wait had illegal wait until segment\n"); DRM_ERROR("vline wait had illegal wait until segment\n");
r = -EINVAL; return -EINVAL;
return r;
} }
if (radeon_get_ib_value(p, waitreloc.idx + 1) != RADEON_WAIT_CRTC_VLINE) { if (radeon_get_ib_value(p, waitreloc.idx + 1) != RADEON_WAIT_CRTC_VLINE) {
DRM_ERROR("vline wait had illegal wait until\n"); DRM_ERROR("vline wait had illegal wait until\n");
r = -EINVAL; return -EINVAL;
return r;
} }
/* jump over the NOP */ /* jump over the NOP */
...@@ -1230,8 +1228,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -1230,8 +1228,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) { if (!obj) {
DRM_ERROR("cannot find crtc %d\n", crtc_id); DRM_ERROR("cannot find crtc %d\n", crtc_id);
r = -EINVAL; return -EINVAL;
goto out;
} }
crtc = obj_to_crtc(obj); crtc = obj_to_crtc(obj);
radeon_crtc = to_radeon_crtc(crtc); radeon_crtc = to_radeon_crtc(crtc);
...@@ -1253,14 +1250,13 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -1253,14 +1250,13 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
break; break;
default: default:
DRM_ERROR("unknown crtc reloc\n"); DRM_ERROR("unknown crtc reloc\n");
r = -EINVAL; return -EINVAL;
goto out;
} }
ib[h_idx] = header; ib[h_idx] = header;
ib[h_idx + 3] |= RADEON_ENG_DISPLAY_SELECT_CRTC1; ib[h_idx + 3] |= RADEON_ENG_DISPLAY_SELECT_CRTC1;
} }
out:
return r; return 0;
} }
/** /**
......
...@@ -780,33 +780,28 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -780,33 +780,28 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p)
if (wait_reg_mem.type != PACKET_TYPE3 || if (wait_reg_mem.type != PACKET_TYPE3 ||
wait_reg_mem.opcode != PACKET3_WAIT_REG_MEM) { wait_reg_mem.opcode != PACKET3_WAIT_REG_MEM) {
DRM_ERROR("vline wait missing WAIT_REG_MEM segment\n"); DRM_ERROR("vline wait missing WAIT_REG_MEM segment\n");
r = -EINVAL; return -EINVAL;
return r;
} }
wait_reg_mem_info = radeon_get_ib_value(p, wait_reg_mem.idx + 1); wait_reg_mem_info = radeon_get_ib_value(p, wait_reg_mem.idx + 1);
/* bit 4 is reg (0) or mem (1) */ /* bit 4 is reg (0) or mem (1) */
if (wait_reg_mem_info & 0x10) { if (wait_reg_mem_info & 0x10) {
DRM_ERROR("vline WAIT_REG_MEM waiting on MEM rather than REG\n"); DRM_ERROR("vline WAIT_REG_MEM waiting on MEM rather than REG\n");
r = -EINVAL; return -EINVAL;
return r;
} }
/* waiting for value to be equal */ /* waiting for value to be equal */
if ((wait_reg_mem_info & 0x7) != 0x3) { if ((wait_reg_mem_info & 0x7) != 0x3) {
DRM_ERROR("vline WAIT_REG_MEM function not equal\n"); DRM_ERROR("vline WAIT_REG_MEM function not equal\n");
r = -EINVAL; return -EINVAL;
return r;
} }
if ((radeon_get_ib_value(p, wait_reg_mem.idx + 2) << 2) != AVIVO_D1MODE_VLINE_STATUS) { if ((radeon_get_ib_value(p, wait_reg_mem.idx + 2) << 2) != AVIVO_D1MODE_VLINE_STATUS) {
DRM_ERROR("vline WAIT_REG_MEM bad reg\n"); DRM_ERROR("vline WAIT_REG_MEM bad reg\n");
r = -EINVAL; return -EINVAL;
return r;
} }
if (radeon_get_ib_value(p, wait_reg_mem.idx + 5) != AVIVO_D1MODE_VLINE_STAT) { if (radeon_get_ib_value(p, wait_reg_mem.idx + 5) != AVIVO_D1MODE_VLINE_STAT) {
DRM_ERROR("vline WAIT_REG_MEM bad bit mask\n"); DRM_ERROR("vline WAIT_REG_MEM bad bit mask\n");
r = -EINVAL; return -EINVAL;
return r;
} }
/* jump over the NOP */ /* jump over the NOP */
...@@ -825,8 +820,7 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -825,8 +820,7 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p)
obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) { if (!obj) {
DRM_ERROR("cannot find crtc %d\n", crtc_id); DRM_ERROR("cannot find crtc %d\n", crtc_id);
r = -EINVAL; return -EINVAL;
goto out;
} }
crtc = obj_to_crtc(obj); crtc = obj_to_crtc(obj);
radeon_crtc = to_radeon_crtc(crtc); radeon_crtc = to_radeon_crtc(crtc);
...@@ -849,14 +843,13 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -849,14 +843,13 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p)
break; break;
default: default:
DRM_ERROR("unknown crtc reloc\n"); DRM_ERROR("unknown crtc reloc\n");
r = -EINVAL; return -EINVAL;
goto out;
} }
ib[h_idx] = header; ib[h_idx] = header;
ib[h_idx + 4] = AVIVO_D2MODE_VLINE_STATUS >> 2; ib[h_idx + 4] = AVIVO_D2MODE_VLINE_STATUS >> 2;
} }
out:
return r; return 0;
} }
static int r600_packet0_check(struct radeon_cs_parser *p, static int r600_packet0_check(struct radeon_cs_parser *p,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment