Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "Highlights:

   - AMD KFD driver merge

     This is the AMD HSA interface for exposing a lowlevel interface for
     GPGPU use.  They have an open source userspace built on top of this
     interface, and the code looks as good as it was going to get out of
     tree.

   - Initial atomic modesetting work

     The need for an atomic modesetting interface to allow userspace to
     try and send a complete set of modesetting state to the driver has
     arisen, and been suffering from neglect this past year.  No more,
     the start of the common code and changes for msm driver to use it
     are in this tree.  Ongoing work to get the userspace ioctl finished
     and the code clean will probably wait until next kernel.

   - DisplayID 1.3 and tiled monitor exposed to userspace.

     Tiled monitor property is now exposed for userspace to make use of.

   - Rockchip drm driver merged.

   - imx gpu driver moved out of staging

  Other stuff:

   - core:
        panel - MIPI DSI + new panels.
        expose suggested x/y properties for virtual GPUs

   - i915:
        Initial Skylake (SKL) support
        gen3/4 reset work
        start of dri1/ums removal
        infoframe tracking
        fixes for lots of things.

   - nouveau:
        tegra k1 voltage support
        GM204 modesetting support
        GT21x memory reclocking work

   - radeon:
        CI dpm fixes
        GPUVM improvements
        Initial DPM fan control

   - rcar-du:
        HDMI support added
        removed some support for old boards
        slave encoder driver for Analog Devices adv7511

   - exynos:
        Exynos4415 SoC support

   - msm:
        a4xx gpu support
        atomic helper conversion

   - tegra:
        iommu support
        universal plane support
        ganged-mode DSI support

   - sti:
        HDMI i2c improvements

   - vmwgfx:
        some late fixes.

   - qxl:
        use suggested x/y properties"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (969 commits)
  drm: sti: fix module compilation issue
  drm/i915: save/restore GMBUS freq across suspend/resume on gen4
  drm: sti: correctly cleanup CRTC and planes
  drm: sti: add HQVDP plane
  drm: sti: add cursor plane
  drm: sti: enable auxiliary CRTC
  drm: sti: fix delay in VTG programming
  drm: sti: prepare sti_tvout to support auxiliary crtc
  drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off}
  drm: sti: fix hdmi avi infoframe
  drm: sti: remove event lock while disabling vblank
  drm: sti: simplify gdp code
  drm: sti: clear all mixer control
  drm: sti: remove gpio for HDMI hot plug detection
  drm: sti: allow to change hdmi ddc i2c adapter
  drm/doc: Document drm_add_modes_noedid() usage
  drm/i915: Remove '& 0xffff' from the mask given to WA_REG()
  drm/i915: Invert the mask and val arguments in wa_add() and WA_REG()
  drm: Zero out DRM object memory upon cleanup
  drm/i915/bdw: Fix the write setting up the WIZ hashing mode
  ...

1 files changed, 295 insertions, 0 deletions

diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
new file mode 100644
index 000000000000..8a76a5c1c34b
--- /dev/null
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -0,0 +1,295 @@
+/*
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <linux/component.h>
+#include <linux/module.h>
+#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)
+{
+}
+
+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)
+{
+}
+
+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");