lkml.org 
[lkml]   [2023]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 15/29] drm/rockchip: inno_hdmi: Switch to infoframe type
    Date
    From: Maxime Ripard <mripard@kernel.org>

    The inno_hdmi driver relies on its own internal infoframe type matching
    the hardware.

    This works fine, but in order to make further reworks easier, let's
    switch to the HDMI spec definition of those types.

    Signed-off-by: Maxime Ripard <mripard@kernel.org>
    Tested-by: Alex Bee <knaerzche@gmail.com>
    Signed-off-by: Alex Bee <knaerzche@gmail.com>
    ---
    changes in v2:
    - imported patch

    changes in v3:
    - added my SoB

    drivers/gpu/drm/rockchip/inno_hdmi.c | 21 +++++++++++----------
    1 file changed, 11 insertions(+), 10 deletions(-)

    diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
    index 10466c2aa520..49367ca24125 100644
    --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
    +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
    @@ -205,33 +205,34 @@ static void inno_hdmi_reset(struct inno_hdmi *hdmi)
    inno_hdmi_set_pwr_mode(hdmi, NORMAL);
    }

    -static void inno_hdmi_disable_frame(struct inno_hdmi *hdmi, u32 frame_index)
    +static void inno_hdmi_disable_frame(struct inno_hdmi *hdmi,
    + enum hdmi_infoframe_type type)
    {
    struct drm_connector *connector = &hdmi->connector;

    - if (frame_index != INFOFRAME_AVI) {
    + if (type != HDMI_INFOFRAME_TYPE_AVI) {
    drm_err(connector->dev,
    - "Unsupported infoframe type: %u\n", frame_index);
    + "Unsupported infoframe type: %u\n", type);
    return;
    }

    - hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_BUF_INDEX, frame_index);
    + hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_BUF_INDEX, INFOFRAME_AVI);
    }

    static int inno_hdmi_upload_frame(struct inno_hdmi *hdmi,
    - union hdmi_infoframe *frame, u32 frame_index)
    + union hdmi_infoframe *frame, enum hdmi_infoframe_type type)
    {
    struct drm_connector *connector = &hdmi->connector;
    u8 packed_frame[HDMI_MAXIMUM_INFO_FRAME_SIZE];
    ssize_t rc, i;

    - if (frame_index != INFOFRAME_AVI) {
    + if (type != HDMI_INFOFRAME_TYPE_AVI) {
    drm_err(connector->dev,
    - "Unsupported infoframe type: %u\n", frame_index);
    + "Unsupported infoframe type: %u\n", type);
    return 0;
    }

    - inno_hdmi_disable_frame(hdmi, frame_index);
    + inno_hdmi_disable_frame(hdmi, type);

    rc = hdmi_infoframe_pack(frame, packed_frame,
    sizeof(packed_frame));
    @@ -255,7 +256,7 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi,
    &hdmi->connector,
    mode);
    if (rc) {
    - inno_hdmi_disable_frame(hdmi, INFOFRAME_AVI);
    + inno_hdmi_disable_frame(hdmi, HDMI_INFOFRAME_TYPE_AVI);
    return rc;
    }

    @@ -266,7 +267,7 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi,
    else
    frame.avi.colorspace = HDMI_COLORSPACE_RGB;

    - return inno_hdmi_upload_frame(hdmi, &frame, INFOFRAME_AVI);
    + return inno_hdmi_upload_frame(hdmi, &frame, HDMI_INFOFRAME_TYPE_AVI);
    }

    static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
    --
    2.43.0

    \
     
     \ /
      Last update: 2023-12-19 18:05    [W:3.482 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site