• Chen-Yu Tsai's avatar
    media: mediatek: vcodec: Make encoder capability fields fit requirements · a6221d42
    Chen-Yu Tsai authored
    This partially reverts commit fd9f8050,
    and changes things so that the capability string fields of the encoder
    conform to their requirements.
    
    The driver name field should contain the actual driver name, not some
    otherwise unused string macro from the driver. To make this clear,
    copy the name from the driver's name field.
    
    The card name for the video encoder previously held a static platform
    name that was fixed to match MT8173. This obviously doesn't make sense
    for newer chips. Since commit fd9f8050 ("media: mediatek: vcodec:
    Change encoder v4l2 capability value"), this field was changed to hold
    the driver's name, or "mtk-vcodec-dec". This doesn't make much sense
    either, since this still doesn't reflect what chip this is.
    
    Instead, fill in the card name with "MTxxxx video encoder" with the
    proper chip number.
    
    Since commit f2d8b691 ("media: v4l: ioctl: Set bus_info in
    v4l_querycap()"), the V4L2 core provides a default value for the
    bus_info field for platform and PCI devices. This value will match
    the default value for media devices added by commit cef69974
    ("media: mc: Set bus_info in media_device_init()"). These defaults
    are stable and device-specific.
    
    Drop the custom capability bus_info from the mtk-vcodec encoder
    driver, and use the defaults.
    
    As this patch removes the last usage of MTK_VCODEC_DRV_NAME, remove
    the macro as well.
    
    Fixes: fd9f8050 ("media: mediatek: vcodec: Change encoder v4l2 capability value")
    Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
    Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
    a6221d42
mtk_vcodec_enc.c 42 KB