drm/msm: add checksum for HDR infoframe

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / gpu / drm / msm / hdmi-staging / sde_hdmi.c

diff --git a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c
index 302ed39..8177091 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c
@@ -2009,6 +2009,7 @@ struct drm_msm_ext_panel_hdr_metadata *hdr_meta)
        u32 const version = 0x01;
        u32 const length = 0x1a;
        u32 const descriptor_id = 0x00;
+       u8 checksum;
        struct hdmi *hdmi;
        struct drm_connector *connector;
 
@@ -2029,7 +2030,19 @@ struct drm_msm_ext_panel_hdr_metadata *hdr_meta)
        packet_header = type_code | (version << 8) | (length << 16);
        hdmi_write(hdmi, HDMI_GENERIC0_HDR, packet_header);
 
-       packet_payload = (hdr_meta->eotf << 8);
+       /**
+        * Checksum is not a mandatory field for
+        * the HDR infoframe as per CEA-861-3 specification.
+        * However some HDMI sinks still expect a
+        * valid checksum to be included as part of
+        * the infoframe. Hence compute and add
+        * the checksum to improve sink interoperability
+        * for our HDR solution on HDMI.
+        */
+       checksum = sde_hdmi_hdr_set_chksum(hdr_meta);
+
+       packet_payload = (hdr_meta->eotf << 8) | checksum;
+
        if (connector->hdr_metadata_type_one) {
                packet_payload |= (descriptor_id << 16)
                        | (HDMI_GET_LSB(hdr_meta->display_primaries_x[0])
@@ -2754,6 +2767,13 @@ enum drm_mode_status sde_hdmi_mode_valid(struct drm_connector *connector,
        if (actual != requested)
                return MODE_CLOCK_RANGE;
 
+       /* if no format flags are present remove the mode */
+       if (!(mode->flags & SDE_DRM_MODE_FLAG_FMT_MASK)) {
+               SDE_HDMI_DEBUG("removing following mode from list\n");
+               drm_mode_debug_printmodeline(mode);
+               return MODE_BAD;
+       }
+
        return MODE_OK;
 }
 
@@ -3038,6 +3058,8 @@ static int _sde_hdmi_parse_dt_modes(struct device_node *np,
                        flags |= DRM_MODE_FLAG_PVSYNC;
                else
                        flags |= DRM_MODE_FLAG_NVSYNC;
+
+               flags |= DRM_MODE_FLAG_SUPPORTS_RGB;
                mode->flags = flags;
 
                if (!rc) {
@@ -3069,8 +3091,6 @@ static int _sde_hdmi_parse_dt(struct device_node *node,
 {
        int rc = 0;
 
-       struct hdmi *hdmi = display->ctrl.ctrl;
-
        display->name = of_get_property(node, "label", NULL);
 
        display->display_type = of_get_property(node,
@@ -3083,8 +3103,6 @@ static int _sde_hdmi_parse_dt(struct device_node *node,
 
        display->skip_ddc = of_property_read_bool(node,
                                                "qcom,skip_ddc");
-       if (!display->non_pluggable)
-               hdmi_i2c_destroy(hdmi->i2c);
 
        rc = _sde_hdmi_parse_dt_modes(node, &display->mode_list,
                                        &display->num_of_modes);