diff options
author | Dave Airlie <airlied@redhat.com> | 2021-04-30 02:56:31 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2021-04-30 02:57:07 +0300 |
commit | 12fc11bce6f29a73eb3d61ab4e76a9ece3da1f1d (patch) | |
tree | e17d2fdc2ea4a8f9363e242b6465ce88e5c283d3 /drivers/staging | |
parent | a1a1ca70deb3ec600eeabb21de7f3f48aaae5695 (diff) | |
parent | 7b6f846785f41d57917e36851c120cfbe87f0809 (diff) | |
download | linux-12fc11bce6f29a73eb3d61ab4e76a9ece3da1f1d.tar.xz |
Merge tag 'drm/tegra/for-5.13-rc1' of ssh://git.freedesktop.org/git/tegra/linux into drm-next
drm/tegra: Changes for v5.13-rc1
The changes this time around contain a couple of fixes for host1x along
with some improvements for Tegra DRM. Most notably the Tegra DRM driver
now supports the hardware cursor on Tegra186 and later, more correctly
reflects the capabilities of the display pipelines on various Tegra SoC
generations and knows how to deal with the dGPU sector layout by using
framebuffer modifiers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210401164430.3349105-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/media/tegra-video/vi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 7a09061cda57..df5ca3596470 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1131,8 +1131,8 @@ static void tegra_channel_host1x_syncpts_free(struct tegra_vi_channel *chan) int i; for (i = 0; i < chan->numgangports; i++) { - host1x_syncpt_free(chan->mw_ack_sp[i]); - host1x_syncpt_free(chan->frame_start_sp[i]); + host1x_syncpt_put(chan->mw_ack_sp[i]); + host1x_syncpt_put(chan->frame_start_sp[i]); } } @@ -1177,7 +1177,7 @@ static int tegra_channel_host1x_syncpt_init(struct tegra_vi_channel *chan) mw_sp = host1x_syncpt_request(&vi->client, flags); if (!mw_sp) { dev_err(vi->dev, "failed to request memory ack syncpoint\n"); - host1x_syncpt_free(fs_sp); + host1x_syncpt_put(fs_sp); ret = -ENOMEM; goto free_syncpts; } |