Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm

Pull drm updates from Dave Airlie:
 "This has two exciting community drivers for ARM Mali accelerators.
  Since ARM has never been open source friendly on the GPU side of the
  house, the community has had to create open source drivers for the
  Mali GPUs. Lima covers the older t4xx and panfrost the newer 6xx/7xx
  series. Well done to all involved and hopefully this will help ARM
  head in the right direction.

  There is also now the ability if you don't have any of the legacy
  drivers enabled (pre-KMS) to remove all the pre-KMS support code from
  the core drm, this saves 10% or so in codesize on my machine.

  i915 also enable Icelake/Elkhart Lake Gen11 GPUs by default, vboxvideo
  moves out of staging.

  There are also some rcar-du patches which crossover with media tree
  but all should be acked by Mauro.

  Summary:

  uapi changes:
   - Colorspace connector property
   - fourcc - new YUV formts
   - timeline sync objects initially merged
   - expose FB_DAMAGE_CLIPS to atomic userspace

  new drivers:
   - vboxvideo: moved out of staging
   - aspeed: ASPEED SoC BMC chip display support
   - lima: ARM Mali4xx GPU acceleration driver support
   - panfrost: ARM Mali6xx/7xx Midgard/Bitfrost acceleration driver support

  core:
   - component helper docs
   - unplugging fixes
   - devm device init
   - MIPI/DSI rate control
   - shmem backed gem objects
   - connector, display_info, edid_quirks cleanups
   - dma_buf fence chain support
   - 64-bit dma-fence seqno comparison fixes
   - move initial fb config code to core
   - gem fence array helpers for Lima
   - ability to remove legacy support code if no drivers requires it (removes 10% of drm.ko size)
   - lease fixes

  ttm:
   - unified DRM_FILE_PAGE_OFFSET handling
   - Account for kernel allocations in kernel zone only

  panel:
   - OSD070T1718-19TS panel support
   - panel-tpo-td028ttec1 backlight support
   - Ronbo RB070D30 MIPI/DSI
   - Feiyang FY07024DI26A30-D MIPI-DSI panel
   - Rocktech jh057n00900 MIPI-DSI panel

  i915:
   - Comet Lake (Gen9) PCI IDs
   - Updated Icelake PCI IDs
   - Elkhartlake (Gen11) support
   - DP MST property addtions
   - plane and watermark fixes
   - Icelake port sync and VEBOX disable fixes
   - struct_mutex usage reduction
   - Icelake gamma fix
   - GuC reset fixes
   - make mmap more asynchronous
   - sound display power well race fixes
   - DDI/MIPI-DSI clocks for Icelake
   - Icelake RPS frequency changing support
   - Icelake workarounds

  amdgpu:
   - Use HMM for userptr
   - vega20 experimental smu11 support
   - RAS support for vega20
   - BACO support for vega12 + fixes for vega20
   - reworked IH interrupt handling
   - amdkfd RAS support
   - Freesync improvements
   - initial timeline sync object support
   - DC Z ordering fixes
   - NV12 planes support
   - colorspace properties for planes=
   - eDP opts if eDP already initialized

  nouveau:
   - misc fixes

  etnaviv:
   - misc fixes

  msm:
   - GPU zap shader support expansion
   - robustness ABI addition

  exynos:
   - Logging cleanups

  tegra:
   - Shared reset fix
   - CPU cache maintenance fix

  cirrus:
   - driver rewritten using simple helpers

  meson:
   - G12A support

  vmwgfx:
   - Resource dirtying management improvements
   - Userspace logging improvements

  virtio:
   - PRIME fixes

  rockchip:
   - rk3066 hdmi support

  sun4i:
   - DSI burst mode support

  vc4:
   - load tracker to detect underflow

  v3d:
   - v3d v4.2 support

  malidp:
   - initial Mali D71 support in komeda driver

  tfp410:
   - omap related improvement

  omapdrm:
   - drm bridge/panel support
   - drop some omap specific panels

  rcar-du:
   - Display writeback support"

* tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm: (1507 commits)
  drm/msm/a6xx: No zap shader is not an error
  drm/cma-helper: Fix drm_gem_cma_free_object()
  drm: Fix timestamp docs for variable refresh properties.
  drm/komeda: Mark the local functions as static
  drm/komeda: Fixed warning: Function parameter or member not described
  drm/komeda: Expose bus_width to Komeda-CORE
  drm/komeda: Add sysfs attribute: core_id and config_id
  drm: add non-desktop quirk for Valve HMDs
  drm/panfrost: Show stored feature registers
  drm/panfrost: Don't scream about deferred probe
  drm/panfrost: Disable PM on probe failure
  drm/panfrost: Set DMA masks earlier
  drm/panfrost: Add sanity checks to submit IOCTL
  drm/etnaviv: initialize idle mask before querying the HW db
  drm: introduce a capability flag for syncobj timeline support
  drm: report consistent errors when checking syncobj capibility
  drm/nouveau/nouveau: forward error generated while resuming objects tree
  drm/nouveau/fb/ramgk104: fix spelling mistake "sucessfully" -> "successfully"
  drm/nouveau/i2c: Disable i2c bus access after ->fini()
  drm/nouveau: Remove duplicate ACPI_VIDEO_NOTIFY_PROBE definition
  ...

3 files changed, 138 insertions, 12 deletions

diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index 0805801f4e94..e64736c39a9f 100644
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -234,7 +234,7 @@ static int dumb_vga_remove(struct platform_device *pdev)
  */
 static const struct drm_bridge_timings default_dac_timings = {
         /* Timing specifications, datasheet page 7 */
-        .sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        .input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
         .setup_time_ps = 500,
         .hold_time_ps = 1500,
 };
@@ -245,7 +245,7 @@ static const struct drm_bridge_timings default_dac_timings = {
  */
 static const struct drm_bridge_timings ti_ths8134_dac_timings = {
         /* From timing diagram, datasheet page 9 */
-        .sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        .input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
         /* From datasheet, page 12 */
         .setup_time_ps = 3000,
         /* I guess this means latched input */
@@ -258,7 +258,7 @@ static const struct drm_bridge_timings ti_ths8134_dac_timings = {
  */
 static const struct drm_bridge_timings ti_ths8135_dac_timings = {
         /* From timing diagram, datasheet page 14 */
-        .sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        .input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
         /* From datasheet, page 16 */
         .setup_time_ps = 2000,
         .hold_time_ps = 500,
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index 888980d4bc74..e570c9dee180 100644
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -1222,8 +1222,8 @@ static int tc_bridge_attach(struct drm_bridge *bridge)
                                          &bus_format, 1);
         tc->connector.display_info.bus_flags =
                 DRM_BUS_FLAG_DE_HIGH |
-                DRM_BUS_FLAG_PIXDATA_NEGEDGE |
-                DRM_BUS_FLAG_SYNC_NEGEDGE;
+                DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE |
+                DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;
         drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
 
         return 0;
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index 7bfb4f338813..8b0e71bd3ca7 100644
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -27,10 +27,16 @@
 struct tfp410 {
         struct drm_bridge       bridge;
         struct drm_connector    connector;
+        unsigned int            connector_type;
 
+        u32                     bus_format;
         struct i2c_adapter      *ddc;
         struct gpio_desc        *hpd;
+        int                     hpd_irq;
         struct delayed_work     hpd_work;
+        struct gpio_desc        *powerdown;
+
+        struct drm_bridge_timings timings;
 
         struct device *dev;
 };
@@ -120,26 +126,47 @@ static int tfp410_attach(struct drm_bridge *bridge)
                 return -ENODEV;
         }
 
-        if (dvi->hpd)
+        if (dvi->hpd_irq >= 0)
                 dvi->connector.polled = DRM_CONNECTOR_POLL_HPD;
+        else
+                dvi->connector.polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
 
         drm_connector_helper_add(&dvi->connector,
                                  &tfp410_con_helper_funcs);
         ret = drm_connector_init(bridge->dev, &dvi->connector,
-                                 &tfp410_con_funcs, DRM_MODE_CONNECTOR_HDMIA);
+                                 &tfp410_con_funcs, dvi->connector_type);
         if (ret) {
                 dev_err(dvi->dev, "drm_connector_init() failed: %d\n", ret);
                 return ret;
         }
 
+        drm_display_info_set_bus_formats(&dvi->connector.display_info,
+                                         &dvi->bus_format, 1);
+
         drm_connector_attach_encoder(&dvi->connector,
                                           bridge->encoder);
 
         return 0;
 }
 
+static void tfp410_enable(struct drm_bridge *bridge)
+{
+        struct tfp410 *dvi = drm_bridge_to_tfp410(bridge);
+
+        gpiod_set_value_cansleep(dvi->powerdown, 0);
+}
+
+static void tfp410_disable(struct drm_bridge *bridge)
+{
+        struct tfp410 *dvi = drm_bridge_to_tfp410(bridge);
+
+        gpiod_set_value_cansleep(dvi->powerdown, 1);
+}
+
 static const struct drm_bridge_funcs tfp410_bridge_funcs = {
         .attach         = tfp410_attach,
+        .enable         = tfp410_enable,
+        .disable        = tfp410_disable,
 };
 
 static void tfp410_hpd_work_func(struct work_struct *work)
@@ -162,6 +189,83 @@ static irqreturn_t tfp410_hpd_irq_thread(int irq, void *arg)
         return IRQ_HANDLED;
 }
 
+static const struct drm_bridge_timings tfp410_default_timings = {
+        .input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE
+                         | DRM_BUS_FLAG_DE_HIGH,
+        .setup_time_ps = 1200,
+        .hold_time_ps = 1300,
+};
+
+static int tfp410_parse_timings(struct tfp410 *dvi, bool i2c)
+{
+        struct drm_bridge_timings *timings = &dvi->timings;
+        struct device_node *ep;
+        u32 pclk_sample = 0;
+        u32 bus_width = 24;
+        s32 deskew = 0;
+
+        /* Start with defaults. */
+        *timings = tfp410_default_timings;
+
+        if (i2c)
+                /*
+                 * In I2C mode timings are configured through the I2C interface.
+                 * As the driver doesn't support I2C configuration yet, we just
+                 * go with the defaults (BSEL=1, DSEL=1, DKEN=0, EDGE=1).
+                 */
+                return 0;
+
+        /*
+         * In non-I2C mode, timings are configured through the BSEL, DSEL, DKEN
+         * and EDGE pins. They are specified in DT through endpoint properties
+         * and vendor-specific properties.
+         */
+        ep = of_graph_get_endpoint_by_regs(dvi->dev->of_node, 0, 0);
+        if (!ep)
+                return -EINVAL;
+
+        /* Get the sampling edge from the endpoint. */
+        of_property_read_u32(ep, "pclk-sample", &pclk_sample);
+        of_property_read_u32(ep, "bus-width", &bus_width);
+        of_node_put(ep);
+
+        timings->input_bus_flags = DRM_BUS_FLAG_DE_HIGH;
+
+        switch (pclk_sample) {
+        case 0:
+                timings->input_bus_flags |= DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE
+                                         |  DRM_BUS_FLAG_SYNC_SAMPLE_NEGEDGE;
+                break;
+        case 1:
+                timings->input_bus_flags |= DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE
+                                         |  DRM_BUS_FLAG_SYNC_SAMPLE_POSEDGE;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (bus_width) {
+        case 12:
+                dvi->bus_format = MEDIA_BUS_FMT_RGB888_2X12_LE;
+                break;
+        case 24:
+                dvi->bus_format = MEDIA_BUS_FMT_RGB888_1X24;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* Get the setup and hold time from vendor-specific properties. */
+        of_property_read_u32(dvi->dev->of_node, "ti,deskew", (u32 *)&deskew);
+        if (deskew < -4 || deskew > 3)
+                return -EINVAL;
+
+        timings->setup_time_ps = min(0, 1200 - 350 * deskew);
+        timings->hold_time_ps = min(0, 1300 + 350 * deskew);
+
+        return 0;
+}
+
 static int tfp410_get_connector_properties(struct tfp410 *dvi)
 {
         struct device_node *connector_node, *ddc_phandle;
@@ -172,6 +276,11 @@ static int tfp410_get_connector_properties(struct tfp410 *dvi)
         if (!connector_node)
                 return -ENODEV;
 
+        if (of_device_is_compatible(connector_node, "hdmi-connector"))
+                dvi->connector_type = DRM_MODE_CONNECTOR_HDMIA;
+        else
+                dvi->connector_type = DRM_MODE_CONNECTOR_DVID;
+
         dvi->hpd = fwnode_get_named_gpiod(&connector_node->fwnode,
                                         "hpd-gpios", 0, GPIOD_IN, "hpd");
         if (IS_ERR(dvi->hpd)) {
@@ -200,7 +309,7 @@ fail:
         return ret;
 }
 
-static int tfp410_init(struct device *dev)
+static int tfp410_init(struct device *dev, bool i2c)
 {
         struct tfp410 *dvi;
         int ret;
@@ -217,16 +326,33 @@ static int tfp410_init(struct device *dev)
 
         dvi->bridge.funcs = &tfp410_bridge_funcs;
         dvi->bridge.of_node = dev->of_node;
+        dvi->bridge.timings = &dvi->timings;
         dvi->dev = dev;
 
+        ret = tfp410_parse_timings(dvi, i2c);
+        if (ret)
+                goto fail;
+
         ret = tfp410_get_connector_properties(dvi);
         if (ret)
                 goto fail;
 
-        if (dvi->hpd) {
+        dvi->powerdown = devm_gpiod_get_optional(dev, "powerdown",
+                                                 GPIOD_OUT_HIGH);
+        if (IS_ERR(dvi->powerdown)) {
+                dev_err(dev, "failed to parse powerdown gpio\n");
+                return PTR_ERR(dvi->powerdown);
+        }
+
+        if (dvi->hpd)
+                dvi->hpd_irq = gpiod_to_irq(dvi->hpd);
+        else
+                dvi->hpd_irq = -ENXIO;
+
+        if (dvi->hpd_irq >= 0) {
                 INIT_DELAYED_WORK(&dvi->hpd_work, tfp410_hpd_work_func);
 
-                ret = devm_request_threaded_irq(dev, gpiod_to_irq(dvi->hpd),
+                ret = devm_request_threaded_irq(dev, dvi->hpd_irq,
                         NULL, tfp410_hpd_irq_thread, IRQF_TRIGGER_RISING |
                         IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                         "hdmi-hpd", dvi);
@@ -264,7 +390,7 @@ static int tfp410_fini(struct device *dev)
 
 static int tfp410_probe(struct platform_device *pdev)
 {
-        return tfp410_init(&pdev->dev);
+        return tfp410_init(&pdev->dev, false);
 }
 
 static int tfp410_remove(struct platform_device *pdev)
@@ -301,7 +427,7 @@ static int tfp410_i2c_probe(struct i2c_client *client,
                 return -ENXIO;
         }
 
-        return tfp410_init(&client->dev);
+        return tfp410_init(&client->dev, true);
 }
 
 static int tfp410_i2c_remove(struct i2c_client *client)