summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVeera Sundaram Sankaran <veeras@codeaurora.org>2015-08-18 12:01:13 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:45:08 -0700
commitbb01a302000f618be0681e11d1e37793d8ec9f9e (patch)
treeeb397382bae6ceac12e7f6c4b1512cd1db943367 /drivers
parent5760ffaa492d5110e03612346a04a9b5bfc029aa (diff)
msm: mdss: allow get_metadata when the panel is in suspend mode
There are scenarios when HAL retrieves information through get_metadata when the panel is in suspend mode. Allow the get_metadata ioctl to go through, even when the panel is in suspend state. CRs-fixed: 873962 Change-Id: I8d8bd14134f73cb3628e016668e766b818b8d89e Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_overlay.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
index 92285f4550ed..cd4fc1f00d48 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
@@ -3792,10 +3792,9 @@ static int mdss_fb_get_metadata(struct msm_fb_data_type *mfd,
struct msmfb_metadata *metadata)
{
struct mdss_data_type *mdata = mfd_to_mdata(mfd);
- struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
+ struct mdss_mdp_ctl *ctl = NULL;
int ret = 0;
- if (!ctl)
- return -EPERM;
+
switch (metadata->op) {
case metadata_op_frame_rate:
metadata->data.panel_frame_rate =
@@ -3814,7 +3813,8 @@ static int mdss_fb_get_metadata(struct msm_fb_data_type *mfd,
}
break;
case metadata_op_crc:
- if (mdss_fb_is_power_off(mfd))
+ ctl = mfd_to_ctl(mfd);
+ if (!ctl || mdss_fb_is_power_off(mfd))
return -EPERM;
ret = mdss_misr_get(mdata, &metadata->data.misr_request, ctl);
break;