samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: update VDC-m hardware version in display driver"

Browse Source
This commit is contained in:
qctecmdr
2020-05-04 23:32:46 -07:00
committed by Gerrit - the friendly Code Review server
parent 20d23de207 b55251f17f
commit a2a04712a9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/dsi/dsi_panel.c
View File

@@ -2469,7 +2469,7 @@ static int dsi_panel_parse_vdc_params(struct dsi_display_mode *mode,
rc = utils->read_u32(utils->data, "qcom,vdc-version", &data); rc = utils->read_u32(utils->data, "qcom,vdc-version", &data);
if (rc) { if (rc) {
priv_info->vdc.version_major = 0x1; priv_info->vdc.version_major = 0x1;
priv_info->vdc.version_minor = 0x1; priv_info->vdc.version_minor = 0x2;
priv_info->vdc.version_release = 0x0; priv_info->vdc.version_release = 0x0;
rc = 0; rc = 0;
} else { } else {
@@ -2480,7 +2480,7 @@ static int dsi_panel_parse_vdc_params(struct dsi_display_mode *mode,
priv_info->vdc.version_minor = data & 0x0F; priv_info->vdc.version_minor = data & 0x0F;
if ((priv_info->vdc.version_major != 0x1) && if ((priv_info->vdc.version_major != 0x1) &&
((priv_info->vdc.version_minor ((priv_info->vdc.version_minor
!= 0x1))) { != 0x2))) {
DSI_ERR("%s:unsupported major:%d minor:%d version\n", DSI_ERR("%s:unsupported major:%d minor:%d version\n",
__func__, __func__,
priv_info->vdc.version_major, priv_info->vdc.version_major,

8
msm/sde/sde_hw_catalog.c
View File

@@ -3003,10 +3003,10 @@ static int sde_vdc_parse_dt(struct device_node *np,
rc = of_property_read_string(np, vdc_prop[VDC_REV].prop_name, &rev); rc = of_property_read_string(np, vdc_prop[VDC_REV].prop_name, &rev);
if ((rc == -EINVAL) || (rc == -ENODATA)) { if ((rc == -EINVAL) || (rc == -ENODATA)) {
vdc_rev = SDE_VDC_HW_REV_1_1; vdc_rev = SDE_VDC_HW_REV_1_2;
rc = 0; rc = 0;
} else if (!rc && !strcmp(rev, "vdc_1_1")) { } else if (!rc && !strcmp(rev, "vdc_1_2")) {
vdc_rev = SDE_VDC_HW_REV_1_1; vdc_rev = SDE_VDC_HW_REV_1_2;
rc = 0; rc = 0;
} else { } else {
SDE_ERROR("invalid vdc configuration\n"); SDE_ERROR("invalid vdc configuration\n");
@@ -3045,7 +3045,7 @@ static int sde_vdc_parse_dt(struct device_node *np,
VDC_CTL, i); VDC_CTL, i);
sblk->ctl.len = PROP_VALUE_ACCESS(prop_value, sblk->ctl.len = PROP_VALUE_ACCESS(prop_value,
VDC_CTL_LEN, 0); VDC_CTL_LEN, 0);
set_bit(SDE_VDC_HW_REV_1_1, &vdc->features); set_bit(vdc_rev, &vdc->features);
} }
end: end:

4
msm/sde/sde_hw_catalog.h
View File

@@ -422,13 +422,13 @@ enum {
}; };
/** VDC sub-blocks/features /** VDC sub-blocks/features
* @SDE_VDC_HW_REV_1_1 vdc block supports vdc 1.1 only * @SDE_VDC_HW_REV_1_2 vdc block supports vdc 1.2 only
* @SDE_VDC_ENC vdc encoder sub block * @SDE_VDC_ENC vdc encoder sub block
* @SDE_VDC_CTL vdc ctl sub block * @SDE_VDC_CTL vdc ctl sub block
* @SDE_VDC_MAX * @SDE_VDC_MAX
*/ */
enum { enum {
SDE_VDC_HW_REV_1_1, SDE_VDC_HW_REV_1_2,
SDE_VDC_ENC, SDE_VDC_ENC,
SDE_VDC_CTL, SDE_VDC_CTL,
SDE_VDC_MAX SDE_VDC_MAX