lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0301/1017] media: aspeed: Correct value for h-total-pixels
    Date
    From: Jammy Huang <jammy_huang@aspeedtech.com>

    [ Upstream commit 4b732a0016853eaff35944f900b0db66f3914374 ]

    Previous reg-field, 0x98[11:0], stands for the period of the detected
    hsync signal.
    Use the correct reg, 0xa0, to get h-total in pixels.

    Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")
    Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
    Reviewed-by: Joel Stanley <joel@jms.id.au>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/aspeed-video.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
    index 7a24daf7165a..bdeecde0d997 100644
    --- a/drivers/media/platform/aspeed-video.c
    +++ b/drivers/media/platform/aspeed-video.c
    @@ -153,7 +153,7 @@
    #define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF)

    #define VE_MODE_DETECT_STATUS 0x098
    -#define VE_MODE_DETECT_H_PIXELS GENMASK(11, 0)
    +#define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0)
    #define VE_MODE_DETECT_V_LINES_SHF 16
    #define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF)
    #define VE_MODE_DETECT_STATUS_VSYNC BIT(28)
    @@ -164,6 +164,8 @@
    #define VE_SYNC_STATUS_VSYNC_SHF 16
    #define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF)

    +#define VE_H_TOTAL_PIXELS 0x0A0
    +
    #define VE_INTERRUPT_CTRL 0x304
    #define VE_INTERRUPT_STATUS 0x308
    #define VE_INTERRUPT_MODE_DETECT_WD BIT(0)
    @@ -802,6 +804,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
    u32 src_lr_edge;
    u32 src_tb_edge;
    u32 sync;
    + u32 htotal;
    struct v4l2_bt_timings *det = &video->detected_timings;

    det->width = MIN_WIDTH;
    @@ -847,6 +850,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
    src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET);
    mds = aspeed_video_read(video, VE_MODE_DETECT_STATUS);
    sync = aspeed_video_read(video, VE_SYNC_STATUS);
    + htotal = aspeed_video_read(video, VE_H_TOTAL_PIXELS);

    video->frame_bottom = (src_tb_edge & VE_SRC_TB_EDGE_DET_BOT) >>
    VE_SRC_TB_EDGE_DET_BOT_SHF;
    @@ -863,8 +867,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
    VE_SRC_LR_EDGE_DET_RT_SHF;
    video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT;
    det->hfrontporch = video->frame_left;
    - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) -
    - video->frame_right;
    + det->hbackporch = htotal - video->frame_right;
    det->hsync = sync & VE_SYNC_STATUS_HSYNC;
    if (video->frame_left > video->frame_right)
    continue;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 15:11    [W:2.627 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site