diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-05-13 05:42:23 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-05-13 06:14:34 +0300 |
| commit | 5756c29bfa816dfde24e0719002d225ab96a0cd6 (patch) | |
| tree | a88c0cf1398bfd590ecd72730607f1fa35eaae5a /drivers/gpu/drm/tegra | |
| parent | f83493f7d34da258310ecd3d07f0cc78f884c954 (diff) | |
| parent | cb7e1abc2c73633e1eefa168ab2dad6e838899c9 (diff) | |
| download | linux-5756c29bfa816dfde24e0719002d225ab96a0cd6.tar.xz | |
Merge tag 'drm/tegra/for-5.19-rc1' of https://gitlab.freedesktop.org/drm/tegra into drm-next
drm/tegra: Changes for v5.19-rc1
Only a few fixes this time, and some debuggability improvements.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220506164004.3922226-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/gpu/drm/tegra')
| -rw-r--r-- | drivers/gpu/drm/tegra/gem.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/vic.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 0063403ab5e1..7c7dd84e6db8 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -88,6 +88,7 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_ if (IS_ERR(map->sgt)) { dma_buf_detach(buf, map->attach); err = PTR_ERR(map->sgt); + map->sgt = NULL; goto free; } diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 1e342fa3d27b..f56f5921a8c2 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -513,9 +513,8 @@ static int vic_remove(struct platform_device *pdev) } static const struct dev_pm_ops vic_pm_ops = { - SET_RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL) - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) + RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) }; struct platform_driver tegra_vic_driver = { |