Merge tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc into drm-next

UAPI Changes:
- Return -ENODEV instead of -ENXIO when creating cma fb w/o valid gem (Daniel)
- Add aspect ratio and custom scaling propertis to connector state (Maarten)

Cross-subsystem Changes:
- None

Core Changes:
- Add Laurent as bridge reviewer and Andrzej as bridge maintainer (Archit)
- Maintain new STM driver through -misc (Yannick)
- Misc doc improvements (as is tradition) (Daniel)
- Add driver-private objects to atomic state (Dhinakaran)
- Deprecate preclose hook in modern drivers (use postclose) (Daniel)
- Add hwmode to vblank struct. This fixes mode access in irq context and reduced
  a bunch of boilerplate (Daniel)

Driver Changes:
- vc4: Add out-fence support to vc4 V3D rendering (Eric)
- stm: Add stm32f429 display hw and am-480272h3tmqw-t01h panel support (Yannick)
- vc4: Remove 256MB cma limit from vc4 (Eric)
- dw-hdmi: Disable audio when inactive, instead of always enabled (Romain)
- zte: Add support for VGA to the ZTE driver (Shawn)
- i915: Track DP MST bandwidth and check it in atomic_check (Dhinakaran)
- vgem: Enable gem dmabuf import iface to facilitate ion testing (Laura)
- vc4: Add support for Cygnus (new dt compat string + couple bug fixes) (Eric)
- pl111: Add driver for pl111 CLCD display controller (Eric/Tom)
- vgem: Subclass drm_device instead of standalone platform device (Chris)

Cc: Archit Taneja <architt@codeaurora.org>
Cc: Eric Anholt <eric@anholt.net>
Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Romain Perier <romain.perier@collabora.com>
Cc: Navare, Manasi D <manasi.d.navare@intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tom Cooksey <tom.cooksey@arm.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>

* tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc: (72 commits)
  drm: add missing declaration to drm_blend.h
  drm/dp: Wait up all outstanding tx waiters
  drm/dp: Read the tx msg state once after checking for an event
  drm/prime: Forward declare struct device
  drm/vblank: Lock down vblank->hwmode more
  drm/vblank: drop the mode argument from drm_calc_vbltimestamp_from_scanoutpos
  drm/vblank: Add FIXME comments about moving the vblank ts hooks
  drm/vblank: Switch to bool in_vblank_irq in get_vblank_timestamp
  drm/vblank: Switch drm_driver->get_vblank_timestamp to return a bool
  drm/vgem: Convert to a struct drm_device subclass
  gpu: drm: gma500: remove dead code
  drm/sti: Adjust two checks for null pointers in sti_hqvdp_probe()
  drm/sti: Fix typos in a comment line
  drm/sti: Fix a typo in a comment line
  drm/sti: Replace 17 seq_puts() calls by seq_putc()
  drm/sti: Reduce function calls for sequence output at five places
  drm/sti: use seq_puts to display a string
  drm: Nerf the preclose callback for modern drivers
  drm/exynos: Merge pre/postclose hooks
  drm/tegra: switch to postclose
  ...

1 files changed, 32 insertions, 33 deletions

diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c
index cdc6e6760705..7d7af3a93d94 100644
--- a/drivers/gpu/drm/vc4/vc4_irq.c
+++ b/drivers/gpu/drm/vc4/vc4_irq.c
@@ -59,50 +59,45 @@ vc4_overflow_mem_work(struct work_struct *work)
 {
         struct vc4_dev *vc4 =
                 container_of(work, struct vc4_dev, overflow_mem_work);
-        struct drm_device *dev = vc4->dev;
-        struct vc4_bo *bo;
+        struct vc4_bo *bo = vc4->bin_bo;
+        int bin_bo_slot;
+        struct vc4_exec_info *exec;
+        unsigned long irqflags;
 
-        bo = vc4_bo_create(dev, 256 * 1024, true);
-        if (IS_ERR(bo)) {
+        bin_bo_slot = vc4_v3d_get_bin_slot(vc4);
+        if (bin_bo_slot < 0) {
                 DRM_ERROR("Couldn't allocate binner overflow mem\n");
                 return;
         }
 
-        /* If there's a job executing currently, then our previous
-         * overflow allocation is getting used in that job and we need
-         * to queue it to be released when the job is done.  But if no
-         * job is executing at all, then we can free the old overflow
-         * object direcctly.
-         *
-         * No lock necessary for this pointer since we're the only
-         * ones that update the pointer, and our workqueue won't
-         * reenter.
-         */
-        if (vc4->overflow_mem) {
-                struct vc4_exec_info *current_exec;
-                unsigned long irqflags;
-
-                spin_lock_irqsave(&vc4->job_lock, irqflags);
-                current_exec = vc4_first_bin_job(vc4);
-                if (!current_exec)
-                        current_exec = vc4_last_render_job(vc4);
-                if (current_exec) {
-                        vc4->overflow_mem->seqno = current_exec->seqno;
-                        list_add_tail(&vc4->overflow_mem->unref_head,
-                                      &current_exec->unref_list);
-                        vc4->overflow_mem = NULL;
+        spin_lock_irqsave(&vc4->job_lock, irqflags);
+
+        if (vc4->bin_alloc_overflow) {
+                /* If we had overflow memory allocated previously,
+                 * then that chunk will free when the current bin job
+                 * is done.  If we don't have a bin job running, then
+                 * the chunk will be done whenever the list of render
+                 * jobs has drained.
+                 */
+                exec = vc4_first_bin_job(vc4);
+                if (!exec)
+                        exec = vc4_last_render_job(vc4);
+                if (exec) {
+                        exec->bin_slots |= vc4->bin_alloc_overflow;
+                } else {
+                        /* There's nothing queued in the hardware, so
+                         * the old slot is free immediately.
+                         */
+                        vc4->bin_alloc_used &= ~vc4->bin_alloc_overflow;
                 }
-                spin_unlock_irqrestore(&vc4->job_lock, irqflags);
         }
+        vc4->bin_alloc_overflow = BIT(bin_bo_slot);
 
-        if (vc4->overflow_mem)
-                drm_gem_object_unreference_unlocked(&vc4->overflow_mem->base.base);
-        vc4->overflow_mem = bo;
-
-        V3D_WRITE(V3D_BPOA, bo->base.paddr);
+        V3D_WRITE(V3D_BPOA, bo->base.paddr + bin_bo_slot * vc4->bin_alloc_size);
         V3D_WRITE(V3D_BPOS, bo->base.base.size);
         V3D_WRITE(V3D_INTCTL, V3D_INT_OUTOMEM);
         V3D_WRITE(V3D_INTENA, V3D_INT_OUTOMEM);
+        spin_unlock_irqrestore(&vc4->job_lock, irqflags);
 }
 
 static void
@@ -142,6 +137,10 @@ vc4_irq_finish_render_job(struct drm_device *dev)
 
         vc4->finished_seqno++;
         list_move_tail(&exec->head, &vc4->job_done_list);
+        if (exec->fence) {
+                dma_fence_signal_locked(exec->fence);
+                exec->fence = NULL;
+        }
         vc4_submit_next_render_job(dev);
 
         wake_up_all(&vc4->job_wait_queue);