projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| dcbb6c61 GKH |
1 | From fc1e2c8ea85e109acf09e74789e9b852f6eed251 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ksenija Stanojevic <ksenija.stanojevic@gmail.com> | |
| 3 | Date: Sun, 2 Oct 2016 17:42:35 +0200 | |
| 4 | Subject: Staging: fbtft: Fix bug in fbtft-core | |
| 5 | ||
| 6 | From: Ksenija Stanojevic <ksenija.stanojevic@gmail.com> | |
| 7 | ||
| 8 | commit fc1e2c8ea85e109acf09e74789e9b852f6eed251 upstream. | |
| 9 | ||
| 10 | Commit 367e8560e8d7a62d96e9b1d644028a3816e04206 introduced a bug | |
| 11 | in fbtft-core where fps is always 0, this is because variable | |
| 12 | update_time is not assigned correctly. | |
| 13 | ||
| 14 | Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com> | |
| 15 | Fixes: 367e8560e8d7 ("Staging: fbtbt: Replace timespec with ktime_t") | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 17 | ||
| 18 | --- | |
| 19 | drivers/staging/fbtft/fbtft-core.c | 4 ++-- | |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 21 | ||
| 22 | --- a/drivers/staging/fbtft/fbtft-core.c | |
| 23 | +++ b/drivers/staging/fbtft/fbtft-core.c | |
| 24 | @@ -391,11 +391,11 @@ static void fbtft_update_display(struct | |
| 25 | ||
| 26 | if (unlikely(timeit)) { | |
| 27 | ts_end = ktime_get(); | |
| 28 | - if (ktime_to_ns(par->update_time)) | |
| 29 | + if (!ktime_to_ns(par->update_time)) | |
| 30 | par->update_time = ts_start; | |
| 31 | ||
| 32 | - par->update_time = ts_start; | |
| 33 | fps = ktime_us_delta(ts_start, par->update_time); | |
| 34 | + par->update_time = ts_start; | |
| 35 | fps = fps ? 1000000 / fps : 0; | |
| 36 | ||
| 37 | throughput = ktime_us_delta(ts_end, ts_start); |