From: Sean Paul <seanpaul@chromium.org>
Date: Tue, 4 Apr 2017 15:34:30 +0000 (-0400)
Subject: Merge tag 'topic/synopsys-media-formats-2017-04-03' of git://anongit.freedesktop... 
X-Git-Tag: v4.14-rc1~8^2~52^2~431
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9eb8902e278f3314e1e9429c5f13db9e7a7a0cff;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'topic/synopsys-media-formats-2017-04-03' of git://anongit.freedesktop.org/git/drm-misc into drm-misc-next

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
---

9eb8902e278f3314e1e9429c5f13db9e7a7a0cff
diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
index d9b8d17,6c5f995..f7c6383
--- a/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