Merge tag 'topic/synopsys-media-formats-2017-04-03' of git://anongit.freedesktop...

Media formats for synopsys HDMI  TX Controller

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170403163544.kcw5kk52tgku5xua@art_vandelay

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/scheduler.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
index d9b8d17c3fc679b54bfef38542d2f1e2723f9dbe,6c5f9958197d5541381e7c2838c909fe19fa1520..f7c6383ecd06f1e2eb480384d51f9db41f520a50
--- 1/drivers/gpu/drm/i915/intel_ringbuffer.c
--- 2/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@@ -1445,12 -2013,19 +1445,14 @@@ static int intel_ring_context_pin(struc
  
        if (ce->pin_count++)
                return 0;
 +      GEM_BUG_ON(!ce->pin_count); /* no overflow please! */
  
        if (ce->state) {
 -              unsigned int flags;
 -
 -              flags = 0;
 -              if (i915_gem_context_is_kernel(ctx))
 -                      flags = PIN_HIGH;
 -
 -              ret = context_pin(ctx, flags);
 +              ret = context_pin(ctx);
                if (ret)
                        goto error;
+ 
+               ce->state->obj->mm.dirty = true;
        }
  
        /* The kernel context is only used as a placeholder for flushing the

diff --cc drivers/gpu/drm/vc4/vc4_crtc.c
Simple merge