drm/omap: ensure we have a valid dma_mask
Subsystems (3)
PATCH 1/1 drm/omap: ensure we have a valid dma_mask
The omapfb platform devices does not have a DMA mask set. The traditional arm DMA code ignores, but the generic dma-direct/swiotlb has stricter checks and thus fails mappings without a DMA mask. As we use swiotlb for arm with LPAE now, omap needs to catch up and actually set a DMA mask.
--- drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/omapdrm/omap_fbdev.c +2 -0
@@ -232,6 +232,8 @@ void omap_fbdev_init(struct drm_device *dev)if (!priv->num_pipes)return ; +dma_coerce_mask_and_coherent (dev->dev,DMA_BIT_MASK (32 )); + fbdev =kzalloc (sizeof (*fbdev),GFP_KERNEL );if (!fbdev) goto fail;
Signature · 1 line
2.20.1
Hi,
Quoted 20 lines · Christoph Hellwig
The omapfb platform devices does not have a DMA mask set. The traditional arm DMA code ignores, but the generic dma-direct/swiotlb has stricter checks and thus fails mappings without a DMA mask. As we use swiotlb for arm with LPAE now, omap needs to catch up and actually set a DMA mask.
Fixes ad3c7b18c5b3 ("arm: use swiotlb for bounce buffering on LPAE configs")Reported-by "H. Nikolaus Schaller" <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/omapdrm/omap_fbdev.c +0
-0
drivers/gpu/drm/omapdrm/omap_fbdev.c void omap_fbdev_init(struct drm_device *dev) · line 239
Quoted 8 lines
drivers/gpu/drm/omapdrm/omap_fbdev.c +2
-0@@ -232,6 +232,8 @@ void omap_fbdev_init(struct drm_device *dev)if (!priv->num_pipes)return ; +dma_coerce_mask_and_coherent (dev->dev,DMA_BIT_MASK (32 )); + fbdev =kzalloc (sizeof (*fbdev),GFP_KERNEL );if (!fbdev) goto fail;
We do call dma_set_coherent_mask() in omapdrm's probe() (in omap_drv.c), but apparently that's not enough anymore. Changing that call to dma_coerce_mask_and_coherent() removes the WARN. I can create a patch for that, or Christoph can respin this one.
I am not too familiar with the dma mask handling, so maybe someone can educate:
dma_coerce_mask_and_coherent() overwrites dev->dma_mask. Isn't that a bad thing? What if the platform has set dev->dma_mask, and the driver overwrites it with its value? Or who is supposed to set dev->dma_mask?
Tomi
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines · Tomi Valkeinen
We do call
dma_set_coherent_mask()in omapdrm'sprobe()(inomap_drv.c), but apparently that's not enough anymore. Changing that call todma_coerce_mask_and_coherent()removes the WARN. I can create a patch for that, or Christoph can respin this one.
Oh, yes - that actually is the right thing to do here. If you already have it please just send it out.
Quoted 7 lines
I am not too familiar with the dma mask handling, so maybe someone can educate:
dma_coerce_mask_and_coherent()overwritesdev->dma_mask. Isn't that a bad thing? What if the platform has setdev->dma_mask, and the driver overwrites it with its value? Or who is supposed to setdev->dma_mask?
->dma_mask is a complete mess. It is a pointer when it really should just be a u64, and that means every driver layer has to allocate space for it. We don't really do that for platform_devices, as that breaks horribly assumptions in the usb code. That is why dma_coerce_mask_and_coherent exists as a nasty workaround that sets the dma_mask to the coherent_dma_mask for devices that don't have space for ->dma_mask allocated, which works as long as the device doesn't have differnet addressing requirements for both.
I'm actually working to fix that mess up at the moment, but it is going to take a few cycles until everything falls into place.
Quoted 26 lines · Christoph Hellwig
Quoted 4 lines · Tomi Valkeinen
We do call
dma_set_coherent_mask()in omapdrm'sprobe()(inomap_drv.c), but apparently that's not enough anymore. Changing that call todma_coerce_mask_and_coherent()removes the WARN. I can create a patch for that, or Christoph can respin this one.Oh, yes - that actually is the right thing to do here. If you already have it please just send it out.
Quoted 7 lines
I am not too familiar with the dma mask handling, so maybe someone can educate:
dma_coerce_mask_and_coherent()overwritesdev->dma_mask. Isn't that a bad thing? What if the platform has setdev->dma_mask, and the driver overwrites it with its value? Or who is supposed to setdev->dma_mask?->dma_mask is a complete mess. It is a pointer when it really should just be a u64, and that means every driver layer has to allocate space for it. We don't really do that for
platform_devices, as that breaks horribly assumptions in the usb code. That is whydma_coerce_mask_and_coherentexists as a nasty workaround that sets thedma_maskto thecoherent_dma_maskfor devices that don't have space for ->dma_mask allocated, which works as long as the device doesn't have differnet addressing requirements for both.
Quoted 2 lines
I'm actually working to fix that mess up at the moment, but it is going to take a few cycles until everything falls into place.
Alright, thanks for the clarification!
Here's my version.
Quoted 1 line
From
c258309e36fc86076db155aead03a3900b96c3d4Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <[email protected]>
Date: Fri, 9 Aug 2019 09:54:49 +0300
Subject: [PATCH] drm/omap: ensure we have a valid dma_mask
The omapdrm driver uses dma_set_coherent_mask(), but that's not enough anymore when LPAE is enabled.
Quoted 1 line
From Christoph Hellwig <[email protected]>:
The traditional arm DMA code ignores, but the generic dma-direct/swiotlb has stricter checks and thus fails mappings without a DMA mask. As we use swiotlb for arm with LPAE now, omapdrm needs to catch up and actually set a DMA mask.
Change the dma_set_coherent_mask() call to dma_coerce_mask_and_coherent() so that the dev->dma_mask is also set.
drivers/gpu/drm/omapdrm/omap_drv.c +1 -1
@@ -669,7 +669,7 @@ static int pdev_probe(struct platform_device *pdev)if (omapdss_is_initialized () == false)return -EPROBE_DEFER ; - ret =dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (32 )); + ret =dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 ));if (ret) {dev_err (&pdev->dev,"Failed to set the DMA mask\n" );return ret;
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Christoph Hellwig
Reviewed-byQuoted 3 lines · Tomi Valkeinen
Alright, thanks for the clarification!
Here's my version.
Looks god to me:
Peter Ujfalusi
Reviewed-byQuoted 12 lines · Tomi Valkeinen
Here's my version.
From
c258309e36fc86076db155aead03a3900b96c3d4Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <[email protected]>
Date: Fri, 9 Aug 2019 09:54:49 +0300
Subject: [PATCH] drm/omap: ensure we have a validdma_maskThe omapdrm driver uses
dma_set_coherent_mask(), but that's not enough anymore when LPAE is enabled.From Christoph Hellwig <[email protected]>:
Quoted 7 lines
The traditional arm DMA code ignores, but the generic dma-direct/swiotlb has stricter checks and thus fails mappings without a DMA mask. As we use swiotlb for arm with LPAE now, omapdrm needs to catch up and actually set a DMA mask.
Change the
dma_set_coherent_mask()call todma_coerce_mask_and_coherent()so that thedev->dma_maskis also set.
Quoted 13 lines
Fixes ad3c7b18c5b3 ("arm: use swiotlb for bounce buffering on LPAE configs")Reported-by "H. Nikolaus Schaller" <[email protected]>Signed-off-by Tomi Valkeinen <[email protected]>drivers/gpu/drm/omapdrm/omap_drv.c +0
-0
drivers/gpu/drm/omapdrm/omap_drv.c static int pdev_probe(struct platform_device *pdev) · line 675
Quoted 8 lines
drivers/gpu/drm/omapdrm/omap_drv.c +1
-1@@ -669,7 +669,7 @@ static int pdev_probe(struct platform_device *pdev)if (omapdss_is_initialized () == false)return -EPROBE_DEFER ; - ret =dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (32 )); + ret =dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 ));if (ret) {dev_err (&pdev->dev,"Failed to set the DMA mask\n" );return ret;
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel