From ccb6ded3b91fe737f199ae724a400b706fa5fe85 Mon Sep 17 00:00:00 2001 From: Abhijit Kulkarni Date: Wed, 3 Jun 2020 16:02:35 -0700 Subject: [PATCH] disp: msm: sde: fix hdr meta data property handling Allow clients to reset the hdr meta data property even when connector does not support hdr. This is required for shell stop case cleanup when dp connector might be in disconnected state. Change-Id: Ie0db61530216f1fab6c952933425259d32cfc834 Signed-off-by: Abhijit Kulkarni --- msm/sde/sde_connector.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c index d06356b344..02cacc9374 100644 --- a/msm/sde/sde_connector.c +++ b/msm/sde/sde_connector.c @@ -1238,12 +1238,6 @@ static int _sde_connector_set_ext_hdr_info( goto end; } - if (!c_conn->hdr_supported) { - SDE_ERROR_CONN(c_conn, "sink doesn't support HDR\n"); - rc = -ENOTSUPP; - goto end; - } - memset(&c_state->hdr_meta, 0, sizeof(c_state->hdr_meta)); if (!usr_ptr) { @@ -1251,6 +1245,12 @@ static int _sde_connector_set_ext_hdr_info( goto end; } + if (!c_conn->hdr_supported) { + SDE_ERROR_CONN(c_conn, "sink doesn't support HDR\n"); + rc = -ENOTSUPP; + goto end; + } + if (copy_from_user(&c_state->hdr_meta, (void __user *)usr_ptr, sizeof(*hdr_meta))) {