Merge "msm: mdss: advertize hdr support on msm8998"

diff --cc drivers/video/fbdev/msm/mdss.h
Simple merge

diff --cc drivers/video/fbdev/msm/mdss_mdp.c
index a382a37,741ef15..7ed4b54
--- 1/drivers/video/fbdev/msm/mdss_mdp.c
--- 2/drivers/video/fbdev/msm/mdss_mdp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp.c
@@@ -2104,48 -2051,7 +2104,49 @@@ static void mdss_mdp_hw_rev_caps_init(s
                set_bit(MDSS_CAPS_10_BIT_SUPPORTED, mdata->mdss_caps_map);
                set_bit(MDSS_CAPS_AVR_SUPPORTED, mdata->mdss_caps_map);
                set_bit(MDSS_CAPS_SEC_DETACH_SMMU, mdata->mdss_caps_map);
 +              break;
 +      case MDSS_MDP_HW_REV_320:
 +              mdata->max_target_zorder = 7; /* excluding base layer */
 +              mdata->max_cursor_size = 512;
 +              mdata->per_pipe_ib_factor.numer = 8;
 +              mdata->per_pipe_ib_factor.denom = 5;
 +              mdata->apply_post_scale_bytes = false;
 +              mdata->hflip_buffer_reused = false;
 +              mdata->min_prefill_lines = 25;
 +              mdata->has_ubwc = true;
 +              mdata->pixel_ram_size = 50 * 1024;
 +              mdata->rects_per_sspp[MDSS_MDP_PIPE_TYPE_DMA] = 2;
 +
 +              mem_protect_sd_ctrl_id = MEM_PROTECT_SD_CTRL_SWITCH;
 +              set_bit(MDSS_QOS_PER_PIPE_IB, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_REMAPPER, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_TS_PREFILL, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_OVERHEAD_FACTOR, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_CDP, mdata->mdss_qos_map); /* cdp supported */
 +              mdata->enable_cdp = false; /* disable cdp */
 +              set_bit(MDSS_QOS_OTLIM, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_PER_PIPE_LUT, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_SIMPLIFIED_PREFILL, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_TS_PREFILL, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_IB_NOCR, mdata->mdss_qos_map);
 +              set_bit(MDSS_QOS_WB2_WRITE_GATHER_EN, mdata->mdss_qos_map);
 +              set_bit(MDSS_CAPS_YUV_CONFIG, mdata->mdss_caps_map);
 +              set_bit(MDSS_CAPS_SCM_RESTORE_NOT_REQUIRED,
 +                      mdata->mdss_caps_map);
 +              set_bit(MDSS_CAPS_3D_MUX_UNDERRUN_RECOVERY_SUPPORTED,
 +                      mdata->mdss_caps_map);
 +              set_bit(MDSS_CAPS_QSEED3, mdata->mdss_caps_map);
 +              set_bit(MDSS_CAPS_MDP_VOTE_CLK_NOT_SUPPORTED,
 +                      mdata->mdss_caps_map);
 +              mdss_mdp_init_default_prefill_factors(mdata);
 +              mdss_set_quirk(mdata, MDSS_QUIRK_DSC_RIGHT_ONLY_PU);
 +              mdss_set_quirk(mdata, MDSS_QUIRK_DSC_2SLICE_PU_THRPUT);
 +              mdss_set_quirk(mdata, MDSS_QUIRK_MMSS_GDSC_COLLAPSE);
 +              mdss_set_quirk(mdata, MDSS_QUIRK_MDP_CLK_SET_RATE);
 +              mdata->has_wb_ubwc = true;
 +              set_bit(MDSS_CAPS_10_BIT_SUPPORTED, mdata->mdss_caps_map);
 +              set_bit(MDSS_CAPS_SEC_DETACH_SMMU, mdata->mdss_caps_map);
+               mdss_set_quirk(mdata, MDSS_QUIRK_HDR_SUPPORT_ENABLED);
                break;
        default:
                mdata->max_target_zorder = 4; /* excluding base layer */