gpu: host1x: handle the correct # of syncpt regs

BIT_WORD() truncates rather than rounds, so the loops in syncpt_thresh_isr() and _host1x_intr_disable_all_syncpt_intrs() use <= rather than < in an attempt to process the correct number of registers when rounding of the conversion of count of bits to count of words is necessary. However, when rounding isn't necessary because the value is already a multiple of the divisor (as is the case for all values of nb_pts the code actually sees), this causes one too many registers to be processed. Solve this by using and explicit DIV_ROUND_UP() call, rather than BIT_WORD(), and comparing with < rather than <=.

Stephen Warren committed 12 years ago

Commit 22bbd5d1 parent c9eaa441 file · +2 −2Browse files

Unified · Split

drivers/gpu/host1x/hw/intr_hw.c+2−2

@@ -47,7 +47,7 @@ static irqreturn_t syncpt_thresh_isr(int irq, void *dev_id) · 46 unmodified lines
47	unsigned long reg;	47	unsigned long reg;
48	int i, id;	48	int i, id;
49		49
50	for (i = 0; i <= BIT_WORD(host->info->nb_pts); i++) {	50	for (i = 0; i < DIV_ROUND_UP(host->info->nb_pts, 32); i++) {
51	reg = host1x_sync_readl(host,	51	reg = host1x_sync_readl(host,
52	HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(i));	52	HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(i));
53	for_each_set_bit(id, &reg, BITS_PER_LONG) {	53	for_each_set_bit(id, &reg, BITS_PER_LONG) {
@@ -64,7 +64,7 @@ static void _host1x_intr_disable_all_syncpt_intrs(struct host1x *host) · 10 unmodified lines
64	{	64	{
65	u32 i;	65	u32 i;
66		66
67	for (i = 0; i <= BIT_WORD(host->info->nb_pts); ++i) {	67	for (i = 0; i < DIV_ROUND_UP(host->info->nb_pts, 32); ++i) {
68	host1x_sync_writel(host, 0xffffffffu,	68	host1x_sync_writel(host, 0xffffffffu,
69	HOST1X_SYNC_SYNCPT_THRESH_INT_DISABLE(i));	69	HOST1X_SYNC_SYNCPT_THRESH_INT_DISABLE(i));
70	host1x_sync_writel(host, 0xffffffffu,	70	host1x_sync_writel(host, 0xffffffffu,