| Message ID | 20190524231725.12320-9-jae.hyun.yoo@linux.intel.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | Improve stability and add bug fixes of Aspeed video engine driver | expand |
On 5/24/19 6:17 PM, Jae Hyun Yoo wrote: > Mode detection doesn't require source buffer allocation so this > commit removes that. Reviewed-by: Eddie James <eajames@linux.ibm.com> > > Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> > --- > v1 -> v2: > New. > > drivers/media/platform/aspeed-video.c | 21 --------------------- > 1 file changed, 21 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index c0b889141b8f..4647ed2e9e63 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -731,27 +731,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > det->height = MIN_HEIGHT; > video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL; > > - /* > - * Since we need max buffer size for detection, free the second source > - * buffer first. > - */ > - if (video->srcs[1].size) > - aspeed_video_free_buf(video, &video->srcs[1]); > - > - if (video->srcs[0].size < VE_MAX_SRC_BUFFER_SIZE) { > - if (video->srcs[0].size) > - aspeed_video_free_buf(video, &video->srcs[0]); > - > - if (!aspeed_video_alloc_buf(video, &video->srcs[0], > - VE_MAX_SRC_BUFFER_SIZE)) { > - dev_err(video->dev, > - "Failed to allocate source buffers\n"); > - return; > - } > - } > - > - aspeed_video_write(video, VE_SRC0_ADDR, video->srcs[0].dma); > - > do { > if (tries) { > set_current_state(TASK_INTERRUPTIBLE);
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index c0b889141b8f..4647ed2e9e63 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -731,27 +731,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) det->height = MIN_HEIGHT; video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL; - /* - * Since we need max buffer size for detection, free the second source - * buffer first. - */ - if (video->srcs[1].size) - aspeed_video_free_buf(video, &video->srcs[1]); - - if (video->srcs[0].size < VE_MAX_SRC_BUFFER_SIZE) { - if (video->srcs[0].size) - aspeed_video_free_buf(video, &video->srcs[0]); - - if (!aspeed_video_alloc_buf(video, &video->srcs[0], - VE_MAX_SRC_BUFFER_SIZE)) { - dev_err(video->dev, - "Failed to allocate source buffers\n"); - return; - } - } - - aspeed_video_write(video, VE_SRC0_ADDR, video->srcs[0].dma); - do { if (tries) { set_current_state(TASK_INTERRUPTIBLE);
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> --- v1 -> v2: New. drivers/media/platform/aspeed-video.c | 21 --------------------- 1 file changed, 21 deletions(-)