diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-04-18 12:54:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-18 12:54:58 +1000 |
| commit | 95c7d351e1ccc2c381f0a60eaca9dd962d2aff6d (patch) | |
| tree | a2b8ccf430b91c5a9ea13449f6f05cd26dc5657d | |
| parent | 5df5242d34c131d049359e01b9ce928659885c4b (diff) | |
| parent | cbfbbabb89b37f6bad05f478d906a385149f288d (diff) | |
| download | linux-stable-95c7d351e1ccc2c381f0a60eaca9dd962d2aff6d.tar.gz linux-stable-95c7d351e1ccc2c381f0a60eaca9dd962d2aff6d.tar.bz2 linux-stable-95c7d351e1ccc2c381f0a60eaca9dd962d2aff6d.zip | |
Merge tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Fixes for v3.15-rc2
This contains a fix for the host1x driver writing to non-existent syncpt
registers.
A second commit removes an excess pad field in the parameter structure
for the DRM_TEGRA_SUBMIT IOCTL. Archeaology on earlier versions of this
file indicates that this was once there to pad an uneven number of u32
u32 fields, of which one was subsequently removed. Unfortunately nobody
remembered to get rid of the padding when that happened.
Both of these commits are Cc: stable because they fix issues that were
introduced back in v3.10.
* tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/tegra/linux:
drm/tegra: Remove gratuitous pad field
gpu: host1x: handle the correct # of syncpt regs
| -rw-r--r-- | drivers/gpu/host1x/hw/intr_hw.c | 4 | ||||
| -rw-r--r-- | include/uapi/drm/tegra_drm.h | 1 |
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, ®, 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; |