From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Noralf Trønnes" <noralf@tronnes.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
"Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 3/6] staging: fbtft: fallback to usual allocation when DMA fails
Date: Mon, 2 Jan 2017 13:35:31 +0200 [thread overview]
Message-ID: <20170102113534.127692-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170102113534.127692-1-andriy.shevchenko@linux.intel.com>
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
next prev parent reply other threads:[~2017-01-02 11:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-02 11:35 [PATCH v2 0/6] fbtft: make it work with DMA enabled SPI Andy Shevchenko
2017-01-02 11:35 ` [PATCH v2 1/6] staging: fbtft: convert fbtft_reset() to be non-atomic Andy Shevchenko
2017-01-03 17:22 ` Noralf Trønnes
2017-01-02 11:35 ` [PATCH v2 2/6] staging: fbtft: do not override DMA coherent mask Andy Shevchenko
2017-01-02 18:14 ` Noralf Trønnes
2017-01-03 10:51 ` Andy Shevchenko
2017-01-03 13:58 ` Andy Shevchenko
2017-01-03 17:18 ` Noralf Trønnes
2017-01-02 11:35 ` Andy Shevchenko [this message]
2017-01-03 16:12 ` [PATCH v2 3/6] staging: fbtft: fallback to usual allocation when DMA fails Andy Shevchenko
2017-01-03 17:23 ` Noralf Trønnes
2017-01-02 11:35 ` [PATCH v2 4/6] staging: fbtft: propagate error code from kstrto*() Andy Shevchenko
2017-01-02 18:19 ` kbuild test robot
2017-01-02 11:35 ` [PATCH v2 5/6] staging: fbtft: fb_ssd1306: Support smaller screen sizes Andy Shevchenko
2017-01-03 17:27 ` Noralf Trønnes
2017-01-02 11:35 ` [PATCH v2 6/6] staging: fbtft: fb_ssd1306: Refactor write_vmem() Andy Shevchenko
2017-01-02 11:37 ` [PATCH v2 0/6] fbtft: make it work with DMA enabled SPI Andy Shevchenko
2017-01-03 15:27 ` Greg Kroah-Hartman
2017-01-03 15:49 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170102113534.127692-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=noralf@tronnes.org \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome