diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:43:24 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:43:24 -0400 |
| commit | 7187d036a048fc100a517de2abb8717d44897fed (patch) | |
| tree | 7f0391003fc13862dbba6a4adfc9a812d174bfc1 | |
| parent | 615853494c76224c076a9144a291d4ad9314007a (diff) | |
| download | longterm-queue-4.18-7187d036a048fc100a517de2abb8717d44897fed.tar.gz | |
media: drop patch for driver not present in 4.18
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/media-vimc-stream-fix-thread-state-before-sleep.patch | 45 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 46 deletions
diff --git a/queue/media-vimc-stream-fix-thread-state-before-sleep.patch b/queue/media-vimc-stream-fix-thread-state-before-sleep.patch deleted file mode 100644 index a2e3233..0000000 --- a/queue/media-vimc-stream-fix-thread-state-before-sleep.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2978a505aaa981b279ef359f74ba93d25098e0a0 Mon Sep 17 00:00:00 2001 -From: Helen Fornazier <helen.koike@collabora.com> -Date: Wed, 6 Mar 2019 17:42:38 -0500 -Subject: [PATCH] media: vimc: stream: fix thread state before sleep - -commit 2978a505aaa981b279ef359f74ba93d25098e0a0 upstream. - -The state TASK_UNINTERRUPTIBLE should be set just before -schedule_timeout() call, so it knows the sleep mode it should enter. -There is no point in setting TASK_UNINTERRUPTIBLE at the initialization -of the thread as schedule_timeout() will set the state back to -TASK_RUNNING. - -This fixes a warning in __might_sleep() call, as it's expecting the -task to be in TASK_RUNNING state just before changing the state to -a sleeping state. - -Reported-by: Hans Verkuil <hverkuil@xs4all.nl> -Signed-off-by: Helen Koike <helen.koike@collabora.com> -Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> -Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - -diff --git a/drivers/media/platform/vimc/vimc-streamer.c b/drivers/media/platform/vimc/vimc-streamer.c -index fcc897fb247b..392754c18046 100644 ---- a/drivers/media/platform/vimc/vimc-streamer.c -+++ b/drivers/media/platform/vimc/vimc-streamer.c -@@ -120,7 +120,6 @@ static int vimc_streamer_thread(void *data) - int i; - - set_freezable(); -- set_current_state(TASK_UNINTERRUPTIBLE); - - for (;;) { - try_to_freeze(); -@@ -137,6 +136,7 @@ static int vimc_streamer_thread(void *data) - break; - } - //wait for 60hz -+ set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ / 60); - } - --- -2.7.4 - diff --git a/queue/series b/queue/series index 2b74948..0188809 100644 --- a/queue/series +++ b/queue/series @@ -130,7 +130,6 @@ media-m88ds3103-serialize-reset-messages-in-m88ds310.patch media-staging-davinci_vpfe-disallow-building-with-CO.patch drm-amd-display-Fix-Divide-by-0-in-memory-calculatio.patch drm-amd-display-Set-stream-mode_changed-when-connect.patch -media-vimc-stream-fix-thread-state-before-sleep.patch media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch media-go7007-avoid-clang-frame-overflow-warning-with.patch media-vimc-zero-the-media_device-on-probe.patch |