Tegra DRM and Host1x driver fixes
cover Tegra DRM and Host1x driver fixes
Fix troubles introduced by recent commits.
Dmitry Osipenko (3):
drm/tegra: dc: Remove unused variables
drm/tegra: uapi: Fix wrong mapping end address in case of disabled
IOMMU
gpu/host1x: fence: Make spinlock static
drivers/gpu/drm/tegra/dc.c | 3 --- drivers/gpu/drm/tegra/dc.h | 6 ------ drivers/gpu/drm/tegra/uapi.c | 2 +- drivers/gpu/host1x/fence.c | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/3 drm/tegra: dc: Remove unused variables
Remove unused variables from tegra_crtc_update_memory_bandwidth().
--- drivers/gpu/drm/tegra/dc.c | 3 --- drivers/gpu/drm/tegra/dc.h | 6 ------ 2 files changed, 9 deletions(-)
drivers/gpu/drm/tegra/dc.c +0 -3
@@ -1845,7 +1845,6 @@ tegra_crtc_update_memory_bandwidth(struct drm_crtc *crtc, bool prepare_bandwidth_transition) {const struct tegra_plane_state *old_tegra_state, *new_tegra_state; -const struct tegra_dc_state *old_dc_state, *new_dc_state;u32 i, new_avg_bw, old_avg_bw, new_peak_bw, old_peak_bw;const struct drm_plane_state *old_plane_state;const struct drm_crtc_state *old_crtc_state;
@@ -1858,8 +1857,6 @@ tegra_crtc_update_memory_bandwidth(struct drm_crtc *crtc,return ; old_crtc_state =drm_atomic_get_old_crtc_state (state, crtc); - old_dc_state =to_const_dc_state (old_crtc_state); - new_dc_state =to_const_dc_state (crtc->state);if (!crtc->state->active) {if (!old_crtc_state->active)
drivers/gpu/drm/tegra/dc.h +0 -6
@@ -35,12 +35,6 @@ static inline struct tegra_dc_state *to_dc_state(struct drm_crtc_state *state)return NULL ; } -static inline const struct tegra_dc_state * -to_const_dc_state (const struct drm_crtc_state *state) -{ -return to_dc_state ((struct drm_crtc_state *)state); -} -struct tegra_dc_stats {unsigned long frames;unsigned long vblank;
Signature · 1 line
2.32.0
PATCH 2/3 drm/tegra: uapi: Fix wrong mapping end address in case of disabled IOMMU
In reply to Dmitry OsipenkoAll jobs are failing on Tegra20 because it doesn't use IOMMU and mapping function uses size of mapping that is zero instead of BO size, fix it.
--- drivers/gpu/drm/tegra/uapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tegra/uapi.c +1 -1
@@ -222,7 +222,7 @@ int tegra_drm_ioctl_channel_map(struct drm_device *drm, void *data, struct drm_f mapping->iova =sg_dma_address (mapping->sgt->sgl); } - mapping->iova_end = mapping->iova +host1x_to_tegra_bo (mapping->bo)->size; + mapping->iova_end = mapping->iova +host1x_to_tegra_bo (mapping->bo)->gem.size; err =xa_alloc (&context->mappings, &args->mapping, mapping,XA_LIMIT (1 ,U32_MAX ),GFP_KERNEL );
Signature · 1 line
2.32.0
PATCH 3/3 gpu/host1x: fence: Make spinlock static
In reply to Dmitry OsipenkoThe DEFINE_SPINLOCK macro creates a global spinlock symbol that is visible to the whole kernel. This is unintended in the code, fix it.
--- drivers/gpu/host1x/fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/host1x/fence.c +1 -1
@@ -15,7 +15,7 @@#include "intr.h" #include "syncpt.h" -DEFINE_SPINLOCK (lock); +static DEFINE_SPINLOCK (lock);struct host1x_syncpt_fence {struct dma_fence base;
Signature · 1 line
2.32.0
Quoted 8 lines · Dmitry Osipenko
Fix troubles introduced by recent commits.
Dmitry Osipenko (3):
drm/tegra: dc: Remove unused variables
drm/tegra: uapi: Fix wrong mapping end address in case of disabled
IOMMU
gpu/host1x: fence: Make spinlock static
Quoted 6 lines
drivers/gpu/drm/tegra/dc.c | 3 --- drivers/gpu/drm/tegra/dc.h | 6 ------ drivers/gpu/drm/tegra/uapi.c | 2 +- drivers/gpu/host1x/fence.c | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-)
Series
I went through the changes between v6 and v7 and from what I can tell the end address change above is the only one of those missing in what was merged.
Thanks,
Mikko
Quoted 8 lines · Dmitry Osipenko
Fix troubles introduced by recent commits.
Dmitry Osipenko (3):
drm/tegra: dc: Remove unused variables
drm/tegra: uapi: Fix wrong mapping end address in case of disabled
IOMMU
gpu/host1x: fence: Make spinlock static
Quoted 5 lines
drivers/gpu/drm/tegra/dc.c | 3 --- drivers/gpu/drm/tegra/dc.h | 6 ------ drivers/gpu/drm/tegra/uapi.c | 2 +- drivers/gpu/host1x/fence.c | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-)
All three patches applied, thanks.
Thierry