]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2014 02:06:13 +0000 (18:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2014 02:06:13 +0000 (18:06 -0800)
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
  ...

54 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/exynos3250.dtsi
arch/arm/boot/dts/exynos4x12.dtsi
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/boot/dts/exynos5420.dtsi
drivers/Kconfig
drivers/Makefile
drivers/gpu/drm/imx/Kconfig
drivers/gpu/drm/imx/imx-drm-core.c
drivers/gpu/drm/imx/imx-ldb.c
drivers/gpu/drm/imx/imx-tve.c
drivers/gpu/drm/imx/ipuv3-crtc.c
drivers/gpu/drm/imx/ipuv3-plane.c
drivers/gpu/drm/imx/ipuv3-plane.h
drivers/gpu/drm/imx/parallel-display.c
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/iio/adc/rockchip_saradc.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/timed_gpio.c
drivers/staging/emxx_udc/emxx_udc.c
drivers/staging/iio/adc/lpc32xx_adc.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/staging/iio/adc/spear_adc.c
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
drivers/staging/lustre/lustre/libcfs/tracefile.c
drivers/staging/lustre/lustre/llite/dcache.c
drivers/staging/lustre/lustre/llite/dir.c
drivers/staging/lustre/lustre/llite/file.c
drivers/staging/lustre/lustre/llite/llite_internal.h
drivers/staging/lustre/lustre/llite/llite_lib.c
drivers/staging/lustre/lustre/llite/llite_mmap.c
drivers/staging/lustre/lustre/llite/lloop.c
drivers/staging/lustre/lustre/llite/namei.c
drivers/staging/lustre/lustre/llite/statahead.c
drivers/staging/lustre/lustre/llite/vvp_io.c
drivers/staging/lustre/lustre/llite/xattr.c
drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
drivers/staging/media/davinci_vpfe/dm365_isif.c
drivers/staging/media/davinci_vpfe/dm365_resizer.c
drivers/staging/media/lirc/lirc_imon.c
drivers/staging/media/lirc/lirc_sasem.c
drivers/staging/media/lirc/lirc_sir.c
drivers/staging/media/lirc/lirc_zilog.c
drivers/staging/media/omap4iss/iss.c
drivers/staging/media/omap4iss/iss_csi2.c
drivers/staging/octeon-usb/octeon-hcd.c
drivers/staging/octeon/ethernet.c
drivers/staging/ozwpan/ozhcd.c
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
drivers/staging/vt6656/main_usb.c
include/uapi/linux/Kbuild

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc drivers/Kconfig
Simple merge
index 628b512b625bf8a90665adead1fbaeec2a4717e8,60d19820a4d42e79697c409e39d3dd1cc70634fc..67d2334dc41ecd571f9eb0dfd907cc87104912a9
@@@ -161,4 -161,4 +161,5 @@@ obj-$(CONFIG_POWERCAP)             += powercap
  obj-$(CONFIG_MCB)             += mcb/
  obj-$(CONFIG_RAS)             += ras/
  obj-$(CONFIG_THUNDERBOLT)     += thunderbolt/
 +obj-$(CONFIG_CORESIGHT)               += coresight/
+ obj-$(CONFIG_ANDROID)         += android/
index 82fb758a29bce2e84be2e52265b3adcddfc3310a,0000000000000000000000000000000000000000..ab31848e92cf0780ce0d9416ec3c10b8d86d28b6
mode 100644,000000..100644
--- /dev/null
@@@ -1,53 -1,0 +1,54 @@@
-       tristate "DRM Support for i.MX IPUv3"
 +config DRM_IMX
 +      tristate "DRM Support for Freescale i.MX"
 +      select DRM_KMS_HELPER
 +      select DRM_KMS_FB_HELPER
 +      select VIDEOMODE_HELPERS
 +      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
 +
 +config DRM_IMX_FB_HELPER
 +      tristate "provide legacy framebuffer /dev/fb0"
 +      select DRM_KMS_CMA_HELPER
 +      depends on DRM_IMX
 +      help
 +        The DRM framework can provide a legacy /dev/fb0 framebuffer
 +        for your device. This is necessary to get a framebuffer console
 +        and also for applications using the legacy framebuffer API
 +
 +config DRM_IMX_PARALLEL_DISPLAY
 +      tristate "Support for parallel displays"
 +      select DRM_PANEL
 +      depends on DRM_IMX
 +      select VIDEOMODE_HELPERS
 +
 +config DRM_IMX_TVE
 +      tristate "Support for TV and VGA displays"
 +      depends on DRM_IMX
 +      select REGMAP_MMIO
 +      help
 +        Choose this to enable the internal Television Encoder (TVe)
 +        found on i.MX53 processors.
 +
 +config DRM_IMX_LDB
 +      tristate "Support for LVDS displays"
 +      depends on DRM_IMX && MFD_SYSCON
 +      help
 +        Choose this to enable the internal LVDS Display Bridge (LDB)
 +        found on i.MX53 and i.MX6 processors.
 +
 +config DRM_IMX_IPUV3
-       help
-         Choose this if you have a i.MX5 or i.MX6 processor.
++      tristate
 +      depends on DRM_IMX
 +      depends on IMX_IPUV3_CORE
++      default y if DRM_IMX=y
++      default m if DRM_IMX=m
 +
 +config DRM_IMX_HDMI
 +      tristate "Freescale i.MX DRM HDMI"
 +      depends on DRM_IMX
 +      help
 +        Choose this if you want to use HDMI on i.MX6.
index e48b2211d2d6852ad2a540834203576616262f41,0000000000000000000000000000000000000000..b250130debc87ebd138e8bac964cbadfba776b5d
mode 100644,000000..100644
--- /dev/null
@@@ -1,704 -1,0 +1,703 @@@
- struct imx_drm_crtc;
 +/*
 + * Freescale i.MX drm driver
 + *
 + * Copyright (C) 2011 Sascha Hauer, Pengutronix
 + *
 + * 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 the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + * This program is distributed in the hope that it will be useful,
 + * 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.
 + *
 + */
 +#include <linux/component.h>
 +#include <linux/device.h>
 +#include <linux/fb.h>
 +#include <linux/module.h>
 +#include <linux/of_graph.h>
 +#include <linux/platform_device.h>
 +#include <drm/drmP.h>
 +#include <drm/drm_fb_helper.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_gem_cma_helper.h>
 +#include <drm/drm_fb_cma_helper.h>
 +#include <drm/drm_plane_helper.h>
 +
 +#include "imx-drm.h"
 +
 +#define MAX_CRTC      4
 +
-                       component_match_add(&pdev->dev, &match, compare_of, remote);
 +struct imx_drm_component {
 +      struct device_node *of_node;
 +      struct list_head list;
 +};
 +
 +struct imx_drm_device {
 +      struct drm_device                       *drm;
 +      struct imx_drm_crtc                     *crtc[MAX_CRTC];
 +      int                                     pipes;
 +      struct drm_fbdev_cma                    *fbhelper;
 +};
 +
 +struct imx_drm_crtc {
 +      struct drm_crtc                         *crtc;
 +      int                                     pipe;
 +      struct imx_drm_crtc_helper_funcs        imx_drm_helper_funcs;
 +      struct device_node                      *port;
 +};
 +
 +static int legacyfb_depth = 16;
 +module_param(legacyfb_depth, int, 0444);
 +
 +int imx_drm_crtc_id(struct imx_drm_crtc *crtc)
 +{
 +      return crtc->pipe;
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_crtc_id);
 +
 +static void imx_drm_driver_lastclose(struct drm_device *drm)
 +{
 +#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)
 +      struct imx_drm_device *imxdrm = drm->dev_private;
 +
 +      if (imxdrm->fbhelper)
 +              drm_fbdev_cma_restore_mode(imxdrm->fbhelper);
 +#endif
 +}
 +
 +static int imx_drm_driver_unload(struct drm_device *drm)
 +{
 +#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)
 +      struct imx_drm_device *imxdrm = drm->dev_private;
 +#endif
 +
 +      drm_kms_helper_poll_fini(drm);
 +
 +#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)
 +      if (imxdrm->fbhelper)
 +              drm_fbdev_cma_fini(imxdrm->fbhelper);
 +#endif
 +
 +      component_unbind_all(drm->dev, drm);
 +
 +      drm_vblank_cleanup(drm);
 +      drm_mode_config_cleanup(drm);
 +
 +      platform_set_drvdata(drm->platformdev, NULL);
 +
 +      return 0;
 +}
 +
 +static struct imx_drm_crtc *imx_drm_find_crtc(struct drm_crtc *crtc)
 +{
 +      struct imx_drm_device *imxdrm = crtc->dev->dev_private;
 +      unsigned i;
 +
 +      for (i = 0; i < MAX_CRTC; i++)
 +              if (imxdrm->crtc[i] && imxdrm->crtc[i]->crtc == crtc)
 +                      return imxdrm->crtc[i];
 +
 +      return NULL;
 +}
 +
 +int imx_drm_panel_format_pins(struct drm_encoder *encoder,
 +              u32 interface_pix_fmt, int hsync_pin, int vsync_pin)
 +{
 +      struct imx_drm_crtc_helper_funcs *helper;
 +      struct imx_drm_crtc *imx_crtc;
 +
 +      imx_crtc = imx_drm_find_crtc(encoder->crtc);
 +      if (!imx_crtc)
 +              return -EINVAL;
 +
 +      helper = &imx_crtc->imx_drm_helper_funcs;
 +      if (helper->set_interface_pix_fmt)
 +              return helper->set_interface_pix_fmt(encoder->crtc,
 +                              encoder->encoder_type, interface_pix_fmt,
 +                              hsync_pin, vsync_pin);
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_panel_format_pins);
 +
 +int imx_drm_panel_format(struct drm_encoder *encoder, u32 interface_pix_fmt)
 +{
 +      return imx_drm_panel_format_pins(encoder, interface_pix_fmt, 2, 3);
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_panel_format);
 +
 +int imx_drm_crtc_vblank_get(struct imx_drm_crtc *imx_drm_crtc)
 +{
 +      return drm_vblank_get(imx_drm_crtc->crtc->dev, imx_drm_crtc->pipe);
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_crtc_vblank_get);
 +
 +void imx_drm_crtc_vblank_put(struct imx_drm_crtc *imx_drm_crtc)
 +{
 +      drm_vblank_put(imx_drm_crtc->crtc->dev, imx_drm_crtc->pipe);
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_crtc_vblank_put);
 +
 +void imx_drm_handle_vblank(struct imx_drm_crtc *imx_drm_crtc)
 +{
 +      drm_handle_vblank(imx_drm_crtc->crtc->dev, imx_drm_crtc->pipe);
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_handle_vblank);
 +
 +static int imx_drm_enable_vblank(struct drm_device *drm, int crtc)
 +{
 +      struct imx_drm_device *imxdrm = drm->dev_private;
 +      struct imx_drm_crtc *imx_drm_crtc = imxdrm->crtc[crtc];
 +      int ret;
 +
 +      if (!imx_drm_crtc)
 +              return -EINVAL;
 +
 +      if (!imx_drm_crtc->imx_drm_helper_funcs.enable_vblank)
 +              return -ENOSYS;
 +
 +      ret = imx_drm_crtc->imx_drm_helper_funcs.enable_vblank(
 +                      imx_drm_crtc->crtc);
 +
 +      return ret;
 +}
 +
 +static void imx_drm_disable_vblank(struct drm_device *drm, int crtc)
 +{
 +      struct imx_drm_device *imxdrm = drm->dev_private;
 +      struct imx_drm_crtc *imx_drm_crtc = imxdrm->crtc[crtc];
 +
 +      if (!imx_drm_crtc)
 +              return;
 +
 +      if (!imx_drm_crtc->imx_drm_helper_funcs.disable_vblank)
 +              return;
 +
 +      imx_drm_crtc->imx_drm_helper_funcs.disable_vblank(imx_drm_crtc->crtc);
 +}
 +
 +static void imx_drm_driver_preclose(struct drm_device *drm,
 +              struct drm_file *file)
 +{
 +      int i;
 +
 +      if (!file->is_master)
 +              return;
 +
 +      for (i = 0; i < MAX_CRTC; i++)
 +              imx_drm_disable_vblank(drm, i);
 +}
 +
 +static const struct file_operations imx_drm_driver_fops = {
 +      .owner = THIS_MODULE,
 +      .open = drm_open,
 +      .release = drm_release,
 +      .unlocked_ioctl = drm_ioctl,
 +      .mmap = drm_gem_cma_mmap,
 +      .poll = drm_poll,
 +      .read = drm_read,
 +      .llseek = noop_llseek,
 +};
 +
 +void imx_drm_connector_destroy(struct drm_connector *connector)
 +{
 +      drm_connector_unregister(connector);
 +      drm_connector_cleanup(connector);
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_connector_destroy);
 +
 +void imx_drm_encoder_destroy(struct drm_encoder *encoder)
 +{
 +      drm_encoder_cleanup(encoder);
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_encoder_destroy);
 +
 +static void imx_drm_output_poll_changed(struct drm_device *drm)
 +{
 +#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)
 +      struct imx_drm_device *imxdrm = drm->dev_private;
 +
 +      drm_fbdev_cma_hotplug_event(imxdrm->fbhelper);
 +#endif
 +}
 +
 +static struct drm_mode_config_funcs imx_drm_mode_config_funcs = {
 +      .fb_create = drm_fb_cma_create,
 +      .output_poll_changed = imx_drm_output_poll_changed,
 +};
 +
 +/*
 + * Main DRM initialisation. This binds, initialises and registers
 + * with DRM the subcomponents of the driver.
 + */
 +static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
 +{
 +      struct imx_drm_device *imxdrm;
 +      struct drm_connector *connector;
 +      int ret;
 +
 +      imxdrm = devm_kzalloc(drm->dev, sizeof(*imxdrm), GFP_KERNEL);
 +      if (!imxdrm)
 +              return -ENOMEM;
 +
 +      imxdrm->drm = drm;
 +
 +      drm->dev_private = imxdrm;
 +
 +      /*
 +       * enable drm irq mode.
 +       * - with irq_enabled = true, we can use the vblank feature.
 +       *
 +       * P.S. note that we wouldn't use drm irq handler but
 +       *      just specific driver own one instead because
 +       *      drm framework supports only one irq handler and
 +       *      drivers can well take care of their interrupts
 +       */
 +      drm->irq_enabled = true;
 +
 +      /*
 +       * set max width and height as default value(4096x4096).
 +       * this value would be used to check framebuffer size limitation
 +       * at drm_mode_addfb().
 +       */
 +      drm->mode_config.min_width = 64;
 +      drm->mode_config.min_height = 64;
 +      drm->mode_config.max_width = 4096;
 +      drm->mode_config.max_height = 4096;
 +      drm->mode_config.funcs = &imx_drm_mode_config_funcs;
 +
 +      drm_mode_config_init(drm);
 +
 +      ret = drm_vblank_init(drm, MAX_CRTC);
 +      if (ret)
 +              goto err_kms;
 +
 +      /*
 +       * with vblank_disable_allowed = true, vblank interrupt will be
 +       * disabled by drm timer once a current process gives up ownership
 +       * of vblank event. (after drm_vblank_put function is called)
 +       */
 +      drm->vblank_disable_allowed = true;
 +
 +      platform_set_drvdata(drm->platformdev, drm);
 +
 +      /* Now try and bind all our sub-components */
 +      ret = component_bind_all(drm->dev, drm);
 +      if (ret)
 +              goto err_vblank;
 +
 +      /*
 +       * All components are now added, we can publish the connector sysfs
 +       * entries to userspace.  This will generate hotplug events and so
 +       * userspace will expect to be able to access DRM at this point.
 +       */
 +      list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
 +              ret = drm_connector_register(connector);
 +              if (ret) {
 +                      dev_err(drm->dev,
 +                              "[CONNECTOR:%d:%s] drm_connector_register failed: %d\n",
 +                              connector->base.id,
 +                              connector->name, ret);
 +                      goto err_unbind;
 +              }
 +      }
 +
 +      /*
 +       * All components are now initialised, so setup the fb helper.
 +       * The fb helper takes copies of key hardware information, so the
 +       * crtcs/connectors/encoders must not change after this point.
 +       */
 +#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)
 +      if (legacyfb_depth != 16 && legacyfb_depth != 32) {
 +              dev_warn(drm->dev, "Invalid legacyfb_depth.  Defaulting to 16bpp\n");
 +              legacyfb_depth = 16;
 +      }
 +      imxdrm->fbhelper = drm_fbdev_cma_init(drm, legacyfb_depth,
 +                              drm->mode_config.num_crtc, MAX_CRTC);
 +      if (IS_ERR(imxdrm->fbhelper)) {
 +              ret = PTR_ERR(imxdrm->fbhelper);
 +              imxdrm->fbhelper = NULL;
 +              goto err_unbind;
 +      }
 +#endif
 +
 +      drm_kms_helper_poll_init(drm);
 +
 +      return 0;
 +
 +err_unbind:
 +      component_unbind_all(drm->dev, drm);
 +err_vblank:
 +      drm_vblank_cleanup(drm);
 +err_kms:
 +      drm_mode_config_cleanup(drm);
 +
 +      return ret;
 +}
 +
 +/*
 + * imx_drm_add_crtc - add a new crtc
 + */
 +int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
 +              struct imx_drm_crtc **new_crtc,
 +              const struct imx_drm_crtc_helper_funcs *imx_drm_helper_funcs,
 +              struct device_node *port)
 +{
 +      struct imx_drm_device *imxdrm = drm->dev_private;
 +      struct imx_drm_crtc *imx_drm_crtc;
 +      int ret;
 +
 +      /*
 +       * The vblank arrays are dimensioned by MAX_CRTC - we can't
 +       * pass IDs greater than this to those functions.
 +       */
 +      if (imxdrm->pipes >= MAX_CRTC)
 +              return -EINVAL;
 +
 +      if (imxdrm->drm->open_count)
 +              return -EBUSY;
 +
 +      imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
 +      if (!imx_drm_crtc)
 +              return -ENOMEM;
 +
 +      imx_drm_crtc->imx_drm_helper_funcs = *imx_drm_helper_funcs;
 +      imx_drm_crtc->pipe = imxdrm->pipes++;
 +      imx_drm_crtc->port = port;
 +      imx_drm_crtc->crtc = crtc;
 +
 +      imxdrm->crtc[imx_drm_crtc->pipe] = imx_drm_crtc;
 +
 +      *new_crtc = imx_drm_crtc;
 +
 +      ret = drm_mode_crtc_set_gamma_size(imx_drm_crtc->crtc, 256);
 +      if (ret)
 +              goto err_register;
 +
 +      drm_crtc_helper_add(crtc,
 +                      imx_drm_crtc->imx_drm_helper_funcs.crtc_helper_funcs);
 +
 +      drm_crtc_init(drm, crtc,
 +                      imx_drm_crtc->imx_drm_helper_funcs.crtc_funcs);
 +
 +      return 0;
 +
 +err_register:
 +      imxdrm->crtc[imx_drm_crtc->pipe] = NULL;
 +      kfree(imx_drm_crtc);
 +      return ret;
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_add_crtc);
 +
 +/*
 + * imx_drm_remove_crtc - remove a crtc
 + */
 +int imx_drm_remove_crtc(struct imx_drm_crtc *imx_drm_crtc)
 +{
 +      struct imx_drm_device *imxdrm = imx_drm_crtc->crtc->dev->dev_private;
 +
 +      drm_crtc_cleanup(imx_drm_crtc->crtc);
 +
 +      imxdrm->crtc[imx_drm_crtc->pipe] = NULL;
 +
 +      kfree(imx_drm_crtc);
 +
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_remove_crtc);
 +
 +/*
 + * Find the DRM CRTC possible mask for the connected endpoint.
 + *
 + * The encoder possible masks are defined by their position in the
 + * mode_config crtc_list.  This means that CRTCs must not be added
 + * or removed once the DRM device has been fully initialised.
 + */
 +static uint32_t imx_drm_find_crtc_mask(struct imx_drm_device *imxdrm,
 +      struct device_node *endpoint)
 +{
 +      struct device_node *port;
 +      unsigned i;
 +
 +      port = of_graph_get_remote_port(endpoint);
 +      if (!port)
 +              return 0;
 +      of_node_put(port);
 +
 +      for (i = 0; i < MAX_CRTC; i++) {
 +              struct imx_drm_crtc *imx_drm_crtc = imxdrm->crtc[i];
 +
 +              if (imx_drm_crtc && imx_drm_crtc->port == port)
 +                      return drm_crtc_mask(imx_drm_crtc->crtc);
 +      }
 +
 +      return 0;
 +}
 +
 +static struct device_node *imx_drm_of_get_next_endpoint(
 +              const struct device_node *parent, struct device_node *prev)
 +{
 +      struct device_node *node = of_graph_get_next_endpoint(parent, prev);
 +
 +      of_node_put(prev);
 +      return node;
 +}
 +
 +int imx_drm_encoder_parse_of(struct drm_device *drm,
 +      struct drm_encoder *encoder, struct device_node *np)
 +{
 +      struct imx_drm_device *imxdrm = drm->dev_private;
 +      struct device_node *ep = NULL;
 +      uint32_t crtc_mask = 0;
 +      int i;
 +
 +      for (i = 0; ; i++) {
 +              u32 mask;
 +
 +              ep = imx_drm_of_get_next_endpoint(np, ep);
 +              if (!ep)
 +                      break;
 +
 +              mask = imx_drm_find_crtc_mask(imxdrm, ep);
 +
 +              /*
 +               * If we failed to find the CRTC(s) which this encoder is
 +               * supposed to be connected to, it's because the CRTC has
 +               * not been registered yet.  Defer probing, and hope that
 +               * the required CRTC is added later.
 +               */
 +              if (mask == 0)
 +                      return -EPROBE_DEFER;
 +
 +              crtc_mask |= mask;
 +      }
 +
 +      of_node_put(ep);
 +      if (i == 0)
 +              return -ENOENT;
 +
 +      encoder->possible_crtcs = crtc_mask;
 +
 +      /* FIXME: this is the mask of outputs which can clone this output. */
 +      encoder->possible_clones = ~0;
 +
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_encoder_parse_of);
 +
 +/*
 + * @node: device tree node containing encoder input ports
 + * @encoder: drm_encoder
 + */
 +int imx_drm_encoder_get_mux_id(struct device_node *node,
 +                             struct drm_encoder *encoder)
 +{
 +      struct imx_drm_crtc *imx_crtc = imx_drm_find_crtc(encoder->crtc);
 +      struct device_node *ep = NULL;
 +      struct of_endpoint endpoint;
 +      struct device_node *port;
 +      int ret;
 +
 +      if (!node || !imx_crtc)
 +              return -EINVAL;
 +
 +      do {
 +              ep = imx_drm_of_get_next_endpoint(node, ep);
 +              if (!ep)
 +                      break;
 +
 +              port = of_graph_get_remote_port(ep);
 +              of_node_put(port);
 +              if (port == imx_crtc->port) {
 +                      ret = of_graph_parse_endpoint(ep, &endpoint);
 +                      return ret ? ret : endpoint.port;
 +              }
 +      } while (ep);
 +
 +      return -EINVAL;
 +}
 +EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id);
 +
 +static const struct drm_ioctl_desc imx_drm_ioctls[] = {
 +      /* none so far */
 +};
 +
 +static struct drm_driver imx_drm_driver = {
 +      .driver_features        = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
 +      .load                   = imx_drm_driver_load,
 +      .unload                 = imx_drm_driver_unload,
 +      .lastclose              = imx_drm_driver_lastclose,
 +      .preclose               = imx_drm_driver_preclose,
 +      .set_busid              = drm_platform_set_busid,
 +      .gem_free_object        = drm_gem_cma_free_object,
 +      .gem_vm_ops             = &drm_gem_cma_vm_ops,
 +      .dumb_create            = drm_gem_cma_dumb_create,
 +      .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
 +      .dumb_destroy           = drm_gem_dumb_destroy,
 +
 +      .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
 +      .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
 +      .gem_prime_import       = drm_gem_prime_import,
 +      .gem_prime_export       = drm_gem_prime_export,
 +      .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
 +      .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
 +      .gem_prime_vmap         = drm_gem_cma_prime_vmap,
 +      .gem_prime_vunmap       = drm_gem_cma_prime_vunmap,
 +      .gem_prime_mmap         = drm_gem_cma_prime_mmap,
 +      .get_vblank_counter     = drm_vblank_count,
 +      .enable_vblank          = imx_drm_enable_vblank,
 +      .disable_vblank         = imx_drm_disable_vblank,
 +      .ioctls                 = imx_drm_ioctls,
 +      .num_ioctls             = ARRAY_SIZE(imx_drm_ioctls),
 +      .fops                   = &imx_drm_driver_fops,
 +      .name                   = "imx-drm",
 +      .desc                   = "i.MX DRM graphics",
 +      .date                   = "20120507",
 +      .major                  = 1,
 +      .minor                  = 0,
 +      .patchlevel             = 0,
 +};
 +
 +static int compare_of(struct device *dev, void *data)
 +{
 +      struct device_node *np = data;
 +
 +      /* Special case for LDB, one device for two channels */
 +      if (of_node_cmp(np->name, "lvds-channel") == 0) {
 +              np = of_get_parent(np);
 +              of_node_put(np);
 +      }
 +
 +      return dev->of_node == np;
 +}
 +
 +static int imx_drm_bind(struct device *dev)
 +{
 +      return drm_platform_init(&imx_drm_driver, to_platform_device(dev));
 +}
 +
 +static void imx_drm_unbind(struct device *dev)
 +{
 +      drm_put_dev(dev_get_drvdata(dev));
 +}
 +
 +static const struct component_master_ops imx_drm_ops = {
 +      .bind = imx_drm_bind,
 +      .unbind = imx_drm_unbind,
 +};
 +
 +static int imx_drm_platform_probe(struct platform_device *pdev)
 +{
 +      struct device_node *ep, *port, *remote;
 +      struct component_match *match = NULL;
 +      int ret;
 +      int i;
 +
 +      /*
 +       * Bind the IPU display interface ports first, so that
 +       * imx_drm_encoder_parse_of called from encoder .bind callbacks
 +       * works as expected.
 +       */
 +      for (i = 0; ; i++) {
 +              port = of_parse_phandle(pdev->dev.of_node, "ports", i);
 +              if (!port)
 +                      break;
 +
 +              component_match_add(&pdev->dev, &match, compare_of, port);
 +      }
 +
 +      if (i == 0) {
 +              dev_err(&pdev->dev, "missing 'ports' property\n");
 +              return -ENODEV;
 +      }
 +
 +      /* Then bind all encoders */
 +      for (i = 0; ; i++) {
 +              port = of_parse_phandle(pdev->dev.of_node, "ports", i);
 +              if (!port)
 +                      break;
 +
 +              for_each_child_of_node(port, ep) {
 +                      remote = of_graph_get_remote_port_parent(ep);
 +                      if (!remote || !of_device_is_available(remote)) {
 +                              of_node_put(remote);
 +                              continue;
 +                      } else if (!of_device_is_available(remote->parent)) {
 +                              dev_warn(&pdev->dev, "parent device of %s is not available\n",
 +                                       remote->full_name);
 +                              of_node_put(remote);
 +                              continue;
 +                      }
 +
++                      component_match_add(&pdev->dev, &match, compare_of,
++                                          remote);
 +                      of_node_put(remote);
 +              }
 +              of_node_put(port);
 +      }
 +
 +      ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
 +      if (ret)
 +              return ret;
 +
 +      return component_master_add_with_match(&pdev->dev, &imx_drm_ops, match);
 +}
 +
 +static int imx_drm_platform_remove(struct platform_device *pdev)
 +{
 +      component_master_del(&pdev->dev, &imx_drm_ops);
 +      return 0;
 +}
 +
 +#ifdef CONFIG_PM_SLEEP
 +static int imx_drm_suspend(struct device *dev)
 +{
 +      struct drm_device *drm_dev = dev_get_drvdata(dev);
 +
 +      /* The drm_dev is NULL before .load hook is called */
 +      if (drm_dev == NULL)
 +              return 0;
 +
 +      drm_kms_helper_poll_disable(drm_dev);
 +
 +      return 0;
 +}
 +
 +static int imx_drm_resume(struct device *dev)
 +{
 +      struct drm_device *drm_dev = dev_get_drvdata(dev);
 +
 +      if (drm_dev == NULL)
 +              return 0;
 +
 +      drm_helper_resume_force_mode(drm_dev);
 +      drm_kms_helper_poll_enable(drm_dev);
 +
 +      return 0;
 +}
 +#endif
 +
 +static SIMPLE_DEV_PM_OPS(imx_drm_pm_ops, imx_drm_suspend, imx_drm_resume);
 +
 +static const struct of_device_id imx_drm_dt_ids[] = {
 +      { .compatible = "fsl,imx-display-subsystem", },
 +      { /* sentinel */ },
 +};
 +MODULE_DEVICE_TABLE(of, imx_drm_dt_ids);
 +
 +static struct platform_driver imx_drm_pdrv = {
 +      .probe          = imx_drm_platform_probe,
 +      .remove         = imx_drm_platform_remove,
 +      .driver         = {
 +              .name   = "imx-drm",
 +              .pm     = &imx_drm_pm_ops,
 +              .of_match_table = imx_drm_dt_ids,
 +      },
 +};
 +module_platform_driver(imx_drm_pdrv);
 +
 +MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
 +MODULE_DESCRIPTION("i.MX drm driver core");
 +MODULE_LICENSE("GPL");
index 2638dc1671d0a60126e9c8c6bf011556a92ffd11,0000000000000000000000000000000000000000..c60460043e24dc5f0e19107dd1fe64c25a0da515
mode 100644,000000..100644
--- /dev/null
@@@ -1,615 -1,0 +1,610 @@@
-  *
-  * 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.
 +/*
 + * i.MX drm driver - LVDS display bridge
 + *
 + * Copyright (C) 2012 Sascha Hauer, Pengutronix
 + *
 + * 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 the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + * This program is distributed in the hope that it will be useful,
 + * 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.
 + */
 +
 +#include <linux/module.h>
 +#include <linux/clk.h>
 +#include <linux/component.h>
 +#include <drm/drmP.h>
 +#include <drm/drm_fb_helper.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <linux/mfd/syscon.h>
 +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
 +#include <linux/of_address.h>
 +#include <linux/of_device.h>
 +#include <video/of_videomode.h>
 +#include <linux/regmap.h>
 +#include <linux/videodev2.h>
 +
 +#include "imx-drm.h"
 +
 +#define DRIVER_NAME "imx-ldb"
 +
 +#define LDB_CH0_MODE_EN_TO_DI0                (1 << 0)
 +#define LDB_CH0_MODE_EN_TO_DI1                (3 << 0)
 +#define LDB_CH0_MODE_EN_MASK          (3 << 0)
 +#define LDB_CH1_MODE_EN_TO_DI0                (1 << 2)
 +#define LDB_CH1_MODE_EN_TO_DI1                (3 << 2)
 +#define LDB_CH1_MODE_EN_MASK          (3 << 2)
 +#define LDB_SPLIT_MODE_EN             (1 << 4)
 +#define LDB_DATA_WIDTH_CH0_24         (1 << 5)
 +#define LDB_BIT_MAP_CH0_JEIDA         (1 << 6)
 +#define LDB_DATA_WIDTH_CH1_24         (1 << 7)
 +#define LDB_BIT_MAP_CH1_JEIDA         (1 << 8)
 +#define LDB_DI0_VS_POL_ACT_LOW                (1 << 9)
 +#define LDB_DI1_VS_POL_ACT_LOW                (1 << 10)
 +#define LDB_BGREF_RMODE_INT           (1 << 15)
 +
 +#define con_to_imx_ldb_ch(x) container_of(x, struct imx_ldb_channel, connector)
 +#define enc_to_imx_ldb_ch(x) container_of(x, struct imx_ldb_channel, encoder)
 +
 +struct imx_ldb;
 +
 +struct imx_ldb_channel {
 +      struct imx_ldb *ldb;
 +      struct drm_connector connector;
 +      struct drm_encoder encoder;
 +      struct device_node *child;
 +      int chno;
 +      void *edid;
 +      int edid_len;
 +      struct drm_display_mode mode;
 +      int mode_valid;
 +};
 +
 +struct bus_mux {
 +      int reg;
 +      int shift;
 +      int mask;
 +};
 +
 +struct imx_ldb {
 +      struct regmap *regmap;
 +      struct device *dev;
 +      struct imx_ldb_channel channel[2];
 +      struct clk *clk[2]; /* our own clock */
 +      struct clk *clk_sel[4]; /* parent of display clock */
 +      struct clk *clk_pll[2]; /* upstream clock we can adjust */
 +      u32 ldb_ctrl;
 +      const struct bus_mux *lvds_mux;
 +};
 +
 +static enum drm_connector_status imx_ldb_connector_detect(
 +              struct drm_connector *connector, bool force)
 +{
 +      return connector_status_connected;
 +}
 +
 +static int imx_ldb_connector_get_modes(struct drm_connector *connector)
 +{
 +      struct imx_ldb_channel *imx_ldb_ch = con_to_imx_ldb_ch(connector);
 +      int num_modes = 0;
 +
 +      if (imx_ldb_ch->edid) {
 +              drm_mode_connector_update_edid_property(connector,
 +                                                      imx_ldb_ch->edid);
 +              num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid);
 +      }
 +
 +      if (imx_ldb_ch->mode_valid) {
 +              struct drm_display_mode *mode;
 +
 +              mode = drm_mode_create(connector->dev);
 +              if (!mode)
 +                      return -EINVAL;
 +              drm_mode_copy(mode, &imx_ldb_ch->mode);
 +              mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
 +              drm_mode_probed_add(connector, mode);
 +              num_modes++;
 +      }
 +
 +      return num_modes;
 +}
 +
 +static struct drm_encoder *imx_ldb_connector_best_encoder(
 +              struct drm_connector *connector)
 +{
 +      struct imx_ldb_channel *imx_ldb_ch = con_to_imx_ldb_ch(connector);
 +
 +      return &imx_ldb_ch->encoder;
 +}
 +
 +static void imx_ldb_encoder_dpms(struct drm_encoder *encoder, int mode)
 +{
 +}
 +
 +static bool imx_ldb_encoder_mode_fixup(struct drm_encoder *encoder,
 +                         const struct drm_display_mode *mode,
 +                         struct drm_display_mode *adjusted_mode)
 +{
 +      return true;
 +}
 +
 +static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno,
 +              unsigned long serial_clk, unsigned long di_clk)
 +{
 +      int ret;
 +
 +      dev_dbg(ldb->dev, "%s: now: %ld want: %ld\n", __func__,
 +                      clk_get_rate(ldb->clk_pll[chno]), serial_clk);
 +      clk_set_rate(ldb->clk_pll[chno], serial_clk);
 +
 +      dev_dbg(ldb->dev, "%s after: %ld\n", __func__,
 +                      clk_get_rate(ldb->clk_pll[chno]));
 +
 +      dev_dbg(ldb->dev, "%s: now: %ld want: %ld\n", __func__,
 +                      clk_get_rate(ldb->clk[chno]),
 +                      (long int)di_clk);
 +      clk_set_rate(ldb->clk[chno], di_clk);
 +
 +      dev_dbg(ldb->dev, "%s after: %ld\n", __func__,
 +                      clk_get_rate(ldb->clk[chno]));
 +
 +      /* set display clock mux to LDB input clock */
 +      ret = clk_set_parent(ldb->clk_sel[mux], ldb->clk[chno]);
 +      if (ret)
 +              dev_err(ldb->dev,
 +                      "unable to set di%d parent clock to ldb_di%d\n", mux,
 +                      chno);
 +}
 +
 +static void imx_ldb_encoder_prepare(struct drm_encoder *encoder)
 +{
 +      struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
 +      struct imx_ldb *ldb = imx_ldb_ch->ldb;
 +      struct drm_display_mode *mode = &encoder->crtc->mode;
 +      u32 pixel_fmt;
 +      unsigned long serial_clk;
 +      unsigned long di_clk = mode->clock * 1000;
 +      int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);
 +
 +      if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
 +              /* dual channel LVDS mode */
 +              serial_clk = 3500UL * mode->clock;
 +              imx_ldb_set_clock(ldb, mux, 0, serial_clk, di_clk);
 +              imx_ldb_set_clock(ldb, mux, 1, serial_clk, di_clk);
 +      } else {
 +              serial_clk = 7000UL * mode->clock;
 +              imx_ldb_set_clock(ldb, mux, imx_ldb_ch->chno, serial_clk,
 +                              di_clk);
 +      }
 +
 +      switch (imx_ldb_ch->chno) {
 +      case 0:
 +              pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH0_24) ?
 +                      V4L2_PIX_FMT_RGB24 : V4L2_PIX_FMT_BGR666;
 +              break;
 +      case 1:
 +              pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH1_24) ?
 +                      V4L2_PIX_FMT_RGB24 : V4L2_PIX_FMT_BGR666;
 +              break;
 +      default:
 +              dev_err(ldb->dev, "unable to config di%d panel format\n",
 +                      imx_ldb_ch->chno);
 +              pixel_fmt = V4L2_PIX_FMT_RGB24;
 +      }
 +
 +      imx_drm_panel_format(encoder, pixel_fmt);
 +}
 +
 +static void imx_ldb_encoder_commit(struct drm_encoder *encoder)
 +{
 +      struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
 +      struct imx_ldb *ldb = imx_ldb_ch->ldb;
 +      int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
 +      int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);
 +
 +      if (dual) {
 +              clk_prepare_enable(ldb->clk[0]);
 +              clk_prepare_enable(ldb->clk[1]);
 +      }
 +
 +      if (imx_ldb_ch == &ldb->channel[0] || dual) {
 +              ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK;
 +              if (mux == 0 || ldb->lvds_mux)
 +                      ldb->ldb_ctrl |= LDB_CH0_MODE_EN_TO_DI0;
 +              else if (mux == 1)
 +                      ldb->ldb_ctrl |= LDB_CH0_MODE_EN_TO_DI1;
 +      }
 +      if (imx_ldb_ch == &ldb->channel[1] || dual) {
 +              ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK;
 +              if (mux == 1 || ldb->lvds_mux)
 +                      ldb->ldb_ctrl |= LDB_CH1_MODE_EN_TO_DI1;
 +              else if (mux == 0)
 +                      ldb->ldb_ctrl |= LDB_CH1_MODE_EN_TO_DI0;
 +      }
 +
 +      if (ldb->lvds_mux) {
 +              const struct bus_mux *lvds_mux = NULL;
 +
 +              if (imx_ldb_ch == &ldb->channel[0])
 +                      lvds_mux = &ldb->lvds_mux[0];
 +              else if (imx_ldb_ch == &ldb->channel[1])
 +                      lvds_mux = &ldb->lvds_mux[1];
 +
 +              regmap_update_bits(ldb->regmap, lvds_mux->reg, lvds_mux->mask,
 +                                 mux << lvds_mux->shift);
 +      }
 +
 +      regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
 +}
 +
 +static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,
 +                       struct drm_display_mode *mode,
 +                       struct drm_display_mode *adjusted_mode)
 +{
 +      struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
 +      struct imx_ldb *ldb = imx_ldb_ch->ldb;
 +      int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
 +
 +      if (mode->clock > 170000) {
 +              dev_warn(ldb->dev,
 +                       "%s: mode exceeds 170 MHz pixel clock\n", __func__);
 +      }
 +      if (mode->clock > 85000 && !dual) {
 +              dev_warn(ldb->dev,
 +                       "%s: mode exceeds 85 MHz pixel clock\n", __func__);
 +      }
 +
 +      /* FIXME - assumes straight connections DI0 --> CH0, DI1 --> CH1 */
 +      if (imx_ldb_ch == &ldb->channel[0]) {
 +              if (mode->flags & DRM_MODE_FLAG_NVSYNC)
 +                      ldb->ldb_ctrl |= LDB_DI0_VS_POL_ACT_LOW;
 +              else if (mode->flags & DRM_MODE_FLAG_PVSYNC)
 +                      ldb->ldb_ctrl &= ~LDB_DI0_VS_POL_ACT_LOW;
 +      }
 +      if (imx_ldb_ch == &ldb->channel[1]) {
 +              if (mode->flags & DRM_MODE_FLAG_NVSYNC)
 +                      ldb->ldb_ctrl |= LDB_DI1_VS_POL_ACT_LOW;
 +              else if (mode->flags & DRM_MODE_FLAG_PVSYNC)
 +                      ldb->ldb_ctrl &= ~LDB_DI1_VS_POL_ACT_LOW;
 +      }
 +}
 +
 +static void imx_ldb_encoder_disable(struct drm_encoder *encoder)
 +{
 +      struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
 +      struct imx_ldb *ldb = imx_ldb_ch->ldb;
 +
 +      /*
 +       * imx_ldb_encoder_disable is called by
 +       * drm_helper_disable_unused_functions without
 +       * the encoder being enabled before.
 +       */
 +      if (imx_ldb_ch == &ldb->channel[0] &&
 +          (ldb->ldb_ctrl & LDB_CH0_MODE_EN_MASK) == 0)
 +              return;
 +      else if (imx_ldb_ch == &ldb->channel[1] &&
 +               (ldb->ldb_ctrl & LDB_CH1_MODE_EN_MASK) == 0)
 +              return;
 +
 +      if (imx_ldb_ch == &ldb->channel[0])
 +              ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK;
 +      else if (imx_ldb_ch == &ldb->channel[1])
 +              ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK;
 +
 +      regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
 +
 +      if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
 +              clk_disable_unprepare(ldb->clk[0]);
 +              clk_disable_unprepare(ldb->clk[1]);
 +      }
 +}
 +
 +static struct drm_connector_funcs imx_ldb_connector_funcs = {
 +      .dpms = drm_helper_connector_dpms,
 +      .fill_modes = drm_helper_probe_single_connector_modes,
 +      .detect = imx_ldb_connector_detect,
 +      .destroy = imx_drm_connector_destroy,
 +};
 +
 +static struct drm_connector_helper_funcs imx_ldb_connector_helper_funcs = {
 +      .get_modes = imx_ldb_connector_get_modes,
 +      .best_encoder = imx_ldb_connector_best_encoder,
 +};
 +
 +static struct drm_encoder_funcs imx_ldb_encoder_funcs = {
 +      .destroy = imx_drm_encoder_destroy,
 +};
 +
 +static struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = {
 +      .dpms = imx_ldb_encoder_dpms,
 +      .mode_fixup = imx_ldb_encoder_mode_fixup,
 +      .prepare = imx_ldb_encoder_prepare,
 +      .commit = imx_ldb_encoder_commit,
 +      .mode_set = imx_ldb_encoder_mode_set,
 +      .disable = imx_ldb_encoder_disable,
 +};
 +
 +static int imx_ldb_get_clk(struct imx_ldb *ldb, int chno)
 +{
 +      char clkname[16];
 +
 +      snprintf(clkname, sizeof(clkname), "di%d", chno);
 +      ldb->clk[chno] = devm_clk_get(ldb->dev, clkname);
 +      if (IS_ERR(ldb->clk[chno]))
 +              return PTR_ERR(ldb->clk[chno]);
 +
 +      snprintf(clkname, sizeof(clkname), "di%d_pll", chno);
 +      ldb->clk_pll[chno] = devm_clk_get(ldb->dev, clkname);
 +
 +      return PTR_ERR_OR_ZERO(ldb->clk_pll[chno]);
 +}
 +
 +static int imx_ldb_register(struct drm_device *drm,
 +      struct imx_ldb_channel *imx_ldb_ch)
 +{
 +      struct imx_ldb *ldb = imx_ldb_ch->ldb;
 +      int ret;
 +
 +      ret = imx_drm_encoder_parse_of(drm, &imx_ldb_ch->encoder,
 +                                     imx_ldb_ch->child);
 +      if (ret)
 +              return ret;
 +
 +      ret = imx_ldb_get_clk(ldb, imx_ldb_ch->chno);
 +      if (ret)
 +              return ret;
 +
 +      if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
 +              ret = imx_ldb_get_clk(ldb, 1);
 +              if (ret)
 +                      return ret;
 +      }
 +
 +      drm_encoder_helper_add(&imx_ldb_ch->encoder,
 +                      &imx_ldb_encoder_helper_funcs);
 +      drm_encoder_init(drm, &imx_ldb_ch->encoder, &imx_ldb_encoder_funcs,
 +                       DRM_MODE_ENCODER_LVDS);
 +
 +      drm_connector_helper_add(&imx_ldb_ch->connector,
 +                      &imx_ldb_connector_helper_funcs);
 +      drm_connector_init(drm, &imx_ldb_ch->connector,
 +                         &imx_ldb_connector_funcs, DRM_MODE_CONNECTOR_LVDS);
 +
 +      drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
 +                      &imx_ldb_ch->encoder);
 +
 +      return 0;
 +}
 +
 +enum {
 +      LVDS_BIT_MAP_SPWG,
 +      LVDS_BIT_MAP_JEIDA
 +};
 +
 +static const char * const imx_ldb_bit_mappings[] = {
 +      [LVDS_BIT_MAP_SPWG]  = "spwg",
 +      [LVDS_BIT_MAP_JEIDA] = "jeida",
 +};
 +
 +static const int of_get_data_mapping(struct device_node *np)
 +{
 +      const char *bm;
 +      int ret, i;
 +
 +      ret = of_property_read_string(np, "fsl,data-mapping", &bm);
 +      if (ret < 0)
 +              return ret;
 +
 +      for (i = 0; i < ARRAY_SIZE(imx_ldb_bit_mappings); i++)
 +              if (!strcasecmp(bm, imx_ldb_bit_mappings[i]))
 +                      return i;
 +
 +      return -EINVAL;
 +}
 +
 +static struct bus_mux imx6q_lvds_mux[2] = {
 +      {
 +              .reg = IOMUXC_GPR3,
 +              .shift = 6,
 +              .mask = IMX6Q_GPR3_LVDS0_MUX_CTL_MASK,
 +      }, {
 +              .reg = IOMUXC_GPR3,
 +              .shift = 8,
 +              .mask = IMX6Q_GPR3_LVDS1_MUX_CTL_MASK,
 +      }
 +};
 +
 +/*
 + * For a device declaring compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb",
 + * of_match_device will walk through this list and take the first entry
 + * matching any of its compatible values. Therefore, the more generic
 + * entries (in this case fsl,imx53-ldb) need to be ordered last.
 + */
 +static const struct of_device_id imx_ldb_dt_ids[] = {
 +      { .compatible = "fsl,imx6q-ldb", .data = imx6q_lvds_mux, },
 +      { .compatible = "fsl,imx53-ldb", .data = NULL, },
 +      { }
 +};
 +MODULE_DEVICE_TABLE(of, imx_ldb_dt_ids);
 +
 +static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
 +{
 +      struct drm_device *drm = data;
 +      struct device_node *np = dev->of_node;
 +      const struct of_device_id *of_id =
 +                      of_match_device(imx_ldb_dt_ids, dev);
 +      struct device_node *child;
 +      const u8 *edidp;
 +      struct imx_ldb *imx_ldb;
 +      int datawidth;
 +      int mapping;
 +      int dual;
 +      int ret;
 +      int i;
 +
 +      imx_ldb = devm_kzalloc(dev, sizeof(*imx_ldb), GFP_KERNEL);
 +      if (!imx_ldb)
 +              return -ENOMEM;
 +
 +      imx_ldb->regmap = syscon_regmap_lookup_by_phandle(np, "gpr");
 +      if (IS_ERR(imx_ldb->regmap)) {
 +              dev_err(dev, "failed to get parent regmap\n");
 +              return PTR_ERR(imx_ldb->regmap);
 +      }
 +
 +      imx_ldb->dev = dev;
 +
 +      if (of_id)
 +              imx_ldb->lvds_mux = of_id->data;
 +
 +      dual = of_property_read_bool(np, "fsl,dual-channel");
 +      if (dual)
 +              imx_ldb->ldb_ctrl |= LDB_SPLIT_MODE_EN;
 +
 +      /*
 +       * There are three different possible clock mux configurations:
 +       * i.MX53:  ipu1_di0_sel, ipu1_di1_sel
 +       * i.MX6q:  ipu1_di0_sel, ipu1_di1_sel, ipu2_di0_sel, ipu2_di1_sel
 +       * i.MX6dl: ipu1_di0_sel, ipu1_di1_sel, lcdif_sel
 +       * Map them all to di0_sel...di3_sel.
 +       */
 +      for (i = 0; i < 4; i++) {
 +              char clkname[16];
 +
 +              sprintf(clkname, "di%d_sel", i);
 +              imx_ldb->clk_sel[i] = devm_clk_get(imx_ldb->dev, clkname);
 +              if (IS_ERR(imx_ldb->clk_sel[i])) {
 +                      ret = PTR_ERR(imx_ldb->clk_sel[i]);
 +                      imx_ldb->clk_sel[i] = NULL;
 +                      break;
 +              }
 +      }
 +      if (i == 0)
 +              return ret;
 +
 +      for_each_child_of_node(np, child) {
 +              struct imx_ldb_channel *channel;
 +
 +              ret = of_property_read_u32(child, "reg", &i);
 +              if (ret || i < 0 || i > 1)
 +                      return -EINVAL;
 +
 +              if (dual && i > 0) {
 +                      dev_warn(dev, "dual-channel mode, ignoring second output\n");
 +                      continue;
 +              }
 +
 +              if (!of_device_is_available(child))
 +                      continue;
 +
 +              channel = &imx_ldb->channel[i];
 +              channel->ldb = imx_ldb;
 +              channel->chno = i;
 +              channel->child = child;
 +
 +              edidp = of_get_property(child, "edid", &channel->edid_len);
 +              if (edidp) {
 +                      channel->edid = kmemdup(edidp, channel->edid_len,
 +                                              GFP_KERNEL);
 +              } else {
 +                      ret = of_get_drm_display_mode(child, &channel->mode, 0);
 +                      if (!ret)
 +                              channel->mode_valid = 1;
 +              }
 +
 +              ret = of_property_read_u32(child, "fsl,data-width", &datawidth);
 +              if (ret)
 +                      datawidth = 0;
 +              else if (datawidth != 18 && datawidth != 24)
 +                      return -EINVAL;
 +
 +              mapping = of_get_data_mapping(child);
 +              switch (mapping) {
 +              case LVDS_BIT_MAP_SPWG:
 +                      if (datawidth == 24) {
 +                              if (i == 0 || dual)
 +                                      imx_ldb->ldb_ctrl |=
 +                                              LDB_DATA_WIDTH_CH0_24;
 +                              if (i == 1 || dual)
 +                                      imx_ldb->ldb_ctrl |=
 +                                              LDB_DATA_WIDTH_CH1_24;
 +                      }
 +                      break;
 +              case LVDS_BIT_MAP_JEIDA:
 +                      if (datawidth == 18) {
 +                              dev_err(dev, "JEIDA standard only supported in 24 bit\n");
 +                              return -EINVAL;
 +                      }
 +                      if (i == 0 || dual)
 +                              imx_ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH0_24 |
 +                                      LDB_BIT_MAP_CH0_JEIDA;
 +                      if (i == 1 || dual)
 +                              imx_ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH1_24 |
 +                                      LDB_BIT_MAP_CH1_JEIDA;
 +                      break;
 +              default:
 +                      dev_err(dev, "data mapping not specified or invalid\n");
 +                      return -EINVAL;
 +              }
 +
 +              ret = imx_ldb_register(drm, channel);
 +              if (ret)
 +                      return ret;
 +      }
 +
 +      dev_set_drvdata(dev, imx_ldb);
 +
 +      return 0;
 +}
 +
 +static void imx_ldb_unbind(struct device *dev, struct device *master,
 +      void *data)
 +{
 +      struct imx_ldb *imx_ldb = dev_get_drvdata(dev);
 +      int i;
 +
 +      for (i = 0; i < 2; i++) {
 +              struct imx_ldb_channel *channel = &imx_ldb->channel[i];
 +
 +              if (!channel->connector.funcs)
 +                      continue;
 +
 +              channel->connector.funcs->destroy(&channel->connector);
 +              channel->encoder.funcs->destroy(&channel->encoder);
 +      }
 +}
 +
 +static const struct component_ops imx_ldb_ops = {
 +      .bind   = imx_ldb_bind,
 +      .unbind = imx_ldb_unbind,
 +};
 +
 +static int imx_ldb_probe(struct platform_device *pdev)
 +{
 +      return component_add(&pdev->dev, &imx_ldb_ops);
 +}
 +
 +static int imx_ldb_remove(struct platform_device *pdev)
 +{
 +      component_del(&pdev->dev, &imx_ldb_ops);
 +      return 0;
 +}
 +
 +static struct platform_driver imx_ldb_driver = {
 +      .probe          = imx_ldb_probe,
 +      .remove         = imx_ldb_remove,
 +      .driver         = {
 +              .of_match_table = imx_ldb_dt_ids,
 +              .name   = DRIVER_NAME,
 +      },
 +};
 +
 +module_platform_driver(imx_ldb_driver);
 +
 +MODULE_DESCRIPTION("i.MX LVDS driver");
 +MODULE_AUTHOR("Sascha Hauer, Pengutronix");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:" DRIVER_NAME);
index 64b54d7f996cbd2ebf331a2e09b44a26f69bbde4,0000000000000000000000000000000000000000..a729f4f7074c1125a04ec3e35bd87f99be95a49b
mode 100644,000000..100644
--- /dev/null
@@@ -1,735 -1,0 +1,731 @@@
-  *
-  * 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.
 +/*
 + * i.MX drm driver - Television Encoder (TVEv2)
 + *
 + * Copyright (C) 2013 Philipp Zabel, Pengutronix
 + *
 + * 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 the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + * This program is distributed in the hope that it will be useful,
 + * 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.
-               dev_err(dev, "failed to read configuration register: %d\n", ret);
 + */
 +
 +#include <linux/clk.h>
 +#include <linux/clk-provider.h>
 +#include <linux/component.h>
 +#include <linux/module.h>
 +#include <linux/i2c.h>
 +#include <linux/regmap.h>
 +#include <linux/regulator/consumer.h>
 +#include <linux/spinlock.h>
 +#include <linux/videodev2.h>
 +#include <drm/drmP.h>
 +#include <drm/drm_fb_helper.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <video/imx-ipu-v3.h>
 +
 +#include "imx-drm.h"
 +
 +#define TVE_COM_CONF_REG      0x00
 +#define TVE_TVDAC0_CONT_REG   0x28
 +#define TVE_TVDAC1_CONT_REG   0x2c
 +#define TVE_TVDAC2_CONT_REG   0x30
 +#define TVE_CD_CONT_REG               0x34
 +#define TVE_INT_CONT_REG      0x64
 +#define TVE_STAT_REG          0x68
 +#define TVE_TST_MODE_REG      0x6c
 +#define TVE_MV_CONT_REG               0xdc
 +
 +/* TVE_COM_CONF_REG */
 +#define TVE_SYNC_CH_2_EN      BIT(22)
 +#define TVE_SYNC_CH_1_EN      BIT(21)
 +#define TVE_SYNC_CH_0_EN      BIT(20)
 +#define TVE_TV_OUT_MODE_MASK  (0x7 << 12)
 +#define TVE_TV_OUT_DISABLE    (0x0 << 12)
 +#define TVE_TV_OUT_CVBS_0     (0x1 << 12)
 +#define TVE_TV_OUT_CVBS_2     (0x2 << 12)
 +#define TVE_TV_OUT_CVBS_0_2   (0x3 << 12)
 +#define TVE_TV_OUT_SVIDEO_0_1 (0x4 << 12)
 +#define TVE_TV_OUT_SVIDEO_0_1_CVBS2_2 (0x5 << 12)
 +#define TVE_TV_OUT_YPBPR      (0x6 << 12)
 +#define TVE_TV_OUT_RGB                (0x7 << 12)
 +#define TVE_TV_STAND_MASK     (0xf << 8)
 +#define TVE_TV_STAND_HD_1080P30       (0xc << 8)
 +#define TVE_P2I_CONV_EN               BIT(7)
 +#define TVE_INP_VIDEO_FORM    BIT(6)
 +#define TVE_INP_YCBCR_422     (0x0 << 6)
 +#define TVE_INP_YCBCR_444     (0x1 << 6)
 +#define TVE_DATA_SOURCE_MASK  (0x3 << 4)
 +#define TVE_DATA_SOURCE_BUS1  (0x0 << 4)
 +#define TVE_DATA_SOURCE_BUS2  (0x1 << 4)
 +#define TVE_DATA_SOURCE_EXT   (0x2 << 4)
 +#define TVE_DATA_SOURCE_TESTGEN       (0x3 << 4)
 +#define TVE_IPU_CLK_EN_OFS    3
 +#define TVE_IPU_CLK_EN                BIT(3)
 +#define TVE_DAC_SAMP_RATE_OFS 1
 +#define TVE_DAC_SAMP_RATE_WIDTH       2
 +#define TVE_DAC_SAMP_RATE_MASK        (0x3 << 1)
 +#define TVE_DAC_FULL_RATE     (0x0 << 1)
 +#define TVE_DAC_DIV2_RATE     (0x1 << 1)
 +#define TVE_DAC_DIV4_RATE     (0x2 << 1)
 +#define TVE_EN                        BIT(0)
 +
 +/* TVE_TVDACx_CONT_REG */
 +#define TVE_TVDAC_GAIN_MASK   (0x3f << 0)
 +
 +/* TVE_CD_CONT_REG */
 +#define TVE_CD_CH_2_SM_EN     BIT(22)
 +#define TVE_CD_CH_1_SM_EN     BIT(21)
 +#define TVE_CD_CH_0_SM_EN     BIT(20)
 +#define TVE_CD_CH_2_LM_EN     BIT(18)
 +#define TVE_CD_CH_1_LM_EN     BIT(17)
 +#define TVE_CD_CH_0_LM_EN     BIT(16)
 +#define TVE_CD_CH_2_REF_LVL   BIT(10)
 +#define TVE_CD_CH_1_REF_LVL   BIT(9)
 +#define TVE_CD_CH_0_REF_LVL   BIT(8)
 +#define TVE_CD_EN             BIT(0)
 +
 +/* TVE_INT_CONT_REG */
 +#define TVE_FRAME_END_IEN     BIT(13)
 +#define TVE_CD_MON_END_IEN    BIT(2)
 +#define TVE_CD_SM_IEN         BIT(1)
 +#define TVE_CD_LM_IEN         BIT(0)
 +
 +/* TVE_TST_MODE_REG */
 +#define TVE_TVDAC_TEST_MODE_MASK      (0x7 << 0)
 +
 +#define con_to_tve(x) container_of(x, struct imx_tve, connector)
 +#define enc_to_tve(x) container_of(x, struct imx_tve, encoder)
 +
 +enum {
 +      TVE_MODE_TVOUT,
 +      TVE_MODE_VGA,
 +};
 +
 +struct imx_tve {
 +      struct drm_connector connector;
 +      struct drm_encoder encoder;
 +      struct device *dev;
 +      spinlock_t lock;        /* register lock */
 +      bool enabled;
 +      int mode;
 +
 +      struct regmap *regmap;
 +      struct regulator *dac_reg;
 +      struct i2c_adapter *ddc;
 +      struct clk *clk;
 +      struct clk *di_sel_clk;
 +      struct clk_hw clk_hw_di;
 +      struct clk *di_clk;
 +      int vsync_pin;
 +      int hsync_pin;
 +};
 +
 +static void tve_lock(void *__tve)
 +__acquires(&tve->lock)
 +{
 +      struct imx_tve *tve = __tve;
 +
 +      spin_lock(&tve->lock);
 +}
 +
 +static void tve_unlock(void *__tve)
 +__releases(&tve->lock)
 +{
 +      struct imx_tve *tve = __tve;
 +
 +      spin_unlock(&tve->lock);
 +}
 +
 +static void tve_enable(struct imx_tve *tve)
 +{
 +      int ret;
 +
 +      if (!tve->enabled) {
 +              tve->enabled = true;
 +              clk_prepare_enable(tve->clk);
 +              ret = regmap_update_bits(tve->regmap, TVE_COM_CONF_REG,
 +                                       TVE_IPU_CLK_EN | TVE_EN,
 +                                       TVE_IPU_CLK_EN | TVE_EN);
 +      }
 +
 +      /* clear interrupt status register */
 +      regmap_write(tve->regmap, TVE_STAT_REG, 0xffffffff);
 +
 +      /* cable detection irq disabled in VGA mode, enabled in TVOUT mode */
 +      if (tve->mode == TVE_MODE_VGA)
 +              regmap_write(tve->regmap, TVE_INT_CONT_REG, 0);
 +      else
 +              regmap_write(tve->regmap, TVE_INT_CONT_REG,
 +                           TVE_CD_SM_IEN |
 +                           TVE_CD_LM_IEN |
 +                           TVE_CD_MON_END_IEN);
 +}
 +
 +static void tve_disable(struct imx_tve *tve)
 +{
 +      int ret;
 +
 +      if (tve->enabled) {
 +              tve->enabled = false;
 +              ret = regmap_update_bits(tve->regmap, TVE_COM_CONF_REG,
 +                                       TVE_IPU_CLK_EN | TVE_EN, 0);
 +              clk_disable_unprepare(tve->clk);
 +      }
 +}
 +
 +static int tve_setup_tvout(struct imx_tve *tve)
 +{
 +      return -ENOTSUPP;
 +}
 +
 +static int tve_setup_vga(struct imx_tve *tve)
 +{
 +      unsigned int mask;
 +      unsigned int val;
 +      int ret;
 +
 +      /* set gain to (1 + 10/128) to provide 0.7V peak-to-peak amplitude */
 +      ret = regmap_update_bits(tve->regmap, TVE_TVDAC0_CONT_REG,
 +                               TVE_TVDAC_GAIN_MASK, 0x0a);
 +      ret = regmap_update_bits(tve->regmap, TVE_TVDAC1_CONT_REG,
 +                               TVE_TVDAC_GAIN_MASK, 0x0a);
 +      ret = regmap_update_bits(tve->regmap, TVE_TVDAC2_CONT_REG,
 +                               TVE_TVDAC_GAIN_MASK, 0x0a);
 +
 +      /* set configuration register */
 +      mask = TVE_DATA_SOURCE_MASK | TVE_INP_VIDEO_FORM;
 +      val  = TVE_DATA_SOURCE_BUS2 | TVE_INP_YCBCR_444;
 +      mask |= TVE_TV_STAND_MASK       | TVE_P2I_CONV_EN;
 +      val  |= TVE_TV_STAND_HD_1080P30 | 0;
 +      mask |= TVE_TV_OUT_MODE_MASK | TVE_SYNC_CH_0_EN;
 +      val  |= TVE_TV_OUT_RGB       | TVE_SYNC_CH_0_EN;
 +      ret = regmap_update_bits(tve->regmap, TVE_COM_CONF_REG, mask, val);
 +      if (ret < 0) {
 +              dev_err(tve->dev, "failed to set configuration: %d\n", ret);
 +              return ret;
 +      }
 +
 +      /* set test mode (as documented) */
 +      ret = regmap_update_bits(tve->regmap, TVE_TST_MODE_REG,
 +                               TVE_TVDAC_TEST_MODE_MASK, 1);
 +
 +      return 0;
 +}
 +
 +static enum drm_connector_status imx_tve_connector_detect(
 +                              struct drm_connector *connector, bool force)
 +{
 +      return connector_status_connected;
 +}
 +
 +static int imx_tve_connector_get_modes(struct drm_connector *connector)
 +{
 +      struct imx_tve *tve = con_to_tve(connector);
 +      struct edid *edid;
 +      int ret = 0;
 +
 +      if (!tve->ddc)
 +              return 0;
 +
 +      edid = drm_get_edid(connector, tve->ddc);
 +      if (edid) {
 +              drm_mode_connector_update_edid_property(connector, edid);
 +              ret = drm_add_edid_modes(connector, edid);
 +              kfree(edid);
 +      }
 +
 +      return ret;
 +}
 +
 +static int imx_tve_connector_mode_valid(struct drm_connector *connector,
 +                                      struct drm_display_mode *mode)
 +{
 +      struct imx_tve *tve = con_to_tve(connector);
 +      unsigned long rate;
 +
 +      /* pixel clock with 2x oversampling */
 +      rate = clk_round_rate(tve->clk, 2000UL * mode->clock) / 2000;
 +      if (rate == mode->clock)
 +              return MODE_OK;
 +
 +      /* pixel clock without oversampling */
 +      rate = clk_round_rate(tve->clk, 1000UL * mode->clock) / 1000;
 +      if (rate == mode->clock)
 +              return MODE_OK;
 +
 +      dev_warn(tve->dev, "ignoring mode %dx%d\n",
 +               mode->hdisplay, mode->vdisplay);
 +
 +      return MODE_BAD;
 +}
 +
 +static struct drm_encoder *imx_tve_connector_best_encoder(
 +              struct drm_connector *connector)
 +{
 +      struct imx_tve *tve = con_to_tve(connector);
 +
 +      return &tve->encoder;
 +}
 +
 +static void imx_tve_encoder_dpms(struct drm_encoder *encoder, int mode)
 +{
 +      struct imx_tve *tve = enc_to_tve(encoder);
 +      int ret;
 +
 +      ret = regmap_update_bits(tve->regmap, TVE_COM_CONF_REG,
 +                               TVE_TV_OUT_MODE_MASK, TVE_TV_OUT_DISABLE);
 +      if (ret < 0)
 +              dev_err(tve->dev, "failed to disable TVOUT: %d\n", ret);
 +}
 +
 +static bool imx_tve_encoder_mode_fixup(struct drm_encoder *encoder,
 +                                     const struct drm_display_mode *mode,
 +                                     struct drm_display_mode *adjusted_mode)
 +{
 +      return true;
 +}
 +
 +static void imx_tve_encoder_prepare(struct drm_encoder *encoder)
 +{
 +      struct imx_tve *tve = enc_to_tve(encoder);
 +
 +      tve_disable(tve);
 +
 +      switch (tve->mode) {
 +      case TVE_MODE_VGA:
 +              imx_drm_panel_format_pins(encoder, IPU_PIX_FMT_GBR24,
 +                              tve->hsync_pin, tve->vsync_pin);
 +              break;
 +      case TVE_MODE_TVOUT:
 +              imx_drm_panel_format(encoder, V4L2_PIX_FMT_YUV444);
 +              break;
 +      }
 +}
 +
 +static void imx_tve_encoder_mode_set(struct drm_encoder *encoder,
 +                                   struct drm_display_mode *mode,
 +                                   struct drm_display_mode *adjusted_mode)
 +{
 +      struct imx_tve *tve = enc_to_tve(encoder);
 +      unsigned long rounded_rate;
 +      unsigned long rate;
 +      int div = 1;
 +      int ret;
 +
 +      /*
 +       * FIXME
 +       * we should try 4k * mode->clock first,
 +       * and enable 4x oversampling for lower resolutions
 +       */
 +      rate = 2000UL * mode->clock;
 +      clk_set_rate(tve->clk, rate);
 +      rounded_rate = clk_get_rate(tve->clk);
 +      if (rounded_rate >= rate)
 +              div = 2;
 +      clk_set_rate(tve->di_clk, rounded_rate / div);
 +
 +      ret = clk_set_parent(tve->di_sel_clk, tve->di_clk);
 +      if (ret < 0) {
 +              dev_err(tve->dev, "failed to set di_sel parent to tve_di: %d\n",
 +                      ret);
 +      }
 +
 +      if (tve->mode == TVE_MODE_VGA)
 +              tve_setup_vga(tve);
 +      else
 +              tve_setup_tvout(tve);
 +}
 +
 +static void imx_tve_encoder_commit(struct drm_encoder *encoder)
 +{
 +      struct imx_tve *tve = enc_to_tve(encoder);
 +
 +      tve_enable(tve);
 +}
 +
 +static void imx_tve_encoder_disable(struct drm_encoder *encoder)
 +{
 +      struct imx_tve *tve = enc_to_tve(encoder);
 +
 +      tve_disable(tve);
 +}
 +
 +static struct drm_connector_funcs imx_tve_connector_funcs = {
 +      .dpms = drm_helper_connector_dpms,
 +      .fill_modes = drm_helper_probe_single_connector_modes,
 +      .detect = imx_tve_connector_detect,
 +      .destroy = imx_drm_connector_destroy,
 +};
 +
 +static struct drm_connector_helper_funcs imx_tve_connector_helper_funcs = {
 +      .get_modes = imx_tve_connector_get_modes,
 +      .best_encoder = imx_tve_connector_best_encoder,
 +      .mode_valid = imx_tve_connector_mode_valid,
 +};
 +
 +static struct drm_encoder_funcs imx_tve_encoder_funcs = {
 +      .destroy = imx_drm_encoder_destroy,
 +};
 +
 +static struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = {
 +      .dpms = imx_tve_encoder_dpms,
 +      .mode_fixup = imx_tve_encoder_mode_fixup,
 +      .prepare = imx_tve_encoder_prepare,
 +      .mode_set = imx_tve_encoder_mode_set,
 +      .commit = imx_tve_encoder_commit,
 +      .disable = imx_tve_encoder_disable,
 +};
 +
 +static irqreturn_t imx_tve_irq_handler(int irq, void *data)
 +{
 +      struct imx_tve *tve = data;
 +      unsigned int val;
 +
 +      regmap_read(tve->regmap, TVE_STAT_REG, &val);
 +
 +      /* clear interrupt status register */
 +      regmap_write(tve->regmap, TVE_STAT_REG, 0xffffffff);
 +
 +      return IRQ_HANDLED;
 +}
 +
 +static unsigned long clk_tve_di_recalc_rate(struct clk_hw *hw,
 +                                          unsigned long parent_rate)
 +{
 +      struct imx_tve *tve = container_of(hw, struct imx_tve, clk_hw_di);
 +      unsigned int val;
 +      int ret;
 +
 +      ret = regmap_read(tve->regmap, TVE_COM_CONF_REG, &val);
 +      if (ret < 0)
 +              return 0;
 +
 +      switch (val & TVE_DAC_SAMP_RATE_MASK) {
 +      case TVE_DAC_DIV4_RATE:
 +              return parent_rate / 4;
 +      case TVE_DAC_DIV2_RATE:
 +              return parent_rate / 2;
 +      case TVE_DAC_FULL_RATE:
 +      default:
 +              return parent_rate;
 +      }
 +
 +      return 0;
 +}
 +
 +static long clk_tve_di_round_rate(struct clk_hw *hw, unsigned long rate,
 +                                unsigned long *prate)
 +{
 +      unsigned long div;
 +
 +      div = *prate / rate;
 +      if (div >= 4)
 +              return *prate / 4;
 +      else if (div >= 2)
 +              return *prate / 2;
 +      return *prate;
 +}
 +
 +static int clk_tve_di_set_rate(struct clk_hw *hw, unsigned long rate,
 +                             unsigned long parent_rate)
 +{
 +      struct imx_tve *tve = container_of(hw, struct imx_tve, clk_hw_di);
 +      unsigned long div;
 +      u32 val;
 +      int ret;
 +
 +      div = parent_rate / rate;
 +      if (div >= 4)
 +              val = TVE_DAC_DIV4_RATE;
 +      else if (div >= 2)
 +              val = TVE_DAC_DIV2_RATE;
 +      else
 +              val = TVE_DAC_FULL_RATE;
 +
 +      ret = regmap_update_bits(tve->regmap, TVE_COM_CONF_REG,
 +                               TVE_DAC_SAMP_RATE_MASK, val);
 +
 +      if (ret < 0) {
 +              dev_err(tve->dev, "failed to set divider: %d\n", ret);
 +              return ret;
 +      }
 +
 +      return 0;
 +}
 +
 +static struct clk_ops clk_tve_di_ops = {
 +      .round_rate = clk_tve_di_round_rate,
 +      .set_rate = clk_tve_di_set_rate,
 +      .recalc_rate = clk_tve_di_recalc_rate,
 +};
 +
 +static int tve_clk_init(struct imx_tve *tve, void __iomem *base)
 +{
 +      const char *tve_di_parent[1];
 +      struct clk_init_data init = {
 +              .name = "tve_di",
 +              .ops = &clk_tve_di_ops,
 +              .num_parents = 1,
 +              .flags = 0,
 +      };
 +
 +      tve_di_parent[0] = __clk_get_name(tve->clk);
 +      init.parent_names = (const char **)&tve_di_parent;
 +
 +      tve->clk_hw_di.init = &init;
 +      tve->di_clk = clk_register(tve->dev, &tve->clk_hw_di);
 +      if (IS_ERR(tve->di_clk)) {
 +              dev_err(tve->dev, "failed to register TVE output clock: %ld\n",
 +                      PTR_ERR(tve->di_clk));
 +              return PTR_ERR(tve->di_clk);
 +      }
 +
 +      return 0;
 +}
 +
 +static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)
 +{
 +      int encoder_type;
 +      int ret;
 +
 +      encoder_type = tve->mode == TVE_MODE_VGA ?
 +                              DRM_MODE_ENCODER_DAC : DRM_MODE_ENCODER_TVDAC;
 +
 +      ret = imx_drm_encoder_parse_of(drm, &tve->encoder,
 +                                     tve->dev->of_node);
 +      if (ret)
 +              return ret;
 +
 +      drm_encoder_helper_add(&tve->encoder, &imx_tve_encoder_helper_funcs);
 +      drm_encoder_init(drm, &tve->encoder, &imx_tve_encoder_funcs,
 +                       encoder_type);
 +
 +      drm_connector_helper_add(&tve->connector,
 +                      &imx_tve_connector_helper_funcs);
 +      drm_connector_init(drm, &tve->connector, &imx_tve_connector_funcs,
 +                         DRM_MODE_CONNECTOR_VGA);
 +
 +      drm_mode_connector_attach_encoder(&tve->connector, &tve->encoder);
 +
 +      return 0;
 +}
 +
 +static bool imx_tve_readable_reg(struct device *dev, unsigned int reg)
 +{
 +      return (reg % 4 == 0) && (reg <= 0xdc);
 +}
 +
 +static struct regmap_config tve_regmap_config = {
 +      .reg_bits = 32,
 +      .val_bits = 32,
 +      .reg_stride = 4,
 +
 +      .readable_reg = imx_tve_readable_reg,
 +
 +      .lock = tve_lock,
 +      .unlock = tve_unlock,
 +
 +      .max_register = 0xdc,
 +};
 +
 +static const char * const imx_tve_modes[] = {
 +      [TVE_MODE_TVOUT]  = "tvout",
 +      [TVE_MODE_VGA] = "vga",
 +};
 +
 +static const int of_get_tve_mode(struct device_node *np)
 +{
 +      const char *bm;
 +      int ret, i;
 +
 +      ret = of_property_read_string(np, "fsl,tve-mode", &bm);
 +      if (ret < 0)
 +              return ret;
 +
 +      for (i = 0; i < ARRAY_SIZE(imx_tve_modes); i++)
 +              if (!strcasecmp(bm, imx_tve_modes[i]))
 +                      return i;
 +
 +      return -EINVAL;
 +}
 +
 +static int imx_tve_bind(struct device *dev, struct device *master, void *data)
 +{
 +      struct platform_device *pdev = to_platform_device(dev);
 +      struct drm_device *drm = data;
 +      struct device_node *np = dev->of_node;
 +      struct device_node *ddc_node;
 +      struct imx_tve *tve;
 +      struct resource *res;
 +      void __iomem *base;
 +      unsigned int val;
 +      int irq;
 +      int ret;
 +
 +      tve = devm_kzalloc(dev, sizeof(*tve), GFP_KERNEL);
 +      if (!tve)
 +              return -ENOMEM;
 +
 +      tve->dev = dev;
 +      spin_lock_init(&tve->lock);
 +
 +      ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0);
 +      if (ddc_node) {
 +              tve->ddc = of_find_i2c_adapter_by_node(ddc_node);
 +              of_node_put(ddc_node);
 +      }
 +
 +      tve->mode = of_get_tve_mode(np);
 +      if (tve->mode != TVE_MODE_VGA) {
 +              dev_err(dev, "only VGA mode supported, currently\n");
 +              return -EINVAL;
 +      }
 +
 +      if (tve->mode == TVE_MODE_VGA) {
 +              ret = of_property_read_u32(np, "fsl,hsync-pin",
 +                                         &tve->hsync_pin);
 +
 +              if (ret < 0) {
 +                      dev_err(dev, "failed to get vsync pin\n");
 +                      return ret;
 +              }
 +
 +              ret |= of_property_read_u32(np, "fsl,vsync-pin",
 +                                          &tve->vsync_pin);
 +
 +              if (ret < 0) {
 +                      dev_err(dev, "failed to get vsync pin\n");
 +                      return ret;
 +              }
 +      }
 +
 +      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 +      base = devm_ioremap_resource(dev, res);
 +      if (IS_ERR(base))
 +              return PTR_ERR(base);
 +
 +      tve_regmap_config.lock_arg = tve;
 +      tve->regmap = devm_regmap_init_mmio_clk(dev, "tve", base,
 +                                              &tve_regmap_config);
 +      if (IS_ERR(tve->regmap)) {
 +              dev_err(dev, "failed to init regmap: %ld\n",
 +                      PTR_ERR(tve->regmap));
 +              return PTR_ERR(tve->regmap);
 +      }
 +
 +      irq = platform_get_irq(pdev, 0);
 +      if (irq < 0) {
 +              dev_err(dev, "failed to get irq\n");
 +              return irq;
 +      }
 +
 +      ret = devm_request_threaded_irq(dev, irq, NULL,
 +                                      imx_tve_irq_handler, IRQF_ONESHOT,
 +                                      "imx-tve", tve);
 +      if (ret < 0) {
 +              dev_err(dev, "failed to request irq: %d\n", ret);
 +              return ret;
 +      }
 +
 +      tve->dac_reg = devm_regulator_get(dev, "dac");
 +      if (!IS_ERR(tve->dac_reg)) {
 +              regulator_set_voltage(tve->dac_reg, 2750000, 2750000);
 +              ret = regulator_enable(tve->dac_reg);
 +              if (ret)
 +                      return ret;
 +      }
 +
 +      tve->clk = devm_clk_get(dev, "tve");
 +      if (IS_ERR(tve->clk)) {
 +              dev_err(dev, "failed to get high speed tve clock: %ld\n",
 +                      PTR_ERR(tve->clk));
 +              return PTR_ERR(tve->clk);
 +      }
 +
 +      /* this is the IPU DI clock input selector, can be parented to tve_di */
 +      tve->di_sel_clk = devm_clk_get(dev, "di_sel");
 +      if (IS_ERR(tve->di_sel_clk)) {
 +              dev_err(dev, "failed to get ipu di mux clock: %ld\n",
 +                      PTR_ERR(tve->di_sel_clk));
 +              return PTR_ERR(tve->di_sel_clk);
 +      }
 +
 +      ret = tve_clk_init(tve, base);
 +      if (ret < 0)
 +              return ret;
 +
 +      ret = regmap_read(tve->regmap, TVE_COM_CONF_REG, &val);
 +      if (ret < 0) {
++              dev_err(dev, "failed to read configuration register: %d\n",
++                      ret);
 +              return ret;
 +      }
 +      if (val != 0x00100000) {
 +              dev_err(dev, "configuration register default value indicates this is not a TVEv2\n");
 +              return -ENODEV;
 +      }
 +
 +      /* disable cable detection for VGA mode */
 +      ret = regmap_write(tve->regmap, TVE_CD_CONT_REG, 0);
 +
 +      ret = imx_tve_register(drm, tve);
 +      if (ret)
 +              return ret;
 +
 +      dev_set_drvdata(dev, tve);
 +
 +      return 0;
 +}
 +
 +static void imx_tve_unbind(struct device *dev, struct device *master,
 +      void *data)
 +{
 +      struct imx_tve *tve = dev_get_drvdata(dev);
 +
 +      tve->connector.funcs->destroy(&tve->connector);
 +      tve->encoder.funcs->destroy(&tve->encoder);
 +
 +      if (!IS_ERR(tve->dac_reg))
 +              regulator_disable(tve->dac_reg);
 +}
 +
 +static const struct component_ops imx_tve_ops = {
 +      .bind   = imx_tve_bind,
 +      .unbind = imx_tve_unbind,
 +};
 +
 +static int imx_tve_probe(struct platform_device *pdev)
 +{
 +      return component_add(&pdev->dev, &imx_tve_ops);
 +}
 +
 +static int imx_tve_remove(struct platform_device *pdev)
 +{
 +      component_del(&pdev->dev, &imx_tve_ops);
 +      return 0;
 +}
 +
 +static const struct of_device_id imx_tve_dt_ids[] = {
 +      { .compatible = "fsl,imx53-tve", },
 +      { /* sentinel */ }
 +};
 +
 +static struct platform_driver imx_tve_driver = {
 +      .probe          = imx_tve_probe,
 +      .remove         = imx_tve_remove,
 +      .driver         = {
 +              .of_match_table = imx_tve_dt_ids,
 +              .name   = "imx-tve",
 +      },
 +};
 +
 +module_platform_driver(imx_tve_driver);
 +
 +MODULE_DESCRIPTION("i.MX Television Encoder driver");
 +MODULE_AUTHOR("Philipp Zabel, Pengutronix");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:imx-tve");
index 11e84a2517733170c03419bc408e66f9778ea062,0000000000000000000000000000000000000000..ebee59cb96d8a3f1fa8ab831341b3babc63f452a
mode 100644,000000..100644
--- /dev/null
@@@ -1,518 -1,0 +1,513 @@@
-  *
-  * 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.
 +/*
 + * i.MX IPUv3 Graphics driver
 + *
 + * Copyright (C) 2011 Sascha Hauer, Pengutronix
 + *
 + * 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 the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + * This program is distributed in the hope that it will be useful,
 + * 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.
 + */
 +#include <linux/component.h>
 +#include <linux/module.h>
 +#include <linux/export.h>
 +#include <linux/device.h>
 +#include <linux/platform_device.h>
 +#include <drm/drmP.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <linux/fb.h>
 +#include <linux/clk.h>
 +#include <linux/errno.h>
 +#include <drm/drm_gem_cma_helper.h>
 +#include <drm/drm_fb_cma_helper.h>
 +
 +#include <video/imx-ipu-v3.h>
 +#include "imx-drm.h"
 +#include "ipuv3-plane.h"
 +
 +#define DRIVER_DESC           "i.MX IPUv3 Graphics"
 +
 +struct ipu_crtc {
 +      struct device           *dev;
 +      struct drm_crtc         base;
 +      struct imx_drm_crtc     *imx_crtc;
 +
 +      /* plane[0] is the full plane, plane[1] is the partial plane */
 +      struct ipu_plane        *plane[2];
 +
 +      struct ipu_dc           *dc;
 +      struct ipu_di           *di;
 +      int                     enabled;
 +      struct drm_pending_vblank_event *page_flip_event;
 +      struct drm_framebuffer  *newfb;
 +      int                     irq;
 +      u32                     interface_pix_fmt;
 +      unsigned long           di_clkflags;
 +      int                     di_hsync_pin;
 +      int                     di_vsync_pin;
 +};
 +
 +#define to_ipu_crtc(x) container_of(x, struct ipu_crtc, base)
 +
 +static void ipu_fb_enable(struct ipu_crtc *ipu_crtc)
 +{
 +      struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);
 +
 +      if (ipu_crtc->enabled)
 +              return;
 +
 +      ipu_dc_enable(ipu);
 +      ipu_plane_enable(ipu_crtc->plane[0]);
 +      /* Start DC channel and DI after IDMAC */
 +      ipu_dc_enable_channel(ipu_crtc->dc);
 +      ipu_di_enable(ipu_crtc->di);
 +
 +      ipu_crtc->enabled = 1;
 +}
 +
 +static void ipu_fb_disable(struct ipu_crtc *ipu_crtc)
 +{
 +      struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);
 +
 +      if (!ipu_crtc->enabled)
 +              return;
 +
 +      /* Stop DC channel and DI before IDMAC */
 +      ipu_dc_disable_channel(ipu_crtc->dc);
 +      ipu_di_disable(ipu_crtc->di);
 +      ipu_plane_disable(ipu_crtc->plane[0]);
 +      ipu_dc_disable(ipu);
 +
 +      ipu_crtc->enabled = 0;
 +}
 +
 +static void ipu_crtc_dpms(struct drm_crtc *crtc, int mode)
 +{
 +      struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 +
 +      dev_dbg(ipu_crtc->dev, "%s mode: %d\n", __func__, mode);
 +
 +      switch (mode) {
 +      case DRM_MODE_DPMS_ON:
 +              ipu_fb_enable(ipu_crtc);
 +              break;
 +      case DRM_MODE_DPMS_STANDBY:
 +      case DRM_MODE_DPMS_SUSPEND:
 +      case DRM_MODE_DPMS_OFF:
 +              ipu_fb_disable(ipu_crtc);
 +              break;
 +      }
 +}
 +
 +static int ipu_page_flip(struct drm_crtc *crtc,
 +              struct drm_framebuffer *fb,
 +              struct drm_pending_vblank_event *event,
 +              uint32_t page_flip_flags)
 +{
 +      struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 +      int ret;
 +
 +      if (ipu_crtc->newfb)
 +              return -EBUSY;
 +
 +      ret = imx_drm_crtc_vblank_get(ipu_crtc->imx_crtc);
 +      if (ret) {
 +              dev_dbg(ipu_crtc->dev, "failed to acquire vblank counter\n");
 +              list_del(&event->base.link);
 +
 +              return ret;
 +      }
 +
 +      ipu_crtc->newfb = fb;
 +      ipu_crtc->page_flip_event = event;
 +      crtc->primary->fb = fb;
 +
 +      return 0;
 +}
 +
 +static const struct drm_crtc_funcs ipu_crtc_funcs = {
 +      .set_config = drm_crtc_helper_set_config,
 +      .destroy = drm_crtc_cleanup,
 +      .page_flip = ipu_page_flip,
 +};
 +
 +static int ipu_crtc_mode_set(struct drm_crtc *crtc,
 +                             struct drm_display_mode *orig_mode,
 +                             struct drm_display_mode *mode,
 +                             int x, int y,
 +                             struct drm_framebuffer *old_fb)
 +{
 +      struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 +      int ret;
 +      struct ipu_di_signal_cfg sig_cfg = {};
 +      u32 out_pixel_fmt;
 +
 +      dev_dbg(ipu_crtc->dev, "%s: mode->hdisplay: %d\n", __func__,
 +                      mode->hdisplay);
 +      dev_dbg(ipu_crtc->dev, "%s: mode->vdisplay: %d\n", __func__,
 +                      mode->vdisplay);
 +
 +      out_pixel_fmt = ipu_crtc->interface_pix_fmt;
 +
 +      if (mode->flags & DRM_MODE_FLAG_INTERLACE)
 +              sig_cfg.interlaced = 1;
 +      if (mode->flags & DRM_MODE_FLAG_PHSYNC)
 +              sig_cfg.Hsync_pol = 1;
 +      if (mode->flags & DRM_MODE_FLAG_PVSYNC)
 +              sig_cfg.Vsync_pol = 1;
 +
 +      sig_cfg.enable_pol = 1;
 +      sig_cfg.clk_pol = 0;
 +      sig_cfg.width = mode->hdisplay;
 +      sig_cfg.height = mode->vdisplay;
 +      sig_cfg.pixel_fmt = out_pixel_fmt;
 +      sig_cfg.h_start_width = mode->htotal - mode->hsync_end;
 +      sig_cfg.h_sync_width = mode->hsync_end - mode->hsync_start;
 +      sig_cfg.h_end_width = mode->hsync_start - mode->hdisplay;
 +
 +      sig_cfg.v_start_width = mode->vtotal - mode->vsync_end;
 +      sig_cfg.v_sync_width = mode->vsync_end - mode->vsync_start;
 +      sig_cfg.v_end_width = mode->vsync_start - mode->vdisplay;
 +      sig_cfg.pixelclock = mode->clock * 1000;
 +      sig_cfg.clkflags = ipu_crtc->di_clkflags;
 +
 +      sig_cfg.v_to_h_sync = 0;
 +
 +      sig_cfg.hsync_pin = ipu_crtc->di_hsync_pin;
 +      sig_cfg.vsync_pin = ipu_crtc->di_vsync_pin;
 +
 +      ret = ipu_dc_init_sync(ipu_crtc->dc, ipu_crtc->di, sig_cfg.interlaced,
 +                      out_pixel_fmt, mode->hdisplay);
 +      if (ret) {
 +              dev_err(ipu_crtc->dev,
 +                              "initializing display controller failed with %d\n",
 +                              ret);
 +              return ret;
 +      }
 +
 +      ret = ipu_di_init_sync_panel(ipu_crtc->di, &sig_cfg);
 +      if (ret) {
 +              dev_err(ipu_crtc->dev,
 +                              "initializing panel failed with %d\n", ret);
 +              return ret;
 +      }
 +
 +      return ipu_plane_mode_set(ipu_crtc->plane[0], crtc, mode,
 +                                crtc->primary->fb,
 +                                0, 0, mode->hdisplay, mode->vdisplay,
 +                                x, y, mode->hdisplay, mode->vdisplay);
 +}
 +
 +static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc)
 +{
 +      unsigned long flags;
 +      struct drm_device *drm = ipu_crtc->base.dev;
 +
 +      spin_lock_irqsave(&drm->event_lock, flags);
 +      if (ipu_crtc->page_flip_event)
 +              drm_send_vblank_event(drm, -1, ipu_crtc->page_flip_event);
 +      ipu_crtc->page_flip_event = NULL;
 +      imx_drm_crtc_vblank_put(ipu_crtc->imx_crtc);
 +      spin_unlock_irqrestore(&drm->event_lock, flags);
 +}
 +
 +static irqreturn_t ipu_irq_handler(int irq, void *dev_id)
 +{
 +      struct ipu_crtc *ipu_crtc = dev_id;
 +
 +      imx_drm_handle_vblank(ipu_crtc->imx_crtc);
 +
 +      if (ipu_crtc->newfb) {
 +              struct ipu_plane *plane = ipu_crtc->plane[0];
 +
 +              ipu_crtc->newfb = NULL;
 +              ipu_plane_set_base(plane, ipu_crtc->base.primary->fb,
 +                                 plane->x, plane->y);
 +              ipu_crtc_handle_pageflip(ipu_crtc);
 +      }
 +
 +      return IRQ_HANDLED;
 +}
 +
 +static bool ipu_crtc_mode_fixup(struct drm_crtc *crtc,
 +                                const struct drm_display_mode *mode,
 +                                struct drm_display_mode *adjusted_mode)
 +{
 +      return true;
 +}
 +
 +static void ipu_crtc_prepare(struct drm_crtc *crtc)
 +{
 +      struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 +
 +      ipu_fb_disable(ipu_crtc);
 +}
 +
 +static void ipu_crtc_commit(struct drm_crtc *crtc)
 +{
 +      struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 +
 +      ipu_fb_enable(ipu_crtc);
 +}
 +
 +static struct drm_crtc_helper_funcs ipu_helper_funcs = {
 +      .dpms = ipu_crtc_dpms,
 +      .mode_fixup = ipu_crtc_mode_fixup,
 +      .mode_set = ipu_crtc_mode_set,
 +      .prepare = ipu_crtc_prepare,
 +      .commit = ipu_crtc_commit,
 +};
 +
 +static int ipu_enable_vblank(struct drm_crtc *crtc)
 +{
 +      return 0;
 +}
 +
 +static void ipu_disable_vblank(struct drm_crtc *crtc)
 +{
 +      struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 +
 +      ipu_crtc->page_flip_event = NULL;
 +      ipu_crtc->newfb = NULL;
 +}
 +
 +static int ipu_set_interface_pix_fmt(struct drm_crtc *crtc, u32 encoder_type,
 +              u32 pixfmt, int hsync_pin, int vsync_pin)
 +{
 +      struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 +
 +      ipu_crtc->interface_pix_fmt = pixfmt;
 +      ipu_crtc->di_hsync_pin = hsync_pin;
 +      ipu_crtc->di_vsync_pin = vsync_pin;
 +
 +      switch (encoder_type) {
 +      case DRM_MODE_ENCODER_DAC:
 +      case DRM_MODE_ENCODER_TVDAC:
 +      case DRM_MODE_ENCODER_LVDS:
 +              ipu_crtc->di_clkflags = IPU_DI_CLKMODE_SYNC |
 +                      IPU_DI_CLKMODE_EXT;
 +              break;
 +      case DRM_MODE_ENCODER_TMDS:
 +      case DRM_MODE_ENCODER_NONE:
 +              ipu_crtc->di_clkflags = 0;
 +              break;
 +      }
 +
 +      return 0;
 +}
 +
 +static const struct imx_drm_crtc_helper_funcs ipu_crtc_helper_funcs = {
 +      .enable_vblank = ipu_enable_vblank,
 +      .disable_vblank = ipu_disable_vblank,
 +      .set_interface_pix_fmt = ipu_set_interface_pix_fmt,
 +      .crtc_funcs = &ipu_crtc_funcs,
 +      .crtc_helper_funcs = &ipu_helper_funcs,
 +};
 +
 +static void ipu_put_resources(struct ipu_crtc *ipu_crtc)
 +{
 +      if (!IS_ERR_OR_NULL(ipu_crtc->dc))
 +              ipu_dc_put(ipu_crtc->dc);
 +      if (!IS_ERR_OR_NULL(ipu_crtc->di))
 +              ipu_di_put(ipu_crtc->di);
 +}
 +
 +static int ipu_get_resources(struct ipu_crtc *ipu_crtc,
 +              struct ipu_client_platformdata *pdata)
 +{
 +      struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);
 +      int ret;
 +
 +      ipu_crtc->dc = ipu_dc_get(ipu, pdata->dc);
 +      if (IS_ERR(ipu_crtc->dc)) {
 +              ret = PTR_ERR(ipu_crtc->dc);
 +              goto err_out;
 +      }
 +
 +      ipu_crtc->di = ipu_di_get(ipu, pdata->di);
 +      if (IS_ERR(ipu_crtc->di)) {
 +              ret = PTR_ERR(ipu_crtc->di);
 +              goto err_out;
 +      }
 +
 +      return 0;
 +err_out:
 +      ipu_put_resources(ipu_crtc);
 +
 +      return ret;
 +}
 +
 +static int ipu_crtc_init(struct ipu_crtc *ipu_crtc,
 +      struct ipu_client_platformdata *pdata, struct drm_device *drm)
 +{
 +      struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);
 +      int dp = -EINVAL;
 +      int ret;
 +      int id;
 +
 +      ret = ipu_get_resources(ipu_crtc, pdata);
 +      if (ret) {
 +              dev_err(ipu_crtc->dev, "getting resources failed with %d.\n",
 +                              ret);
 +              return ret;
 +      }
 +
 +      ret = imx_drm_add_crtc(drm, &ipu_crtc->base, &ipu_crtc->imx_crtc,
 +                      &ipu_crtc_helper_funcs, ipu_crtc->dev->of_node);
 +      if (ret) {
 +              dev_err(ipu_crtc->dev, "adding crtc failed with %d.\n", ret);
 +              goto err_put_resources;
 +      }
 +
 +      if (pdata->dp >= 0)
 +              dp = IPU_DP_FLOW_SYNC_BG;
 +      id = imx_drm_crtc_id(ipu_crtc->imx_crtc);
 +      ipu_crtc->plane[0] = ipu_plane_init(ipu_crtc->base.dev, ipu,
 +                                          pdata->dma[0], dp, BIT(id), true);
 +      ret = ipu_plane_get_resources(ipu_crtc->plane[0]);
 +      if (ret) {
 +              dev_err(ipu_crtc->dev, "getting plane 0 resources failed with %d.\n",
 +                      ret);
 +              goto err_remove_crtc;
 +      }
 +
 +      /* If this crtc is using the DP, add an overlay plane */
 +      if (pdata->dp >= 0 && pdata->dma[1] > 0) {
 +              ipu_crtc->plane[1] = ipu_plane_init(ipu_crtc->base.dev, ipu,
 +                                                  pdata->dma[1],
 +                                                  IPU_DP_FLOW_SYNC_FG,
 +                                                  BIT(id), false);
 +              if (IS_ERR(ipu_crtc->plane[1]))
 +                      ipu_crtc->plane[1] = NULL;
 +      }
 +
 +      ipu_crtc->irq = ipu_plane_irq(ipu_crtc->plane[0]);
 +      ret = devm_request_irq(ipu_crtc->dev, ipu_crtc->irq, ipu_irq_handler, 0,
 +                      "imx_drm", ipu_crtc);
 +      if (ret < 0) {
 +              dev_err(ipu_crtc->dev, "irq request failed with %d.\n", ret);
 +              goto err_put_plane_res;
 +      }
 +
 +      return 0;
 +
 +err_put_plane_res:
 +      ipu_plane_put_resources(ipu_crtc->plane[0]);
 +err_remove_crtc:
 +      imx_drm_remove_crtc(ipu_crtc->imx_crtc);
 +err_put_resources:
 +      ipu_put_resources(ipu_crtc);
 +
 +      return ret;
 +}
 +
 +static struct device_node *ipu_drm_get_port_by_id(struct device_node *parent,
 +                                                int port_id)
 +{
 +      struct device_node *port;
 +      int id, ret;
 +
 +      port = of_get_child_by_name(parent, "port");
 +      while (port) {
 +              ret = of_property_read_u32(port, "reg", &id);
 +              if (!ret && id == port_id)
 +                      return port;
 +
 +              do {
 +                      port = of_get_next_child(parent, port);
 +                      if (!port)
 +                              return NULL;
 +              } while (of_node_cmp(port->name, "port"));
 +      }
 +
 +      return NULL;
 +}
 +
 +static int ipu_drm_bind(struct device *dev, struct device *master, void *data)
 +{
 +      struct ipu_client_platformdata *pdata = dev->platform_data;
 +      struct drm_device *drm = data;
 +      struct ipu_crtc *ipu_crtc;
 +      int ret;
 +
 +      ipu_crtc = devm_kzalloc(dev, sizeof(*ipu_crtc), GFP_KERNEL);
 +      if (!ipu_crtc)
 +              return -ENOMEM;
 +
 +      ipu_crtc->dev = dev;
 +
 +      ret = ipu_crtc_init(ipu_crtc, pdata, drm);
 +      if (ret)
 +              return ret;
 +
 +      dev_set_drvdata(dev, ipu_crtc);
 +
 +      return 0;
 +}
 +
 +static void ipu_drm_unbind(struct device *dev, struct device *master,
 +      void *data)
 +{
 +      struct ipu_crtc *ipu_crtc = dev_get_drvdata(dev);
 +
 +      imx_drm_remove_crtc(ipu_crtc->imx_crtc);
 +
 +      ipu_plane_put_resources(ipu_crtc->plane[0]);
 +      ipu_put_resources(ipu_crtc);
 +}
 +
 +static const struct component_ops ipu_crtc_ops = {
 +      .bind = ipu_drm_bind,
 +      .unbind = ipu_drm_unbind,
 +};
 +
 +static int ipu_drm_probe(struct platform_device *pdev)
 +{
 +      struct device *dev = &pdev->dev;
 +      struct ipu_client_platformdata *pdata = dev->platform_data;
 +      int ret;
 +
 +      if (!dev->platform_data)
 +              return -EINVAL;
 +
 +      if (!dev->of_node) {
 +              /* Associate crtc device with the corresponding DI port node */
 +              dev->of_node = ipu_drm_get_port_by_id(dev->parent->of_node,
 +                                                    pdata->di + 2);
 +              if (!dev->of_node) {
 +                      dev_err(dev, "missing port@%d node in %s\n",
 +                              pdata->di + 2, dev->parent->of_node->full_name);
 +                      return -ENODEV;
 +              }
 +      }
 +
 +      ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
 +      if (ret)
 +              return ret;
 +
 +      return component_add(dev, &ipu_crtc_ops);
 +}
 +
 +static int ipu_drm_remove(struct platform_device *pdev)
 +{
 +      component_del(&pdev->dev, &ipu_crtc_ops);
 +      return 0;
 +}
 +
 +static struct platform_driver ipu_drm_driver = {
 +      .driver = {
 +              .name = "imx-ipuv3-crtc",
 +      },
 +      .probe = ipu_drm_probe,
 +      .remove = ipu_drm_remove,
 +};
 +module_platform_driver(ipu_drm_driver);
 +
 +MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
 +MODULE_DESCRIPTION(DRIVER_DESC);
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:imx-ipuv3-crtc");
index 944962b692bb0c58a2e7f189fb7fc6897201e098,0000000000000000000000000000000000000000..6987e16fe99b03f507307beddbe2ed228d603b8d
mode 100644,000000..100644
--- /dev/null
@@@ -1,363 -1,0 +1,394 @@@
-       ipu_cpmem_set_stride(ipu_plane->ipu_ch, fb->pitches[0]);
 +/*
 + * i.MX IPUv3 DP Overlay Planes
 + *
 + * Copyright (C) 2013 Philipp Zabel, Pengutronix
 + *
 + * 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 the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + * This program is distributed in the hope that it will be useful,
 + * 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.
 + */
 +
 +#include <drm/drmP.h>
 +#include <drm/drm_fb_cma_helper.h>
 +#include <drm/drm_gem_cma_helper.h>
 +
 +#include "video/imx-ipu-v3.h"
 +#include "ipuv3-plane.h"
 +
 +#define to_ipu_plane(x)       container_of(x, struct ipu_plane, base)
 +
 +static const uint32_t ipu_plane_formats[] = {
 +      DRM_FORMAT_XRGB1555,
 +      DRM_FORMAT_XBGR1555,
 +      DRM_FORMAT_ARGB8888,
 +      DRM_FORMAT_XRGB8888,
 +      DRM_FORMAT_ABGR8888,
 +      DRM_FORMAT_XBGR8888,
 +      DRM_FORMAT_YUYV,
 +      DRM_FORMAT_YVYU,
 +      DRM_FORMAT_YUV420,
 +      DRM_FORMAT_YVU420,
 +};
 +
 +int ipu_plane_irq(struct ipu_plane *ipu_plane)
 +{
 +      return ipu_idmac_channel_irq(ipu_plane->ipu, ipu_plane->ipu_ch,
 +                                   IPU_IRQ_EOF);
 +}
 +
 +static int calc_vref(struct drm_display_mode *mode)
 +{
 +      unsigned long htotal, vtotal;
 +
 +      htotal = mode->htotal;
 +      vtotal = mode->vtotal;
 +
 +      if (!htotal || !vtotal)
 +              return 60;
 +
 +      return DIV_ROUND_UP(mode->clock * 1000, vtotal * htotal);
 +}
 +
 +static inline int calc_bandwidth(int width, int height, unsigned int vref)
 +{
 +      return width * height * vref;
 +}
 +
 +int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb,
 +                     int x, int y)
 +{
 +      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) {
 +              DRM_DEBUG_KMS("entry is null.\n");
 +              return -EFAULT;
 +      }
 +
 +      dev_dbg(ipu_plane->base.dev->dev, "phys = %pad, x = %d, y = %d",
 +              &cma_obj->paddr, x, y);
 +
-       ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 0, eba);
-       ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
 +      eba = cma_obj->paddr + fb->offsets[0] +
 +            fb->pitches[0] * y + (fb->bits_per_pixel >> 3) * x;
-               ipu_dp_set_global_alpha(ipu_plane->dp, 1, 0, 1);
++
++      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;
 +      ipu_plane->y = y;
 +
 +      return 0;
 +}
 +
 +int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
 +                     struct drm_display_mode *mode,
 +                     struct drm_framebuffer *fb, int crtc_x, int crtc_y,
 +                     unsigned int crtc_w, unsigned int crtc_h,
 +                     uint32_t src_x, uint32_t src_y,
 +                     uint32_t src_w, uint32_t src_h)
 +{
 +      struct device *dev = ipu_plane->base.dev->dev;
 +      int ret;
 +
 +      /* no scaling */
 +      if (src_w != crtc_w || src_h != crtc_h)
 +              return -EINVAL;
 +
 +      /* clip to crtc bounds */
 +      if (crtc_x < 0) {
 +              if (-crtc_x > crtc_w)
 +                      return -EINVAL;
 +              src_x += -crtc_x;
 +              src_w -= -crtc_x;
 +              crtc_w -= -crtc_x;
 +              crtc_x = 0;
 +      }
 +      if (crtc_y < 0) {
 +              if (-crtc_y > crtc_h)
 +                      return -EINVAL;
 +              src_y += -crtc_y;
 +              src_h -= -crtc_y;
 +              crtc_h -= -crtc_y;
 +              crtc_y = 0;
 +      }
 +      if (crtc_x + crtc_w > mode->hdisplay) {
 +              if (crtc_x > mode->hdisplay)
 +                      return -EINVAL;
 +              crtc_w = mode->hdisplay - crtc_x;
 +              src_w = crtc_w;
 +      }
 +      if (crtc_y + crtc_h > mode->vdisplay) {
 +              if (crtc_y > mode->vdisplay)
 +                      return -EINVAL;
 +              crtc_h = mode->vdisplay - crtc_y;
 +              src_h = crtc_h;
 +      }
 +      /* full plane minimum width is 13 pixels */
 +      if (crtc_w < 13 && (ipu_plane->dp_flow != IPU_DP_FLOW_SYNC_FG))
 +              return -EINVAL;
 +      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,
 +                              IPUV3_COLORSPACE_RGB,
 +                              IPUV3_COLORSPACE_RGB);
 +              if (ret) {
 +                      dev_err(dev,
 +                              "initializing display processor failed with %d\n",
 +                              ret);
 +                      return ret;
 +              }
-               break;
++              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);
++              /* 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);
 +      if (ret) {
 +              dev_err(dev, "initializing dmfc channel failed with %d\n", ret);
 +              return ret;
 +      }
 +
 +      ret = ipu_dmfc_alloc_bandwidth(ipu_plane->dmfc,
 +                      calc_bandwidth(crtc_w, crtc_h,
 +                                     calc_vref(mode)), 64);
 +      if (ret) {
 +              dev_err(dev, "allocating dmfc bandwidth failed with %d\n", ret);
 +              return ret;
 +      }
 +
 +      ipu_cpmem_zero(ipu_plane->ipu_ch);
 +      ipu_cpmem_set_resolution(ipu_plane->ipu_ch, src_w, src_h);
 +      ret = ipu_cpmem_set_fmt(ipu_plane->ipu_ch, fb->pixel_format);
 +      if (ret < 0) {
 +              dev_err(dev, "unsupported pixel format 0x%08x\n",
 +                      fb->pixel_format);
 +              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;
 +}
 +
 +void ipu_plane_put_resources(struct ipu_plane *ipu_plane)
 +{
 +      if (!IS_ERR_OR_NULL(ipu_plane->dp))
 +              ipu_dp_put(ipu_plane->dp);
 +      if (!IS_ERR_OR_NULL(ipu_plane->dmfc))
 +              ipu_dmfc_put(ipu_plane->dmfc);
 +      if (!IS_ERR_OR_NULL(ipu_plane->ipu_ch))
 +              ipu_idmac_put(ipu_plane->ipu_ch);
 +}
 +
 +int ipu_plane_get_resources(struct ipu_plane *ipu_plane)
 +{
 +      int ret;
 +
 +      ipu_plane->ipu_ch = ipu_idmac_get(ipu_plane->ipu, ipu_plane->dma);
 +      if (IS_ERR(ipu_plane->ipu_ch)) {
 +              ret = PTR_ERR(ipu_plane->ipu_ch);
 +              DRM_ERROR("failed to get idmac channel: %d\n", ret);
 +              return ret;
 +      }
 +
 +      ipu_plane->dmfc = ipu_dmfc_get(ipu_plane->ipu, ipu_plane->dma);
 +      if (IS_ERR(ipu_plane->dmfc)) {
 +              ret = PTR_ERR(ipu_plane->dmfc);
 +              DRM_ERROR("failed to get dmfc: ret %d\n", ret);
 +              goto err_out;
 +      }
 +
 +      if (ipu_plane->dp_flow >= 0) {
 +              ipu_plane->dp = ipu_dp_get(ipu_plane->ipu, ipu_plane->dp_flow);
 +              if (IS_ERR(ipu_plane->dp)) {
 +                      ret = PTR_ERR(ipu_plane->dp);
 +                      DRM_ERROR("failed to get dp flow: %d\n", ret);
 +                      goto err_out;
 +              }
 +      }
 +
 +      return 0;
 +err_out:
 +      ipu_plane_put_resources(ipu_plane);
 +
 +      return ret;
 +}
 +
 +void ipu_plane_enable(struct ipu_plane *ipu_plane)
 +{
 +      if (ipu_plane->dp)
 +              ipu_dp_enable(ipu_plane->ipu);
 +      ipu_dmfc_enable_channel(ipu_plane->dmfc);
 +      ipu_idmac_enable_channel(ipu_plane->ipu_ch);
 +      if (ipu_plane->dp)
 +              ipu_dp_enable_channel(ipu_plane->dp);
 +
 +      ipu_plane->enabled = true;
 +}
 +
 +void ipu_plane_disable(struct ipu_plane *ipu_plane)
 +{
 +      ipu_plane->enabled = false;
 +
 +      ipu_idmac_wait_busy(ipu_plane->ipu_ch, 50);
 +
 +      if (ipu_plane->dp)
 +              ipu_dp_disable_channel(ipu_plane->dp);
 +      ipu_idmac_disable_channel(ipu_plane->ipu_ch);
 +      ipu_dmfc_disable_channel(ipu_plane->dmfc);
 +      if (ipu_plane->dp)
 +              ipu_dp_disable(ipu_plane->ipu);
 +}
 +
 +/*
 + * drm_plane API
 + */
 +
 +static int ipu_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
 +                          struct drm_framebuffer *fb, int crtc_x, int crtc_y,
 +                          unsigned int crtc_w, unsigned int crtc_h,
 +                          uint32_t src_x, uint32_t src_y,
 +                          uint32_t src_w, uint32_t src_h)
 +{
 +      struct ipu_plane *ipu_plane = to_ipu_plane(plane);
 +      int ret = 0;
 +
 +      DRM_DEBUG_KMS("plane - %p\n", plane);
 +
 +      if (!ipu_plane->enabled)
 +              ret = ipu_plane_get_resources(ipu_plane);
 +      if (ret < 0)
 +              return ret;
 +
 +      ret = ipu_plane_mode_set(ipu_plane, crtc, &crtc->hwmode, fb,
 +                      crtc_x, crtc_y, crtc_w, crtc_h,
 +                      src_x >> 16, src_y >> 16, src_w >> 16, src_h >> 16);
 +      if (ret < 0) {
 +              ipu_plane_put_resources(ipu_plane);
 +              return ret;
 +      }
 +
 +      if (crtc != plane->crtc)
 +              dev_info(plane->dev->dev, "crtc change: %p -> %p\n",
 +                              plane->crtc, crtc);
 +      plane->crtc = crtc;
 +
 +      if (!ipu_plane->enabled)
 +              ipu_plane_enable(ipu_plane);
 +
 +      return 0;
 +}
 +
 +static int ipu_disable_plane(struct drm_plane *plane)
 +{
 +      struct ipu_plane *ipu_plane = to_ipu_plane(plane);
 +
 +      DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
 +
 +      if (ipu_plane->enabled)
 +              ipu_plane_disable(ipu_plane);
 +
 +      ipu_plane_put_resources(ipu_plane);
 +
 +      return 0;
 +}
 +
 +static void ipu_plane_destroy(struct drm_plane *plane)
 +{
 +      struct ipu_plane *ipu_plane = to_ipu_plane(plane);
 +
 +      DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
 +
 +      ipu_disable_plane(plane);
 +      drm_plane_cleanup(plane);
 +      kfree(ipu_plane);
 +}
 +
 +static struct drm_plane_funcs ipu_plane_funcs = {
 +      .update_plane   = ipu_update_plane,
 +      .disable_plane  = ipu_disable_plane,
 +      .destroy        = ipu_plane_destroy,
 +};
 +
 +struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
 +                               int dma, int dp, unsigned int possible_crtcs,
 +                               bool priv)
 +{
 +      struct ipu_plane *ipu_plane;
 +      int ret;
 +
 +      DRM_DEBUG_KMS("channel %d, dp flow %d, possible_crtcs=0x%x\n",
 +                    dma, dp, possible_crtcs);
 +
 +      ipu_plane = kzalloc(sizeof(*ipu_plane), GFP_KERNEL);
 +      if (!ipu_plane) {
 +              DRM_ERROR("failed to allocate plane\n");
 +              return ERR_PTR(-ENOMEM);
 +      }
 +
 +      ipu_plane->ipu = ipu;
 +      ipu_plane->dma = dma;
 +      ipu_plane->dp_flow = dp;
 +
 +      ret = drm_plane_init(dev, &ipu_plane->base, possible_crtcs,
 +                           &ipu_plane_funcs, ipu_plane_formats,
 +                           ARRAY_SIZE(ipu_plane_formats),
 +                           priv);
 +      if (ret) {
 +              DRM_ERROR("failed to initialize plane\n");
 +              kfree(ipu_plane);
 +              return ERR_PTR(ret);
 +      }
 +
 +      return ipu_plane;
 +}
index c0aae5bcb5d457e3e7f07cf5bca3de79878d719a,0000000000000000000000000000000000000000..af125fb40ef5c03736a94f2b98968f9cf9a87426
mode 100644,000000..100644
--- /dev/null
@@@ -1,55 -1,0 +1,57 @@@
 +#ifndef __IPUV3_PLANE_H__
 +#define __IPUV3_PLANE_H__
 +
 +#include <drm/drm_crtc.h> /* drm_plane */
 +
 +struct drm_plane;
 +struct drm_device;
 +struct ipu_soc;
 +struct drm_crtc;
 +struct drm_framebuffer;
 +
 +struct ipuv3_channel;
 +struct dmfc_channel;
 +struct ipu_dp;
 +
 +struct ipu_plane {
 +      struct drm_plane        base;
 +
 +      struct ipu_soc          *ipu;
 +      struct ipuv3_channel    *ipu_ch;
 +      struct dmfc_channel     *dmfc;
 +      struct ipu_dp           *dp;
 +
 +      int                     dma;
 +      int                     dp_flow;
 +
 +      int                     x;
 +      int                     y;
++      int                     w;
++      int                     h;
 +
 +      bool                    enabled;
 +};
 +
 +struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
 +                               int dma, int dp, unsigned int possible_crtcs,
 +                               bool priv);
 +
 +/* Init IDMAC, DMFC, DP */
 +int ipu_plane_mode_set(struct ipu_plane *plane, struct drm_crtc *crtc,
 +                     struct drm_display_mode *mode,
 +                     struct drm_framebuffer *fb, int crtc_x, int crtc_y,
 +                     unsigned int crtc_w, unsigned int crtc_h,
 +                     uint32_t src_x, uint32_t src_y, uint32_t src_w,
 +                     uint32_t src_h);
 +
 +void ipu_plane_enable(struct ipu_plane *plane);
 +void ipu_plane_disable(struct ipu_plane *plane);
 +int ipu_plane_set_base(struct ipu_plane *plane, struct drm_framebuffer *fb,
 +                     int x, int y);
 +
 +int ipu_plane_get_resources(struct ipu_plane *plane);
 +void ipu_plane_put_resources(struct ipu_plane *plane);
 +
 +int ipu_plane_irq(struct ipu_plane *plane);
 +
 +#endif
index 8a76a5c1c34bcb190b579ca351cdd79b03347926,0000000000000000000000000000000000000000..796c3c1c170a1136a22908825e49570e71d2cad5
mode 100644,000000..100644
--- /dev/null
@@@ -1,295 -1,0 +1,298 @@@
-  *
-  * 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.
 +/*
 + * i.MX drm driver - parallel display implementation
 + *
 + * Copyright (C) 2012 Sascha Hauer, Pengutronix
 + *
 + * 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 the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + * This program is distributed in the hope that it will be useful,
 + * 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.
 + */
 +
 +#include <linux/component.h>
 +#include <linux/module.h>
 +#include <drm/drmP.h>
 +#include <drm/drm_fb_helper.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_panel.h>
 +#include <linux/videodev2.h>
 +#include <video/of_display_timing.h>
 +
 +#include "imx-drm.h"
 +
 +#define con_to_imxpd(x) container_of(x, struct imx_parallel_display, connector)
 +#define enc_to_imxpd(x) container_of(x, struct imx_parallel_display, encoder)
 +
 +struct imx_parallel_display {
 +      struct drm_connector connector;
 +      struct drm_encoder encoder;
 +      struct device *dev;
 +      void *edid;
 +      int edid_len;
 +      u32 interface_pix_fmt;
 +      int mode_valid;
 +      struct drm_display_mode mode;
 +      struct drm_panel *panel;
 +};
 +
 +static enum drm_connector_status imx_pd_connector_detect(
 +              struct drm_connector *connector, bool force)
 +{
 +      return connector_status_connected;
 +}
 +
 +static int imx_pd_connector_get_modes(struct drm_connector *connector)
 +{
 +      struct imx_parallel_display *imxpd = con_to_imxpd(connector);
 +      struct device_node *np = imxpd->dev->of_node;
 +      int num_modes = 0;
 +
 +      if (imxpd->panel && imxpd->panel->funcs &&
 +          imxpd->panel->funcs->get_modes) {
 +              num_modes = imxpd->panel->funcs->get_modes(imxpd->panel);
 +              if (num_modes > 0)
 +                      return num_modes;
 +      }
 +
 +      if (imxpd->edid) {
 +              drm_mode_connector_update_edid_property(connector, imxpd->edid);
 +              num_modes = drm_add_edid_modes(connector, imxpd->edid);
 +      }
 +
 +      if (imxpd->mode_valid) {
 +              struct drm_display_mode *mode = drm_mode_create(connector->dev);
 +
 +              if (!mode)
 +                      return -EINVAL;
 +              drm_mode_copy(mode, &imxpd->mode);
 +              mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
 +              drm_mode_probed_add(connector, mode);
 +              num_modes++;
 +      }
 +
 +      if (np) {
 +              struct drm_display_mode *mode = drm_mode_create(connector->dev);
 +
 +              if (!mode)
 +                      return -EINVAL;
 +              of_get_drm_display_mode(np, &imxpd->mode, OF_USE_NATIVE_MODE);
 +              drm_mode_copy(mode, &imxpd->mode);
 +              mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
 +              drm_mode_probed_add(connector, mode);
 +              num_modes++;
 +      }
 +
 +      return num_modes;
 +}
 +
 +static struct drm_encoder *imx_pd_connector_best_encoder(
 +              struct drm_connector *connector)
 +{
 +      struct imx_parallel_display *imxpd = con_to_imxpd(connector);
 +
 +      return &imxpd->encoder;
 +}
 +
 +static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode)
 +{
 +      struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
 +
 +      if (mode != DRM_MODE_DPMS_ON)
 +              drm_panel_disable(imxpd->panel);
 +      else
 +              drm_panel_enable(imxpd->panel);
 +}
 +
 +static bool imx_pd_encoder_mode_fixup(struct drm_encoder *encoder,
 +                         const struct drm_display_mode *mode,
 +                         struct drm_display_mode *adjusted_mode)
 +{
 +      return true;
 +}
 +
 +static void imx_pd_encoder_prepare(struct drm_encoder *encoder)
 +{
 +      struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
 +
 +      imx_drm_panel_format(encoder, imxpd->interface_pix_fmt);
 +}
 +
 +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,
 +                       struct drm_display_mode *mode,
 +                       struct drm_display_mode *adjusted_mode)
 +{
 +}
 +
 +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 = {
 +      .dpms = drm_helper_connector_dpms,
 +      .fill_modes = drm_helper_probe_single_connector_modes,
 +      .detect = imx_pd_connector_detect,
 +      .destroy = imx_drm_connector_destroy,
 +};
 +
 +static struct drm_connector_helper_funcs imx_pd_connector_helper_funcs = {
 +      .get_modes = imx_pd_connector_get_modes,
 +      .best_encoder = imx_pd_connector_best_encoder,
 +};
 +
 +static struct drm_encoder_funcs imx_pd_encoder_funcs = {
 +      .destroy = imx_drm_encoder_destroy,
 +};
 +
 +static struct drm_encoder_helper_funcs imx_pd_encoder_helper_funcs = {
 +      .dpms = imx_pd_encoder_dpms,
 +      .mode_fixup = imx_pd_encoder_mode_fixup,
 +      .prepare = imx_pd_encoder_prepare,
 +      .commit = imx_pd_encoder_commit,
 +      .mode_set = imx_pd_encoder_mode_set,
 +      .disable = imx_pd_encoder_disable,
 +};
 +
 +static int imx_pd_register(struct drm_device *drm,
 +      struct imx_parallel_display *imxpd)
 +{
 +      int ret;
 +
 +      ret = imx_drm_encoder_parse_of(drm, &imxpd->encoder,
 +                                     imxpd->dev->of_node);
 +      if (ret)
 +              return ret;
 +
 +      /* set the connector's dpms to OFF so that
 +       * drm_helper_connector_dpms() won't return
 +       * immediately since the current state is ON
 +       * at this point.
 +       */
 +      imxpd->connector.dpms = DRM_MODE_DPMS_OFF;
 +
 +      drm_encoder_helper_add(&imxpd->encoder, &imx_pd_encoder_helper_funcs);
 +      drm_encoder_init(drm, &imxpd->encoder, &imx_pd_encoder_funcs,
 +                       DRM_MODE_ENCODER_NONE);
 +
 +      drm_connector_helper_add(&imxpd->connector,
 +                      &imx_pd_connector_helper_funcs);
 +      drm_connector_init(drm, &imxpd->connector, &imx_pd_connector_funcs,
 +                         DRM_MODE_CONNECTOR_VGA);
 +
 +      if (imxpd->panel)
 +              drm_panel_attach(imxpd->panel, &imxpd->connector);
 +
 +      drm_mode_connector_attach_encoder(&imxpd->connector, &imxpd->encoder);
 +
 +      imxpd->connector.encoder = &imxpd->encoder;
 +
 +      return 0;
 +}
 +
 +static int imx_pd_bind(struct device *dev, struct device *master, void *data)
 +{
 +      struct drm_device *drm = data;
 +      struct device_node *np = dev->of_node;
 +      struct device_node *panel_node;
 +      const u8 *edidp;
 +      struct imx_parallel_display *imxpd;
 +      int ret;
 +      const char *fmt;
 +
 +      imxpd = devm_kzalloc(dev, sizeof(*imxpd), GFP_KERNEL);
 +      if (!imxpd)
 +              return -ENOMEM;
 +
 +      edidp = of_get_property(np, "edid", &imxpd->edid_len);
 +      if (edidp)
 +              imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL);
 +
 +      ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
 +      if (!ret) {
 +              if (!strcmp(fmt, "rgb24"))
 +                      imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB24;
 +              else if (!strcmp(fmt, "rgb565"))
 +                      imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB565;
 +              else if (!strcmp(fmt, "bgr666"))
 +                      imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR666;
 +              else if (!strcmp(fmt, "lvds666"))
 +                      imxpd->interface_pix_fmt =
 +                                      v4l2_fourcc('L', 'V', 'D', '6');
 +      }
 +
 +      panel_node = of_parse_phandle(np, "fsl,panel", 0);
 +      if (panel_node)
 +              imxpd->panel = of_drm_find_panel(panel_node);
 +
 +      imxpd->dev = dev;
 +
 +      ret = imx_pd_register(drm, imxpd);
 +      if (ret)
 +              return ret;
 +
 +      dev_set_drvdata(dev, imxpd);
 +
 +      return 0;
 +}
 +
 +static void imx_pd_unbind(struct device *dev, struct device *master,
 +      void *data)
 +{
 +      struct imx_parallel_display *imxpd = dev_get_drvdata(dev);
 +
 +      imxpd->encoder.funcs->destroy(&imxpd->encoder);
 +      imxpd->connector.funcs->destroy(&imxpd->connector);
 +}
 +
 +static const struct component_ops imx_pd_ops = {
 +      .bind   = imx_pd_bind,
 +      .unbind = imx_pd_unbind,
 +};
 +
 +static int imx_pd_probe(struct platform_device *pdev)
 +{
 +      return component_add(&pdev->dev, &imx_pd_ops);
 +}
 +
 +static int imx_pd_remove(struct platform_device *pdev)
 +{
 +      component_del(&pdev->dev, &imx_pd_ops);
 +      return 0;
 +}
 +
 +static const struct of_device_id imx_pd_dt_ids[] = {
 +      { .compatible = "fsl,imx-parallel-display", },
 +      { /* sentinel */ }
 +};
 +MODULE_DEVICE_TABLE(of, imx_pd_dt_ids);
 +
 +static struct platform_driver imx_pd_driver = {
 +      .probe          = imx_pd_probe,
 +      .remove         = imx_pd_remove,
 +      .driver         = {
 +              .of_match_table = imx_pd_dt_ids,
 +              .name   = "imx-parallel-display",
 +      },
 +};
 +
 +module_platform_driver(imx_pd_driver);
 +
 +MODULE_DESCRIPTION("i.MX parallel display driver");
 +MODULE_AUTHOR("Sascha Hauer, Pengutronix");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:imx-parallel-display");
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index f692261e9b5c06b1401c76f1a1cf65110db14601,5f03c5fbb0983d6be173a4ce5ee03497c06a0529..5bb9c85cec8133691adb7371962b5a216698b0a9
@@@ -258,9 -258,10 +258,9 @@@ void ll_invalidate_aliases(struct inod
               inode->i_ino, inode->i_generation, inode);
  
        ll_lock_dcache(inode);
 -      ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry, d_alias) {
 -              CDEBUG(D_DENTRY, "dentry in drop %.*s (%p) parent %p inode %p flags %d\n",
 -                     dentry->d_name.len, dentry->d_name.name,
 -                     dentry, dentry->d_parent,
 +      ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry, d_u.d_alias) {
-               CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p "
-                      "inode %p flags %d\n", dentry, dentry, dentry->d_parent,
++              CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p inode %p flags %d\n",
++                     dentry, dentry, dentry->d_parent,
                       dentry->d_inode, dentry->d_flags);
  
                if (unlikely(dentry == dentry->d_sb->s_root)) {
index 77d1c12704b431a2bbd9b252fa729b0cbfc965d0,79fc29b3710caaa45bddee095c3b45745e86a12d..37306e0c7aadd4e13f236a9f127aae4d5426c670
@@@ -1489,8 -1489,8 +1489,8 @@@ static inline void __d_lustre_invalidat
   */
  static inline void d_lustre_invalidate(struct dentry *dentry, int nested)
  {
-       CDEBUG(D_DENTRY, "invalidate dentry %pd (%p) parent %p inode %p "
-              "refc %d\n", dentry, dentry,
 -      CDEBUG(D_DENTRY, "invalidate dentry %.*s (%p) parent %p inode %p refc %d\n",
 -             dentry->d_name.len, dentry->d_name.name, dentry,
++      CDEBUG(D_DENTRY, "invalidate dentry %pd (%p) parent %p inode %p refc %d\n",
++             dentry, dentry,
               dentry->d_parent, dentry->d_inode, d_count(dentry));
  
        spin_lock_nested(&dentry->d_lock,
index 7b6b9e2e010204c96a40a6307d8cddad1fde8eb4,3b0336029da3729e9ba509cacb4baaef471bbe87..6e423aa6a6e4871b1845285ec5c8f84494d3df5a
@@@ -698,9 -690,11 +690,9 @@@ void lustre_dump_dentry(struct dentry *
        list_for_each(tmp, &dentry->d_subdirs)
                subdirs++;
  
-       CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
-              " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
 -      CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
 -             dentry,
 -             dentry->d_name.len, dentry->d_name.name,
 -             dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
--             dentry->d_parent, dentry->d_inode, d_count(dentry),
++      CERROR("dentry %p dump: name=%pd parent=%pd (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
++             dentry, dentry, dentry->d_parent, dentry->d_parent,
++             dentry->d_inode, d_count(dentry),
               dentry->d_flags, dentry->d_fsdata, subdirs);
        if (dentry->d_inode != NULL)
                ll_dump_inode(dentry->d_inode);
                return;
  
        list_for_each(tmp, &dentry->d_subdirs) {
 -              struct dentry *d = list_entry(tmp, struct dentry, d_u.d_child);
 +              struct dentry *d = list_entry(tmp, struct dentry, d_child);
                lustre_dump_dentry(d, recur - 1);
        }
  }
index ba1c047ae927dcb7d10b4c9ef36249e85875914a,e72b14daccefecbd9ceeefa41bd4e98d6758e568..479bf428780ce766c18faaf211372126f732a28d
@@@ -393,10 -391,9 +391,9 @@@ static int ll_page_mkwrite(struct vm_ar
                result = ll_page_mkwrite0(vma, vmf->page, &retry);
  
                if (!printed && ++count > 16) {
-                       CWARN("app(%s): the page %lu of file %lu is under heavy"
-                             " contention.\n",
+                       CWARN("app(%s): the page %lu of file %lu is under heavy contention.\n",
                              current->comm, vmf->pgoff,
 -                            vma->vm_file->f_dentry->d_inode->i_ino);
 +                            file_inode(vma->vm_file)->i_ino);
                        printed = true;
                }
        } while (retry);
index 8e926b385a604a5b08d6d448d59e9e78f61eee09,671d0cd2a6a2ab20b5a29b1eae0b7e7a4c0cbf33..1bf891bd321aa2e0d19bb79e2e217376d31f5e09
@@@ -598,9 -619,8 +598,8 @@@ static int ll_atomic_open(struct inode 
        long long lookup_flags = LOOKUP_OPEN;
        int rc = 0;
  
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,"
-                          "open_flags %x,mode %x opened %d\n",
 -      CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),file %p,open_flags %x,mode %x opened %d\n",
 -             dentry->d_name.len, dentry->d_name.name, dir->i_ino,
++      CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,open_flags %x,mode %x opened %d\n",
 +             dentry, dir->i_ino,
               dir->i_generation, dir, file, open_flags, mode, *opened);
  
        it = kzalloc(sizeof(*it), GFP_NOFS);
@@@ -843,12 -862,11 +842,11 @@@ static int ll_create_nd(struct inode *d
  {
        int rc;
  
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),"
-                          "flags=%u, excl=%d\n",
 -      CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),flags=%u, excl=%d\n",
 -             dentry->d_name.len, dentry->d_name.name, dir->i_ino,
++      CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),flags=%u, excl=%d\n",
 +             dentry, dir->i_ino,
               dir->i_generation, dir, mode, want_excl);
  
 -      rc = ll_mknod_generic(dir, &dentry->d_name, mode, 0, dentry);
 +      rc = ll_mknod(dir, dentry, mode, 0);
  
        ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_CREATE, 1);
  
index 09d965e76842503e32f7b3e34e8825d8c84e6edb,db2bb44cdce5e151af3155b641a0bda6e90d8831..6ad9dd0fe2b3d9d7da842e9af2d895a1097c42e6
@@@ -1612,9 -1608,9 +1608,8 @@@ int do_statahead_enter(struct inode *di
                                } else if ((*dentryp)->d_inode != inode) {
                                        /* revalidate, but inode is recreated */
                                        CDEBUG(D_READA,
-                                             "stale dentry %pd inode %lu/%u, "
-                                             "statahead inode %lu/%u\n",
 -                                            "stale dentry %.*s inode %lu/%u, statahead inode %lu/%u\n",
 -                                            (*dentryp)->d_name.len,
 -                                            (*dentryp)->d_name.name,
++                                            "stale dentry %pd inode %lu/%u, statahead inode %lu/%u\n",
 +                                            *dentryp,
                                              (*dentryp)->d_inode->i_ino,
                                              (*dentryp)->d_inode->i_generation,
                                              inode->i_ino,
        if (unlikely(sai->sai_inode != parent->d_inode)) {
                struct ll_inode_info *nlli = ll_i2info(parent->d_inode);
  
-               CWARN("Race condition, someone changed %pd just now: "
-                     "old parent "DFID", new parent "DFID"\n",
 -              CWARN("Race condition, someone changed %.*s just now: old parent " DFID ", new parent " DFID "\n",
 -                    (*dentryp)->d_name.len, (*dentryp)->d_name.name,
++              CWARN("Race condition, someone changed %pd just now: old parent "DFID", new parent "DFID"\n",
 +                    *dentryp,
                      PFID(&lli->lli_fid), PFID(&nlli->lli_fid));
                dput(parent);
                iput(sai->sai_inode);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge