Commit 43f462f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-for-v4.15-part2-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:

 - TTM regression fix for some virt gpus (bochs vga)

 - a few i915 stable fixes

 - one vc4 fix

 - one uapi fix

* tag 'drm-for-v4.15-part2-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/ttm: don't attempt to use hugepages if dma32 requested (v2)
  drm/vblank: Pass crtc_id to page_flip_ioctl.
  drm/i915: Fix init_clock_gating for resume
  drm/i915: Mark the userptr invalidate workqueue as WQ_MEM_RECLAIM
  drm/i915: Clear breadcrumb node when cancelling signaling
  drm/i915/gvt: ensure -ve return value is handled correctly
  drm/i915: Re-register PMIC bus access notifier on runtime resume
  drm/i915: Fix false-positive assert_rpm_wakelock_held in i915_pmic_bus_access_notifier v2
  drm/edid: Don't send non-zero YQ in AVI infoframe for HDMI 1.x sinks
  drm/vc4: Account for interrupts in flight
parents 3c02a6d9 c209101f

drivers/gpu/drm/drm_edid.c

+10 −2
Original line number Diff line number Diff line
@@ -4831,7 +4831,8 @@ void 
drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,

				   const struct drm_display_mode *mode,

				   enum hdmi_quantization_range rgb_quant_range,

				   bool rgb_quant_range_selectable)

				   bool rgb_quant_range_selectable,

				   bool is_hdmi2_sink)

{

	/*

	 * CEA-861:
@@ -4855,8 +4856,15 @@ drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, 
	 *  YQ-field to match the RGB Quantization Range being transmitted

	 *  (e.g., when Limited Range RGB, set YQ=0 or when Full Range RGB,

	 *  set YQ=1) and the Sink shall ignore the YQ-field."

	 *

	 * Unfortunate certain sinks (eg. VIZ Model 67/E261VA) get confused

	 * by non-zero YQ when receiving RGB. There doesn't seem to be any

	 * good way to tell which version of CEA-861 the sink supports, so

	 * we limit non-zero YQ to HDMI 2.0 sinks only as HDMI 2.0 is based

	 * on on CEA-861-F.

	 */

	if (rgb_quant_range == HDMI_QUANTIZATION_RANGE_LIMITED)

	if (!is_hdmi2_sink ||

	    rgb_quant_range == HDMI_QUANTIZATION_RANGE_LIMITED)

		frame->ycc_quantization_range =

			HDMI_YCC_QUANTIZATION_RANGE_LIMITED;

	else

drivers/gpu/drm/drm_plane.c

+1 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,7 @@ retry: 
		e->event.base.type = DRM_EVENT_FLIP_COMPLETE;

		e->event.base.length = sizeof(e->event);

		e->event.vbl.user_data = page_flip->user_data;

		e->event.vbl.crtc_id = crtc->base.id;

		ret = drm_event_reserve_init(dev, file_priv, &e->base, &e->event.base);

		if (ret) {

			kfree(e);

drivers/gpu/drm/i915/gvt/cmd_parser.c

+1 −1
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ static int perform_bb_shadow(struct parser_exec_state *s) 
	struct intel_shadow_bb_entry *entry_obj;

	struct intel_vgpu *vgpu = s->vgpu;

	unsigned long gma = 0;

	uint32_t bb_size;

	int bb_size;

	void *dst = NULL;

	int ret = 0;

drivers/gpu/drm/i915/i915_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -1714,6 +1714,7 @@ static int i915_drm_resume(struct drm_device *dev) 
	intel_guc_resume(dev_priv);



	intel_modeset_init_hw(dev);

	intel_init_clock_gating(dev_priv);



	spin_lock_irq(&dev_priv->irq_lock);

	if (dev_priv->display.hpd_irq_setup)
@@ -2618,6 +2619,8 @@ static int intel_runtime_resume(struct device *kdev) 
		ret = vlv_resume_prepare(dev_priv, true);

	}



	intel_uncore_runtime_resume(dev_priv);



	/*

	 * No point of rolling back things in case of an error, as the best

	 * we can do is to hope that things will still work (and disable RPM).

drivers/gpu/drm/i915/i915_gem_userptr.c

+4 −2
Original line number Diff line number Diff line
@@ -172,7 +172,9 @@ i915_mmu_notifier_create(struct mm_struct *mm) 
	spin_lock_init(&mn->lock);

	mn->mn.ops = &i915_gem_userptr_notifier;

	mn->objects = RB_ROOT_CACHED;

	mn->wq = alloc_workqueue("i915-userptr-release", WQ_UNBOUND, 0);

	mn->wq = alloc_workqueue("i915-userptr-release",

				 WQ_UNBOUND | WQ_MEM_RECLAIM,

				 0);

	if (mn->wq == NULL) {

		kfree(mn);

		return ERR_PTR(-ENOMEM);
@@ -827,7 +829,7 @@ int i915_gem_init_userptr(struct drm_i915_private *dev_priv) 


	dev_priv->mm.userptr_wq =

		alloc_workqueue("i915-userptr-acquire",

				WQ_HIGHPRI | WQ_MEM_RECLAIM,

				WQ_HIGHPRI | WQ_UNBOUND,

				0);

	if (!dev_priv->mm.userptr_wq)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE