diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-28 00:46:46 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-28 00:46:45 -0800 |
| commit | 36531e80afeabaccb7ad67bf46371dd632c74d46 (patch) | |
| tree | 03ce8240e6f7db80103d1d93bbfd9362c44cc2ab /drivers/video/fbdev | |
| parent | 46b116edc8854af481be5045f0d7aeab798eb5a2 (diff) | |
| parent | 66c98918d1938d36f66d70732ff04e6dab0553f7 (diff) | |
Merge "msm: mdss: fix secure session validation"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_layer.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_layer.c b/drivers/video/fbdev/msm/mdss_mdp_layer.c index 5a7f8e7e95b4..af763cf6b306 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_layer.c +++ b/drivers/video/fbdev/msm/mdss_mdp_layer.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1674,7 +1674,12 @@ static int __validate_secure_session(struct mdss_overlay_private *mdp5_data) pr_debug("pipe count:: secure display:%d non-secure:%d secure-vid:%d,secure-cam:%d\n", sd_pipes, nonsd_pipes, secure_vid_pipes, secure_cam_pipes); - if ((sd_pipes || mdss_get_sd_client_cnt()) && + if (mdss_get_sd_client_cnt() && !mdp5_data->sd_enabled) { + pr_err("Secure session already enabled for other client\n"); + return -EINVAL; + } + + if ((sd_pipes) && (nonsd_pipes || secure_vid_pipes || secure_cam_pipes)) { pr_err("non-secure layer validation request during secure display session\n"); |