Commit 33ba90ee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-10-17' of... 

Merge tag 'drm-intel-fixes-2019-10-17' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Display fix on handling VBT information.
- Important circular locking fix
- Fix for preemption vs resubmission on virtual requests
  - and a prep patch to make this last one to apply cleanly

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191017135444.GA12255@intel.com
parents 4f5cafb5 0a544a2a

drivers/gpu/drm/i915/display/intel_bios.c

+16 −6
Original line number Diff line number Diff line
@@ -1270,7 +1270,7 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv, 
		DRM_DEBUG_KMS("port %c trying to use the same DDC pin (0x%x) as port %c, "

			      "disabling port %c DVI/HDMI support\n",

			      port_name(port), info->alternate_ddc_pin,

			      port_name(p), port_name(port));

			      port_name(p), port_name(p));



		/*

		 * If we have multiple ports supposedly sharing the
@@ -1278,9 +1278,14 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv, 
		 * port. Otherwise they share the same ddc bin and

		 * system couldn't communicate with them separately.

		 *

		 * Give child device order the priority, first come first

		 * served.

		 * Give inverse child device order the priority,

		 * last one wins. Yes, there are real machines

		 * (eg. Asrock B250M-HDV) where VBT has both

		 * port A and port E with the same AUX ch and

		 * we must pick port E :(

		 */

		info = &dev_priv->vbt.ddi_port_info[p];



		info->supports_dvi = false;

		info->supports_hdmi = false;

		info->alternate_ddc_pin = 0;
@@ -1316,7 +1321,7 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv, 
		DRM_DEBUG_KMS("port %c trying to use the same AUX CH (0x%x) as port %c, "

			      "disabling port %c DP support\n",

			      port_name(port), info->alternate_aux_channel,

			      port_name(p), port_name(port));

			      port_name(p), port_name(p));



		/*

		 * If we have multiple ports supposedlt sharing the
@@ -1324,9 +1329,14 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv, 
		 * port. Otherwise they share the same aux channel

		 * and system couldn't communicate with them separately.

		 *

		 * Give child device order the priority, first come first

		 * served.

		 * Give inverse child device order the priority,

		 * last one wins. Yes, there are real machines

		 * (eg. Asrock B250M-HDV) where VBT has both

		 * port A and port E with the same AUX ch and

		 * we must pick port E :(

		 */

		info = &dev_priv->vbt.ddi_port_info[p];



		info->supports_dp = false;

		info->alternate_aux_channel = 0;

	}

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+7 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ err: 
		return VM_FAULT_OOM;

	case -ENOSPC:

	case -EFAULT:

	case -ENODEV: /* bad object, how did you get here! */

		return VM_FAULT_SIGBUS;

	default:

		WARN_ONCE(ret, "unhandled error in %s: %i\n", __func__, ret);
@@ -475,10 +476,16 @@ i915_gem_mmap_gtt(struct drm_file *file, 
	if (!obj)

		return -ENOENT;



	if (i915_gem_object_never_bind_ggtt(obj)) {

		ret = -ENODEV;

		goto out;

	}



	ret = create_mmap_offset(obj);

	if (ret == 0)

		*offset = drm_vma_node_offset_addr(&obj->base.vma_node);



out:

	i915_gem_object_put(obj);

	return ret;

}

drivers/gpu/drm/i915/gem/i915_gem_object.h

+6 −0
Original line number Diff line number Diff line
@@ -152,6 +152,12 @@ i915_gem_object_is_proxy(const struct drm_i915_gem_object *obj) 
	return obj->ops->flags & I915_GEM_OBJECT_IS_PROXY;

}



static inline bool

i915_gem_object_never_bind_ggtt(const struct drm_i915_gem_object *obj)

{

	return obj->ops->flags & I915_GEM_OBJECT_NO_GGTT;

}



static inline bool

i915_gem_object_needs_async_cancel(const struct drm_i915_gem_object *obj)

{

drivers/gpu/drm/i915/gem/i915_gem_object_types.h

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ struct drm_i915_gem_object_ops { 
#define I915_GEM_OBJECT_HAS_STRUCT_PAGE	BIT(0)

#define I915_GEM_OBJECT_IS_SHRINKABLE	BIT(1)

#define I915_GEM_OBJECT_IS_PROXY	BIT(2)

#define I915_GEM_OBJECT_ASYNC_CANCEL	BIT(3)

#define I915_GEM_OBJECT_NO_GGTT		BIT(3)

#define I915_GEM_OBJECT_ASYNC_CANCEL	BIT(4)



	/* Interface between the GEM object and its backing storage.

	 * get_pages() is called once prior to the use of the associated set

drivers/gpu/drm/i915/gem/i915_gem_userptr.c

+1 −0
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ i915_gem_userptr_dmabuf_export(struct drm_i915_gem_object *obj) 
static const struct drm_i915_gem_object_ops i915_gem_userptr_ops = {

	.flags = I915_GEM_OBJECT_HAS_STRUCT_PAGE |

		 I915_GEM_OBJECT_IS_SHRINKABLE |

		 I915_GEM_OBJECT_NO_GGTT |

		 I915_GEM_OBJECT_ASYNC_CANCEL,

	.get_pages = i915_gem_userptr_get_pages,

	.put_pages = i915_gem_userptr_put_pages,

CRA Git | Maintained and supported by SUSTech CRA and CCSE