Commit 71ef8053 authored by Jammy Huang's avatar Jammy Huang Committed by Mauro Carvalho Chehab

media: aspeed: Fix no complete irq for non-64-aligned width

In ast2500, engine will stop occasionally for 1360x768.

This is a bug which has been addressed, but the workaround is specific
for 1680 only. Here we make it more complete.
Signed-off-by: default avatarJammy Huang <jammy_huang@aspeedtech.com>
Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent fd3e9d57
...@@ -916,18 +916,19 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) ...@@ -916,18 +916,19 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
/* Set capture/compression frame sizes */ /* Set capture/compression frame sizes */
aspeed_video_calc_compressed_size(video, size); aspeed_video_calc_compressed_size(video, size);
if (video->active_timings.width == 1680) { if (!IS_ALIGNED(act->width, 64)) {
/* /*
* This is a workaround to fix a silicon bug on A1 and A2 * This is a workaround to fix a AST2500 silicon bug on A1 and
* revisions. Since it doesn't break capturing operation of * A2 revisions. Since it doesn't break capturing operation of
* other revisions, use it for all revisions without checking * other revisions, use it for all revisions without checking
* the revision ID. It picked 1728 which is a very next * the revision ID. It picked new width which is a very next
* 64-pixels aligned value to 1680 to minimize memory bandwidth * 64-pixels aligned value to minimize memory bandwidth
* and to get better access speed from video engine. * and to get better access speed from video engine.
*/ */
aspeed_video_write(video, VE_CAP_WINDOW, u32 width = ALIGN(act->width, 64);
1728 << 16 | act->height);
size += (1728 - 1680) * video->active_timings.height; aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height);
size = width * act->height;
} else { } else {
aspeed_video_write(video, VE_CAP_WINDOW, aspeed_video_write(video, VE_CAP_WINDOW,
act->width << 16 | act->height); act->width << 16 | act->height);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment