diff options
| author | Eric Anholt <eric@anholt.net> | 2014-12-08 11:29:48 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-06-04 14:15:27 -0700 |
| commit | f5d2accfdf936dfe4f30263ffeea514485fb5b0d (patch) | |
| tree | 7a57b36e605569d8db8ae39956c65a839eb5dabf | |
| parent | 690eaaa38a3bcd48bc549ecc7e7933576a8c47c6 (diff) | |
| download | linux-f5d2accfdf936dfe4f30263ffeea514485fb5b0d.tar.gz | |
drm/vc4: Fix decision for whether the TMU-read MIN clamping is to the B file.
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_validate_shaders.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_validate_shaders.c b/drivers/gpu/drm/vc4/vc4_validate_shaders.c index 752c873f3aa7..cdb43e69409f 100644 --- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c +++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c @@ -221,7 +221,7 @@ check_register_write(uint64_t inst, uint32_t waddr = (is_mul ? QPU_GET_FIELD(inst, QPU_WADDR_MUL) : QPU_GET_FIELD(inst, QPU_WADDR_ADD)); - bool is_b = is_mul != ((inst & QPU_PM) != 0); + bool is_b = is_mul != ((inst & QPU_WS) != 0); uint32_t live_reg_index; switch (waddr) { @@ -297,7 +297,7 @@ track_live_clamps(uint64_t inst, uint32_t add_b = QPU_GET_FIELD(inst, QPU_ADD_B); uint32_t raddr_a = QPU_GET_FIELD(inst, QPU_RADDR_A); uint32_t raddr_b = QPU_GET_FIELD(inst, QPU_RADDR_B); - bool pm = inst & QPU_PM; + bool is_b = inst & QPU_WS; uint32_t live_reg_index; if (QPU_GET_FIELD(inst, QPU_OP_ADD) != QPU_A_MIN) @@ -308,7 +308,7 @@ track_live_clamps(uint64_t inst, return; } - live_reg_index = waddr_to_live_reg_index(waddr_add, pm); + live_reg_index = waddr_to_live_reg_index(waddr_add, is_b); if (live_reg_index != ~0) { validation_state->live_clamp_offsets[live_reg_index] = validated_shader->uniforms_size; |