From: Alex Deucher Date: Fri, 28 Sep 2012 16:09:16 +0000 (-0400) Subject: radeonsi: fix range checking for state regs X-Git-Tag: mesa-9.1-rc1~1972 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=918e302a19d960b331c7dddf17b31a3ad3f4a627;p=platform%2Fupstream%2Fmesa.git radeonsi: fix range checking for state regs end value is exclusive, but in practice we shouldn't hit this. Signed-off-by: Alex Deucher Signed-off-by: Christian König --- diff --git a/src/gallium/drivers/radeonsi/radeonsi_pm4.c b/src/gallium/drivers/radeonsi/radeonsi_pm4.c index ea0a1bd..79a2521 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pm4.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pm4.c @@ -57,17 +57,18 @@ void si_pm4_set_reg(struct si_pm4_state *state, unsigned reg, uint32_t val) { unsigned opcode; - if (reg >= SI_CONFIG_REG_OFFSET && reg <= SI_CONFIG_REG_END) { + if (reg >= SI_CONFIG_REG_OFFSET && reg < SI_CONFIG_REG_END) { opcode = PKT3_SET_CONFIG_REG; reg -= SI_CONFIG_REG_OFFSET; - } else if (reg >= SI_SH_REG_OFFSET && reg <= SI_SH_REG_END) { + } else if (reg >= SI_SH_REG_OFFSET && reg < SI_SH_REG_END) { opcode = PKT3_SET_SH_REG; reg -= SI_SH_REG_OFFSET; - } else if (reg >= SI_CONTEXT_REG_OFFSET && reg <= SI_CONTEXT_REG_END) { + } else if (reg >= SI_CONTEXT_REG_OFFSET && reg < SI_CONTEXT_REG_END) { opcode = PKT3_SET_CONTEXT_REG; reg -= SI_CONTEXT_REG_OFFSET; + } else { R600_ERR("Invalid register offset %08x!\n", reg); return;