From 514ee25d3ca526ba3fc710ec5a16057e1fd4f0eb Mon Sep 17 00:00:00 2001 From: Adrian Salido-Moreno Date: Mon, 18 May 2015 12:30:37 -0700 Subject: msm: mdss: rotator: ignore panel status for rotator fences In case of rotator buf sync ioctl, the ioctl could be called on frame buffer device for which panel is off. However rotator sessions may still be active. In such cases the call shouldn't fail, thus move check for panel off only when the target sync fence timeline is for the panel. Change-Id: Ice4557fcbe82df2761c65f67a0bf81a2d72fde75 CRs-Fixed: 837945 Signed-off-by: Adrian Salido-Moreno --- drivers/video/fbdev/msm/mdss_fb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 67e1ff65a2fc..2d5f3af80c52 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -3986,15 +3986,15 @@ int mdss_fb_do_ioctl(struct fb_info *info, unsigned int cmd, if (ret) goto exit; - if ((!mfd->op_enable) || (mdss_fb_is_power_off(mfd))) { - ret = -EPERM; - goto exit; - } - if (mfd->mdp.get_sync_fnc) sync_pt_data = mfd->mdp.get_sync_fnc(mfd, &buf_sync); - if (!sync_pt_data) + if (!sync_pt_data) { + if ((!mfd->op_enable) || (mdss_fb_is_power_off(mfd))) { + ret = -EPERM; + goto exit; + } sync_pt_data = &mfd->mdp_sync_pt_data; + } ret = mdss_fb_handle_buf_sync_ioctl(sync_pt_data, &buf_sync); -- cgit v1.2.3