[PATCH v2 3/6] staging: fbtft: fallback to usual allocation when DMA fails

From	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 3/6] staging: fbtft: fallback to usual allocation when DMA fails
Date	2017-01-02 12:40 +0100
Message-ID	<sV985-6ct-13@gated-at.bofh.it> (permalink)
References	<sV985-6ct-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Fall back to usual allocation method if DMA coherent allocation fails.

SPI framework will map and use DMA mapped memory when possible.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/staging/fbtft/fbtft-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index 226be8c09768..9f024986aff4 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -843,7 +843,8 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
 		if (dma) {
 			txbuf = dmam_alloc_coherent(dev, txbuflen,
 						    &par->txbuf.dma, GFP_DMA);
-		} else
+		}
+		if (!txbuf)
 #endif
 		{
 			txbuf = devm_kzalloc(par->info->device,
-- 
2.11.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 3/6] staging: fbtft: fallback to usual allocation when DMA fails Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-01-02 12:40 +0100
  Re: [PATCH v2 3/6] staging: fbtft: fallback to usual allocation  when DMA fails Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-01-03 17:20 +0100
    Re: [PATCH v2 3/6] staging: fbtft: fallback to usual allocation when  DMA fails Noralf Trønnes <noralf@tronnes.org> - 2017-01-03 18:30 +0100

csiph-web