| Message ID | 1432314314-23530-6-git-send-email-mika.kuoppala@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On pe, 2015-05-22 at 20:04 +0300, Mika Kuoppala wrote: > Free the scratch page if dma mapping fails. > > Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index c61de4a..a608b1b 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -2191,8 +2191,10 @@ static int setup_scratch_page(struct drm_device *dev) > #ifdef CONFIG_INTEL_IOMMU > dma_addr = pci_map_page(dev->pdev, page, 0, PAGE_SIZE, > PCI_DMA_BIDIRECTIONAL); > - if (pci_dma_mapping_error(dev->pdev, dma_addr)) > + if (pci_dma_mapping_error(dev->pdev, dma_addr)) { > + __free_page(page); > return -EINVAL; > + } > #else > dma_addr = page_to_phys(page); > #endif
On Mon, Jun 01, 2015 at 06:02:52PM +0300, Joonas Lahtinen wrote: > On pe, 2015-05-22 at 20:04 +0300, Mika Kuoppala wrote: > > Free the scratch page if dma mapping fails. > > > > Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Queued for -next, thanks for the patch. -Daniel > > > --- > > drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > > index c61de4a..a608b1b 100644 > > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > > @@ -2191,8 +2191,10 @@ static int setup_scratch_page(struct drm_device *dev) > > #ifdef CONFIG_INTEL_IOMMU > > dma_addr = pci_map_page(dev->pdev, page, 0, PAGE_SIZE, > > PCI_DMA_BIDIRECTIONAL); > > - if (pci_dma_mapping_error(dev->pdev, dma_addr)) > > + if (pci_dma_mapping_error(dev->pdev, dma_addr)) { > > + __free_page(page); > > return -EINVAL; > > + } > > #else > > dma_addr = page_to_phys(page); > > #endif > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index c61de4a..a608b1b 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -2191,8 +2191,10 @@ static int setup_scratch_page(struct drm_device *dev) #ifdef CONFIG_INTEL_IOMMU dma_addr = pci_map_page(dev->pdev, page, 0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); - if (pci_dma_mapping_error(dev->pdev, dma_addr)) + if (pci_dma_mapping_error(dev->pdev, dma_addr)) { + __free_page(page); return -EINVAL; + } #else dma_addr = page_to_phys(page); #endif
Free the scratch page if dma mapping fails. Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)