Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver updates from Greg KH:
 "Here's the big staging tree pull request for 3.19-rc1.

  We continued to delete more lines than were added, always a good
  thing, but not at a huge rate this release, only about 70k lines
  removed overall mostly from removing the horrid bcm driver.

  Lots of normal staging driver cleanups and fixes all over the place,
  well over a thousand of them, the shortlog shows all the horrid
  details.

  The "contentious" thing here is the movement of the Android binder
  code out of staging into the "real" part of the kernel.  This is code
  that has been stable for a few years now and is working as-is in the
  tens of millions of devices with no issues.  Yes, the code is horrid,
  and the userspace api leaves a lot to be desired, but it's not going
  to change due to legacy issues that we have no control over.  Because
  so many devices and companies rely on this, and the code is stable,
  might as well promote it out of staging.

  This was all discussed at the Linux Plumbers conference, and everyone
  participating agreed that this was the best way forward.

  There is work happening to replace the binder code with something new
  that is happening right now, but I don't expect to see the results of
  that work for another year at the earliest.  If that ever happens, and
  Android switches over to it, I'll gladly remove this version.

  As for maintainers, I'll be glad to maintain this code, I've been
  doing it for the past few years with no problems.  I'll send a
  MAINTAINERS entry for it before 3.19-final is out, still need to talk
  to the Google developers about if they are willing to help with it or
  not, last I checked they were, which was good.

  All of these patches have been in linux-next for a while with no
  reported issues"

* tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1382 commits)
  Staging: slicoss: Fix long line issues in slicoss.c
  staging: rtl8712: remove unnecessary else after return
  staging: comedi: change some printk calls to pr_err
  staging: rtl8723au: hal: Removed the extra semicolon
  lustre: Deletion of unnecessary checks before three function calls
  staging: lustre: fix sparse warnings: static function declaration
  staging: lustre: fixed sparse warnings related to static declarations
  staging: unisys: remove duplicate header
  staging: unisys: remove unneeded structure
  staging: ft1000 : replace __attribute ((__packed__) with __packed
  drivers: staging: rtl8192e: Include "asm/unaligned.h" instead of "access_ok.h" in "rtl819x_BAProc.c"
  Drivers:staging:rtl8192e: Fixed checkpatch warning
  Drivers:staging:clocking-wizard: Added a newline
  staging: clocking-wizard: check for a valid clk_name pointer
  staging: rtl8723au: Hal_InitPGData() avoid unnecessary typecasts
  staging: rtl8723au: _DisableAnalog(): Avoid zero-init variables unnecessarily
  staging: rtl8723au: Remove unnecessary wrapper _ResetDigitalProcedure1()
  staging: rtl8723au: _ResetDigitalProcedure1_92C() reduce code obfuscation
  staging: rtl8723au: Remove unnecessary wrapper _DisableRFAFEAndResetBB()
  staging: rtl8723au: _DisableRFAFEAndResetBB8192C(): Reduce code obfuscation
  ...

8 files changed, 55 insertions, 33 deletions

diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig
index 82fb758a29bc..ab31848e92cf 100644
--- a/drivers/gpu/drm/imx/Kconfig
+++ b/drivers/gpu/drm/imx/Kconfig
@@ -6,6 +6,7 @@ config DRM_IMX
         select DRM_GEM_CMA_HELPER
         select DRM_KMS_CMA_HELPER
         depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM)
+        depends on IMX_IPUV3_CORE
         help
           enable i.MX graphics support
 
@@ -40,11 +41,11 @@ config DRM_IMX_LDB
           found on i.MX53 and i.MX6 processors.
 
 config DRM_IMX_IPUV3
-        tristate "DRM Support for i.MX IPUv3"
+        tristate
         depends on DRM_IMX
         depends on IMX_IPUV3_CORE
-        help
-          Choose this if you have a i.MX5 or i.MX6 processor.
+        default y if DRM_IMX=y
+        default m if DRM_IMX=m
 
 config DRM_IMX_HDMI
         tristate "Freescale i.MX DRM HDMI"
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index e48b2211d2d6..b250130debc8 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -30,8 +30,6 @@
 
 #define MAX_CRTC        4
 
-struct imx_drm_crtc;
-
 struct imx_drm_component {
         struct device_node *of_node;
         struct list_head list;
@@ -633,7 +631,8 @@ static int imx_drm_platform_probe(struct platform_device *pdev)
                                 continue;
                         }
 
-                        component_match_add(&pdev->dev, &match, compare_of, remote);
+                        component_match_add(&pdev->dev, &match, compare_of,
+                                            remote);
                         of_node_put(remote);
                 }
                 of_node_put(port);
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 2638dc1671d0..c60460043e24 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -11,11 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index 64b54d7f996c..a729f4f7074c 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -11,11 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
  */
 
 #include <linux/clk.h>
@@ -665,7 +660,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
 
         ret = regmap_read(tve->regmap, TVE_COM_CONF_REG, &val);
         if (ret < 0) {
-                dev_err(dev, "failed to read configuration register: %d\n", ret);
+                dev_err(dev, "failed to read configuration register: %d\n",
+                        ret);
                 return ret;
         }
         if (val != 0x00100000) {
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index 11e84a251773..ebee59cb96d8 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -11,11 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
  */
 #include <linux/component.h>
 #include <linux/module.h>
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 944962b692bb..6987e16fe99b 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -64,6 +64,7 @@ int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb,
 {
         struct drm_gem_cma_object *cma_obj;
         unsigned long eba;
+        int active;
 
         cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
         if (!cma_obj) {
@@ -74,12 +75,17 @@ int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb,
         dev_dbg(ipu_plane->base.dev->dev, "phys = %pad, x = %d, y = %d",
                 &cma_obj->paddr, x, y);
 
-        ipu_cpmem_set_stride(ipu_plane->ipu_ch, fb->pitches[0]);
-
         eba = cma_obj->paddr + fb->offsets[0] +
               fb->pitches[0] * y + (fb->bits_per_pixel >> 3) * x;
-        ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 0, eba);
-        ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
+
+        if (ipu_plane->enabled) {
+                active = ipu_idmac_get_current_buffer(ipu_plane->ipu_ch);
+                ipu_cpmem_set_buffer(ipu_plane->ipu_ch, !active, eba);
+                ipu_idmac_select_buffer(ipu_plane->ipu_ch, !active);
+        } else {
+                ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 0, eba);
+                ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
+        }
 
         /* cache offsets for subsequent pageflips */
         ipu_plane->x = x;
@@ -137,6 +143,18 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
         if (crtc_h < 2)
                 return -EINVAL;
 
+        /*
+         * since we cannot touch active IDMAC channels, we do not support
+         * resizing the enabled plane or changing its format
+         */
+        if (ipu_plane->enabled) {
+                if (src_w != ipu_plane->w || src_h != ipu_plane->h ||
+                    fb->pixel_format != ipu_plane->base.fb->pixel_format)
+                        return -EINVAL;
+
+                return ipu_plane_set_base(ipu_plane, fb, src_x, src_y);
+        }
+
         switch (ipu_plane->dp_flow) {
         case IPU_DP_FLOW_SYNC_BG:
                 ret = ipu_dp_setup_channel(ipu_plane->dp,
@@ -148,14 +166,22 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
                                 ret);
                         return ret;
                 }
-                ipu_dp_set_global_alpha(ipu_plane->dp, 1, 0, 1);
+                ipu_dp_set_global_alpha(ipu_plane->dp, true, 0, true);
                 break;
         case IPU_DP_FLOW_SYNC_FG:
                 ipu_dp_setup_channel(ipu_plane->dp,
                                 ipu_drm_fourcc_to_colorspace(fb->pixel_format),
                                 IPUV3_COLORSPACE_UNKNOWN);
                 ipu_dp_set_window_pos(ipu_plane->dp, crtc_x, crtc_y);
-                break;
+                /* Enable local alpha on partial plane */
+                switch (fb->pixel_format) {
+                case DRM_FORMAT_ARGB8888:
+                case DRM_FORMAT_ABGR8888:
+                        ipu_dp_set_global_alpha(ipu_plane->dp, false, 0, false);
+                        break;
+                default:
+                        break;
+                }
         }
 
         ret = ipu_dmfc_init_channel(ipu_plane->dmfc, crtc_w);
@@ -181,11 +207,16 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
                 return ret;
         }
         ipu_cpmem_set_high_priority(ipu_plane->ipu_ch);
+        ipu_idmac_set_double_buffer(ipu_plane->ipu_ch, 1);
+        ipu_cpmem_set_stride(ipu_plane->ipu_ch, fb->pitches[0]);
 
         ret = ipu_plane_set_base(ipu_plane, fb, src_x, src_y);
         if (ret < 0)
                 return ret;
 
+        ipu_plane->w = src_w;
+        ipu_plane->h = src_h;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/gpu/drm/imx/ipuv3-plane.h
index c0aae5bcb5d4..af125fb40ef5 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.h
+++ b/drivers/gpu/drm/imx/ipuv3-plane.h
@@ -26,6 +26,8 @@ struct ipu_plane {
 
         int                     x;
         int                     y;
+        int                     w;
+        int                     h;
 
         bool                    enabled;
 };
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 8a76a5c1c34b..796c3c1c170a 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -11,11 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
  */
 
 #include <linux/component.h>
@@ -128,6 +123,10 @@ static void imx_pd_encoder_prepare(struct drm_encoder *encoder)
 
 static void imx_pd_encoder_commit(struct drm_encoder *encoder)
 {
+        struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
+
+        drm_panel_prepare(imxpd->panel);
+        drm_panel_enable(imxpd->panel);
 }
 
 static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,
@@ -138,6 +137,10 @@ static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,
 
 static void imx_pd_encoder_disable(struct drm_encoder *encoder)
 {
+        struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
+
+        drm_panel_disable(imxpd->panel);
+        drm_panel_unprepare(imxpd->panel);
 }
 
 static struct drm_connector_funcs imx_pd_connector_funcs = {