From: Jani Nikula <jani.nikula@intel.com>
Date: Thu, 25 Jun 2020 15:05:03 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next-queued
X-Git-Tag: v5.9-rc1~51^2~24^2~28
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0f69403d2535ffc7200a8414cf3ca66a49b0d741;p=linux-block.git

Merge drm/drm-next into drm-intel-next-queued

Catch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap locking
API: convert mmap_sem comments").

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

0f69403d2535ffc7200a8414cf3ca66a49b0d741
diff --cc drivers/gpu/drm/i915/i915_drv.h
index 2697960f15a9,adb9bf34cf97..9aad3ec979bd
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -827,9 -826,9 +827,12 @@@ struct i915_selftest_stash 
  struct drm_i915_private {
  	struct drm_device drm;
  
+ 	/* FIXME: Device release actions should all be moved to drmm_ */
+ 	bool do_release;
+ 
 +	/* i915 device parameters */
 +	struct i915_params params;
 +
  	const struct intel_device_info __info; /* Use INTEL_INFO() to access. */
  	struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */
  	struct intel_driver_caps caps;