A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

disp: msm: replace usage of drm_connector with sde_connector for hdr10

Browse source 
Since the HDR static metadata block parsing has been moved to
the sde edid parser, replace the usage of drm_connector with
sde_connector for hdr10 so that the modifications to drm_connector
can be removed.

Change-Id: I4526cda426c46708d3689eb8b993b7a4f50d32ae
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
This commit is contained in:
Abhinav Kumar 2020-02-06 18:48:31 -08:00 • committed by Gerrit - the friendly Code Review server
commit f1959d903b
3 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
msm/dp/dp_debug.c
View file

@ -1372,12 +1372,12 @@ static int dp_debug_print_hdr_params_to_buf(struct drm_connector *connector,
goto error;
rc = snprintf(buf + len, max_size, "eotf = %d\n",
connector->hdr_eotf);
c_conn->hdr_eotf);
if (dp_debug_check_buffer_overflow(rc, &max_size, &len))
goto error;
rc = snprintf(buf + len, max_size, "type_one = %d\n",
connector->hdr_metadata_type_one);
c_conn->hdr_metadata_type_one);
if (dp_debug_check_buffer_overflow(rc, &max_size, &len))
goto error;
@ -1387,17 +1387,17 @@ static int dp_debug_print_hdr_params_to_buf(struct drm_connector *connector,
goto error;
rc = snprintf(buf + len, max_size, "max_luminance = %d\n",
connector->hdr_max_luminance);
c_conn->hdr_max_luminance);
if (dp_debug_check_buffer_overflow(rc, &max_size, &len))
goto error;
rc = snprintf(buf + len, max_size, "avg_luminance = %d\n",
connector->hdr_avg_luminance);
c_conn->hdr_avg_luminance);
if (dp_debug_check_buffer_overflow(rc, &max_size, &len))
goto error;
rc = snprintf(buf + len, max_size, "min_luminance = %d\n",
connector->hdr_min_luminance);
c_conn->hdr_min_luminance);
if (dp_debug_check_buffer_overflow(rc, &max_size, &len))
goto error;

12
msm/dp/dp_panel.c
View file

@ -2313,12 +2313,12 @@ static int dp_panel_deinit_panel_info(struct dp_panel *dp_panel, u32 flags)
sde_conn = to_sde_connector(connector);
c_state = to_sde_connector_state(connector->state);
connector->hdr_eotf = 0;
connector->hdr_metadata_type_one = 0;
connector->hdr_max_luminance = 0;
connector->hdr_avg_luminance = 0;
connector->hdr_min_luminance = 0;
connector->hdr_supported = false;
sde_conn->hdr_eotf = 0;
sde_conn->hdr_metadata_type_one = 0;
sde_conn->hdr_max_luminance = 0;
sde_conn->hdr_avg_luminance = 0;
sde_conn->hdr_min_luminance = 0;
sde_conn->hdr_supported = false;
sde_conn->hdr_plus_app_ver = 0;
sde_conn->colorspace_updated = false;

17
msm/sde/sde_connector.c
View file

@ -1184,7 +1184,6 @@ static int _sde_connector_set_ext_hdr_info(
void __user *usr_ptr)
{
int rc = 0;
struct drm_connector *connector;
struct drm_msm_ext_hdr_metadata *hdr_meta;
size_t payload_size = 0;
u8 *payload = NULL;
@ -1196,9 +1195,7 @@ static int _sde_connector_set_ext_hdr_info(
goto end;
}
connector = &c_conn->base;
if (!connector->hdr_supported) {
if (!c_conn->hdr_supported) {
SDE_ERROR_CONN(c_conn, "sink doesn't support HDR\n");
rc = -ENOTSUPP;
goto end;
@ -1515,12 +1512,12 @@ static void sde_connector_update_hdr_props(struct drm_connector *connector)
struct sde_connector *c_conn = to_sde_connector(connector);
struct drm_msm_ext_hdr_properties hdr = {0};
hdr.hdr_metadata_type_one = connector->hdr_metadata_type_one ? 1 : 0;
hdr.hdr_supported = connector->hdr_supported ? 1 : 0;
hdr.hdr_eotf = connector->hdr_eotf;
hdr.hdr_max_luminance = connector->hdr_max_luminance;
hdr.hdr_avg_luminance = connector->hdr_avg_luminance;
hdr.hdr_min_luminance = connector->hdr_min_luminance;
hdr.hdr_metadata_type_one = c_conn->hdr_metadata_type_one ? 1 : 0;
hdr.hdr_supported = c_conn->hdr_supported ? 1 : 0;
hdr.hdr_eotf = c_conn->hdr_eotf;
hdr.hdr_max_luminance = c_conn->hdr_max_luminance;
hdr.hdr_avg_luminance = c_conn->hdr_avg_luminance;
hdr.hdr_min_luminance = c_conn->hdr_min_luminance;
hdr.hdr_plus_supported = c_conn->hdr_plus_app_ver;
msm_property_set_blob(&c_conn->property_info, &c_conn->blob_ext_hdr,