| Message ID | 20210916141307.2010255-1-mperttunen@nvidia.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/tegra: Use correct property for BO size | expand |
16.09.2021 17:13, Mikko Perttunen пишет: > The size property is not always populated, while the gem.size > property is. > > Fixes: d7c591bc1a3f ("drm/tegra: Implement new UAPI") > Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> > --- > drivers/gpu/drm/tegra/uapi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/tegra/uapi.c b/drivers/gpu/drm/tegra/uapi.c > index dc16a24f4dbe..690a339c52ec 100644 > --- a/drivers/gpu/drm/tegra/uapi.c > +++ b/drivers/gpu/drm/tegra/uapi.c > @@ -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); > Did something bad happened to [1]? Thierry fetched patches, but didn't make the fixes-PR yet, AFAICS. [1] https://patchwork.ozlabs.org/project/linux-tegra/patch/20210817020153.25378-3-digetx@gmail.com/
On 9/16/21 6:56 PM, Dmitry Osipenko wrote: > 16.09.2021 17:13, Mikko Perttunen пишет: >> The size property is not always populated, while the gem.size >> property is. >> >> Fixes: d7c591bc1a3f ("drm/tegra: Implement new UAPI") >> Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> >> --- >> drivers/gpu/drm/tegra/uapi.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/tegra/uapi.c b/drivers/gpu/drm/tegra/uapi.c >> index dc16a24f4dbe..690a339c52ec 100644 >> --- a/drivers/gpu/drm/tegra/uapi.c >> +++ b/drivers/gpu/drm/tegra/uapi.c >> @@ -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); >> > > Did something bad happened to [1]? Thierry fetched patches, but didn't > make the fixes-PR yet, AFAICS. Oh, didn't remember you had already fixed it. Let's disregard my patch then. Thanks, Mikko > > [1] > https://patchwork.ozlabs.org/project/linux-tegra/patch/20210817020153.25378-3-digetx@gmail.com/ >
diff --git a/drivers/gpu/drm/tegra/uapi.c b/drivers/gpu/drm/tegra/uapi.c index dc16a24f4dbe..690a339c52ec 100644 --- a/drivers/gpu/drm/tegra/uapi.c +++ b/drivers/gpu/drm/tegra/uapi.c @@ -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);
The size property is not always populated, while the gem.size property is. Fixes: d7c591bc1a3f ("drm/tegra: Implement new UAPI") Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> --- drivers/gpu/drm/tegra/uapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)