evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/msm/hdmi: disable HDR state on bridge disable

Browse source 
HDR info frames were not disabled after a hotplug and app closure
or in the event of an unexpected termination of the userspace driver.
Fixed the issue by resetting to HDR_DISABLE state in hdmi bridge disable.

Change-Id: Iead5cfe11512a8c49b6a2183561de427ce16f393
Signed-off-by: Navid Bahrani <nbahrani@codeaurora.org>
This commit is contained in:
Navid Bahrani 2018-11-27 18:02:39 -08:00 • committed by Gerrit - the friendly Code Review server
parent 7daef91bee
commit ff7940216e
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c
View file

@ -663,7 +663,9 @@ static void _sde_hdmi_bridge_enable(struct drm_bridge *bridge)
static void _sde_hdmi_bridge_disable(struct drm_bridge *bridge) static void _sde_hdmi_bridge_disable(struct drm_bridge *bridge)
{ {
struct sde_hdmi_bridge *sde_hdmi_bridge = to_hdmi_bridge(bridge); struct sde_hdmi_bridge *sde_hdmi_bridge = to_hdmi_bridge(bridge);
struct hdmi *hdmi = sde_hdmi_bridge->hdmi;
struct sde_hdmi *display = sde_hdmi_bridge->display; struct sde_hdmi *display = sde_hdmi_bridge->display;
struct sde_connector_state *c_state;
mutex_lock(&display->display_lock); mutex_lock(&display->display_lock);
@ -673,6 +675,17 @@ static void _sde_hdmi_bridge_disable(struct drm_bridge *bridge)
return; return;
} }
hdmi->connector->hdr_eotf = 0;
hdmi->connector->hdr_metadata_type_one = 0;
hdmi->connector->hdr_max_luminance = 0;
hdmi->connector->hdr_avg_luminance = 0;
hdmi->connector->hdr_min_luminance = 0;
c_state = to_sde_connector_state(hdmi->connector->state);
memset(&c_state->hdr_ctrl.hdr_meta,
0, sizeof(c_state->hdr_ctrl.hdr_meta));
c_state->hdr_ctrl.hdr_state = HDR_DISABLE;
display->pll_update_enable = false; display->pll_update_enable = false;
display->sink_hdcp_ver = SDE_HDMI_HDCP_NONE; display->sink_hdcp_ver = SDE_HDMI_HDCP_NONE;
display->sink_hdcp22_support = false; display->sink_hdcp22_support = false;