2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/gpu/host1x/hw/intr_hw.c b/drivers/gpu/host1x/hw/intr_hw.c
index db9017adfe2b..498b37e39058 100644
--- a/drivers/gpu/host1x/hw/intr_hw.c
+++ b/drivers/gpu/host1x/hw/intr_hw.c
@@ -47,7 +47,7 @@ static irqreturn_t syncpt_thresh_isr(int irq, void *dev_id)
         unsigned long reg;
         int i, id;
 
-        for (i = 0; i <= BIT_WORD(host->info->nb_pts); i++) {
+        for (i = 0; i < DIV_ROUND_UP(host->info->nb_pts, 32); i++) {
                 reg = host1x_sync_readl(host,
                         HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(i));
                 for_each_set_bit(id, &reg, BITS_PER_LONG) {
@@ -64,7 +64,7 @@ static void _host1x_intr_disable_all_syncpt_intrs(struct host1x *host)
 {
         u32 i;
 
-        for (i = 0; i <= BIT_WORD(host->info->nb_pts); ++i) {
+        for (i = 0; i < DIV_ROUND_UP(host->info->nb_pts, 32); ++i) {
                 host1x_sync_writel(host, 0xffffffffu,
                         HOST1X_SYNC_SYNCPT_THRESH_INT_DISABLE(i));
                 host1x_sync_writel(host, 0xffffffffu,
diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h
index b042b48495d9..b75482112428 100644
--- a/include/uapi/drm/tegra_drm.h
+++ b/include/uapi/drm/tegra_drm.h
@@ -120,7 +120,6 @@ struct drm_tegra_submit {
         __u32 num_waitchks;
         __u32 waitchk_mask;
         __u32 timeout;
-        __u32 pad;
         __u64 syncpts;
         __u64 cmdbufs;
         __u64 relocs;