diff options
| author | Fancy Fang <chen.fang@nxp.com> | 2017-03-11 15:48:27 +0800 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-09 22:19:53 +0800 |
| commit | 881936838d7c4ee82af09f63b2c133639861dd07 (patch) | |
| tree | 5714adbfe378acf8d0fbcd552b4ff23007ea23f6 /drivers/video | |
| parent | 28d580765966002f5bd6d0d6d207d84a1f566dd2 (diff) | |
MLK-14314-1 dma: pxp: remove unused multiple overlay layers support
The multiple overlay layers are not used on pxp v2 and
v3 module, so remove this.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit c4fd8b36dbf9b53079d88d55ccfedde3a444ec29)
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/mxc/mxc_epdc_fb.c | 21 | ||||
| -rw-r--r-- | drivers/video/fbdev/mxc/mxc_epdc_v2_fb.c | 21 |
2 files changed, 20 insertions, 22 deletions
diff --git a/drivers/video/fbdev/mxc/mxc_epdc_fb.c b/drivers/video/fbdev/mxc/mxc_epdc_fb.c index 1497f728468e..276d5c1c41d3 100644 --- a/drivers/video/fbdev/mxc/mxc_epdc_fb.c +++ b/drivers/video/fbdev/mxc/mxc_epdc_fb.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2010-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -4979,17 +4980,15 @@ int mxc_epdc_fb_probe(struct platform_device *pdev) * Initialize OL0 channel parameters * No overlay will be used for PxP operation */ - for (i = 0; i < 8; i++) { - pxp_conf->ol_param[i].combine_enable = false; - pxp_conf->ol_param[i].width = 0; - pxp_conf->ol_param[i].height = 0; - pxp_conf->ol_param[i].pixel_fmt = PXP_PIX_FMT_RGB565; - pxp_conf->ol_param[i].color_key_enable = false; - pxp_conf->ol_param[i].color_key = -1; - pxp_conf->ol_param[i].global_alpha_enable = false; - pxp_conf->ol_param[i].global_alpha = 0; - pxp_conf->ol_param[i].local_alpha_enable = false; - } + pxp_conf->ol_param[0].combine_enable = false; + pxp_conf->ol_param[0].width = 0; + pxp_conf->ol_param[0].height = 0; + pxp_conf->ol_param[0].pixel_fmt = PXP_PIX_FMT_RGB565; + pxp_conf->ol_param[0].color_key_enable = false; + pxp_conf->ol_param[0].color_key = -1; + pxp_conf->ol_param[0].global_alpha_enable = false; + pxp_conf->ol_param[0].global_alpha = 0; + pxp_conf->ol_param[0].local_alpha_enable = false; /* * Initialize Output channel parameters diff --git a/drivers/video/fbdev/mxc/mxc_epdc_v2_fb.c b/drivers/video/fbdev/mxc/mxc_epdc_v2_fb.c index 36ae60402a14..5be94ddee806 100644 --- a/drivers/video/fbdev/mxc/mxc_epdc_v2_fb.c +++ b/drivers/video/fbdev/mxc/mxc_epdc_v2_fb.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -5510,17 +5511,15 @@ static int mxc_epdc_fb_probe(struct platform_device *pdev) * Initialize OL0 channel parameters * No overlay will be used for PxP operation */ - for (i = 0; i < 8; i++) { - pxp_conf->ol_param[i].combine_enable = false; - pxp_conf->ol_param[i].width = 0; - pxp_conf->ol_param[i].height = 0; - pxp_conf->ol_param[i].pixel_fmt = PXP_PIX_FMT_RGB565; - pxp_conf->ol_param[i].color_key_enable = false; - pxp_conf->ol_param[i].color_key = -1; - pxp_conf->ol_param[i].global_alpha_enable = false; - pxp_conf->ol_param[i].global_alpha = 0; - pxp_conf->ol_param[i].local_alpha_enable = false; - } + pxp_conf->ol_param[0].combine_enable = false; + pxp_conf->ol_param[0].width = 0; + pxp_conf->ol_param[0].height = 0; + pxp_conf->ol_param[0].pixel_fmt = PXP_PIX_FMT_RGB565; + pxp_conf->ol_param[0].color_key_enable = false; + pxp_conf->ol_param[0].color_key = -1; + pxp_conf->ol_param[0].global_alpha_enable = false; + pxp_conf->ol_param[0].global_alpha = 0; + pxp_conf->ol_param[0].local_alpha_enable = false; /* * Initialize Output channel parameters |