diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-06-07 06:59:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-07 06:59:15 +0300 |
commit | 5575b1d27fc222f973d96dc06af0f21ba7656f28 (patch) | |
tree | 6d29c0a7edc3769c9fbba0a3c6f6ed9ba10ba8ed /meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch | |
parent | 4aa406adc1accd959bf64d299d750e8b2083ace3 (diff) | |
parent | 10bc2ef852277cf8e9858f75cea9f55b482bf85b (diff) | |
download | openbmc-5575b1d27fc222f973d96dc06af0f21ba7656f28.tar.xz |
Merge pull request #10 from Intel-BMC/update
Update
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch index e4161961e..41bf4fb55 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch @@ -1,19 +1,19 @@ -From aa8f405609038693481bad4393d58f0c665569a6 Mon Sep 17 00:00:00 2001 +From 28aa61a720d2db812d66b2b59681ba184771ff3e Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Date: Tue, 21 May 2019 16:00:28 -0700 -Subject: [PATCH 1/4] media: aspeed: remove source buffer allocation before - mode detection +Subject: [PATCH] media: aspeed: remove source buffer allocation before mode + detection Mode detection doesn't require source buffer allocation so this commit removes that. Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> --- - drivers/media/platform/aspeed-video.c | 21 --------------------- - 1 file changed, 21 deletions(-) + drivers/media/platform/aspeed-video.c | 37 +++++------------------------------ + 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c -index 1bb863b32836..ee1f87a08c7c 100644 +index 1bb863b32836..fed51fd22ce2 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -733,27 +733,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) @@ -44,6 +44,32 @@ index 1bb863b32836..ee1f87a08c7c 100644 do { if (tries) { set_current_state(TASK_INTERRUPTIBLE); +@@ -873,20 +852,14 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) + + size *= 4; + +- if (size == video->srcs[0].size / 2) { +- aspeed_video_write(video, VE_SRC1_ADDR, +- video->srcs[0].dma + size); +- } else if (size == video->srcs[0].size) { +- if (!aspeed_video_alloc_buf(video, &video->srcs[1], size)) +- goto err_mem; +- +- aspeed_video_write(video, VE_SRC1_ADDR, video->srcs[1].dma); +- } else { +- aspeed_video_free_buf(video, &video->srcs[0]); ++ if (size != video->srcs[0].size) { ++ if (video->srcs[0].size) ++ aspeed_video_free_buf(video, &video->srcs[0]); ++ if (video->srcs[1].size) ++ aspeed_video_free_buf(video, &video->srcs[1]); + + if (!aspeed_video_alloc_buf(video, &video->srcs[0], size)) + goto err_mem; +- + if (!aspeed_video_alloc_buf(video, &video->srcs[1], size)) + goto err_mem; + -- -2.21.0 +2.7.4 |