Skip to contentSkip to conversation

Resume time optimisation

PATCH Superseded David Weinehall 5 participants 11 messages Nov 18, 2016

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Resume time optimisation

This patch series aims to reduce the time we spend in i915_gem_restore_gtt_mappings() on resume.

Now that we're getting the resume times down a bit this function started to stand out.

David Weinehall (3):
drm/i915: Cleanup i915_gem_restore_gtt_mappings() drm/i915: Take runtime pm in i915_gem_resume() drm/i915: optimise intel_runtime_pm_{get,put}

 drivers/gpu/drm/i915/i915_gem.c         |  2 ++
 drivers/gpu/drm/i915/i915_gem_gtt.c     |  7 +------
 drivers/gpu/drm/i915/i915_vma.c         | 10 ++++++++++
 drivers/gpu/drm/i915/i915_vma.h         |  6 ++++--
 drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++++++++++
 5 files changed, 29 insertions(+), 8 deletions(-)
Signature · 6 lines
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/3 drm/i915: Cleanup i915_gem_restore_gtt_mappings()

On resume we unbind+bind our VMA-mappings. This patch simplifies this a bit by introducing a rebind() helper. As a nice side-effect this also makes the resume callgraph self-documenting.

Patch by Chris.

---
 drivers/gpu/drm/i915/i915_gem_gtt.c |  7 +------
 drivers/gpu/drm/i915/i915_vma.c     | 10 ++++++++++
 drivers/gpu/drm/i915/i915_vma.h     |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -6
index b4bde1452f2a..76af33443fcd 100644
@@ -3299,12 +3299,7 @@ void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
 			if (vma->vm != &ggtt->base)
 				continue;
 
-			if (!i915_vma_unbind(vma))
-				continue;
-
-			WARN_ON(i915_vma_bind(vma, obj->cache_level,
-					      PIN_UPDATE));
-			ggtt_bound = true;
+			ggtt_bound |= i915_vma_rebind(vma);
 		}
 
 		if (ggtt_bound)
drivers/gpu/drm/i915/i915_vma.c +10 -0
index 738ff3a5cd6e..1fc54686c2c3 100644
@@ -648,3 +648,13 @@ int i915_vma_unbind(struct i915_vma *vma)
 	return 0;
 }
 
+bool i915_vma_rebind(struct i915_vma *vma)
+{
+	if (i915_vma_is_pinned(vma)) {
+		WARN_ON(i915_vma_bind(vma, vma->obj->cache_level, PIN_UPDATE));
+		return true;
+	} else {
+		WARN_ON(i915_vma_unbind(vma));
+		return false;
+	}
+}
drivers/gpu/drm/i915/i915_vma.h +4 -2
index 2e49f5dd6107..16fa9cdc0dd2 100644
@@ -200,8 +200,11 @@ i915_vma_compare(struct i915_vma *vma,
 		      sizeof(view->params));
 }
 
-int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,
+int i915_vma_bind(struct i915_vma *vma,
+		  enum i915_cache_level cache_level,
 		  u32 flags);
+bool i915_vma_rebind(struct i915_vma *vma);
+
 bool i915_gem_valid_gtt_space(struct i915_vma *vma, unsigned long cache_level);
 bool
 i915_vma_misplaced(struct i915_vma *vma, u64 size, u64 alignment, u64 flags);
@@ -339,4 +342,3 @@ i915_vma_unpin_fence(struct i915_vma *vma)
 }
 
 #endif
-
Signature · 6 lines
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] drm/i915: Cleanup i915_gem_restore_gtt_mappings()

Quoted 8 lines · David Weinehall

On resume we unbind+bind our VMA-mappings. This patch simplifies this a bit by introducing a rebind() helper. As a nice side-effect this also makes the resume callgraph self-documenting.

Patch by Chris.

Not really sold all that much on this being more readable. Looks correct, but needs some more acks form Tvrtko or Joonas. With that you can have my r-b. Patches 2&3 look correct and are

Quoted 71 lines
---
 drivers/gpu/drm/i915/i915_gem_gtt.c |  7 +------
 drivers/gpu/drm/i915/i915_vma.c     | 10 ++++++++++
 drivers/gpu/drm/i915/i915_vma.h     |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -6
index b4bde1452f2a..76af33443fcd 100644
@@ -3299,12 +3299,7 @@ void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
 			if (vma->vm != &ggtt->base)
 				continue;
 
-			if (!i915_vma_unbind(vma))
-				continue;
-
-			WARN_ON(i915_vma_bind(vma, obj->cache_level,
-					      PIN_UPDATE));
-			ggtt_bound = true;
+			ggtt_bound |= i915_vma_rebind(vma);
 		}
 
 		if (ggtt_bound)
drivers/gpu/drm/i915/i915_vma.c +10 -0
index 738ff3a5cd6e..1fc54686c2c3 100644
@@ -648,3 +648,13 @@ int i915_vma_unbind(struct i915_vma *vma)
 	return 0;
 }
 
+bool i915_vma_rebind(struct i915_vma *vma)
+{
+	if (i915_vma_is_pinned(vma)) {
+		WARN_ON(i915_vma_bind(vma, vma->obj->cache_level, PIN_UPDATE));
+		return true;
+	} else {
+		WARN_ON(i915_vma_unbind(vma));
+		return false;
+	}
+}
drivers/gpu/drm/i915/i915_vma.h +4 -2
index 2e49f5dd6107..16fa9cdc0dd2 100644
@@ -200,8 +200,11 @@ i915_vma_compare(struct i915_vma *vma,
 		      sizeof(view->params));
 }
 
-int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,
+int i915_vma_bind(struct i915_vma *vma,
+		  enum i915_cache_level cache_level,
 		  u32 flags);
+bool i915_vma_rebind(struct i915_vma *vma);
+
 bool i915_gem_valid_gtt_space(struct i915_vma *vma, unsigned long cache_level);
 bool
 i915_vma_misplaced(struct i915_vma *vma, u64 size, u64 alignment, u64 flags);
@@ -339,4 +342,3 @@ i915_vma_unpin_fence(struct i915_vma *vma)
 }
 
 #endif
-
Signature · 6 lines
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [PATCH 1/3] drm/i915: Cleanup i915_gem_restore_gtt_mappings()

In reply to David Weinehall
Quoted 40 lines · David Weinehall

On resume we unbind+bind our VMA-mappings. This patch simplifies this a bit by introducing a rebind() helper. As a nice side-effect this also makes the resume callgraph self-documenting.

Patch by Chris.

---
 drivers/gpu/drm/i915/i915_gem_gtt.c |  7 +------
 drivers/gpu/drm/i915/i915_vma.c     | 10 ++++++++++
 drivers/gpu/drm/i915/i915_vma.h     |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -6
index b4bde1452f2a..76af33443fcd 100644
@@ -3299,12 +3299,7 @@ void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
 			if (vma->vm != &ggtt->base)
 				continue;
 
-			if (!i915_vma_unbind(vma))
-				continue;
-
-			WARN_ON(i915_vma_bind(vma, obj->cache_level,
-					      PIN_UPDATE));
-			ggtt_bound = true;
+			ggtt_bound |= i915_vma_rebind(vma);
 		}
 
 		if (ggtt_bound)
drivers/gpu/drm/i915/i915_vma.c +0 -0
index 738ff3a5cd6e..1fc54686c2c3 100644
@@ -648,3 +648,13 @@ int i915_vma_unbind(struct i915_vma *vma)
 	return 0;
 }
 

drivers/gpu/drm/i915/i915_vma.c int i915_vma_unbind(struct i915_vma *vma) · line 660

Quoted 10 lines
drivers/gpu/drm/i915/i915_vma.c +10 -0
+bool i915_vma_rebind(struct i915_vma *vma)
+{
+	if (i915_vma_is_pinned(vma)) {
+		WARN_ON(i915_vma_bind(vma, vma->obj->cache_level, PIN_UPDATE));
+		return true;
+	} else {
+		WARN_ON(i915_vma_unbind(vma));
+		return false;
+	}
+}

This function is a little warny for general consumption.

I think I would prefer this next to i915_gem_restore_gtt_mappings() as perhaps static bool restore_vma(struct i915_vma *vma) {} -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH 2/3 drm/i915: Take runtime pm in i915_gem_resume()

In reply to David Weinehall

In i915_gem_resume(), before calling i915_gem_restore_gtt_mappings(), we want to take the runtime PM reference; this to allow for later optimisation.

---
 drivers/gpu/drm/i915/i915_gem.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +2 -0
index 7b9f5b99b0f3..35c4ed17b898 100644
@@ -4229,6 +4229,7 @@ void i915_gem_resume(struct drm_device *dev)
 
 	WARN_ON(dev_priv->gt.awake);
 
+	intel_runtime_pm_get(dev_priv);
 	mutex_lock(&dev->struct_mutex);
 	i915_gem_restore_gtt_mappings(dev_priv);
 
@@ -4239,6 +4240,7 @@ void i915_gem_resume(struct drm_device *dev)
 	dev_priv->gt.resume(dev_priv);
 
 	mutex_unlock(&dev->struct_mutex);
+	intel_runtime_pm_put(dev_priv);
 }
 
 void i915_gem_init_swizzling(struct drm_i915_private *dev_priv)
Signature · 6 lines
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/3
#5 lore raw

Re: [PATCH 2/3] drm/i915: Take runtime pm in i915_gem_resume()

Quoted 3 lines · David Weinehall

In i915_gem_resume(), before calling i915_gem_restore_gtt_mappings(), we want to take the runtime PM reference; this to allow for later optimisation.

...to hold the rpm wakelocks for the entire duration instead of many short lived wakelocks around each access to the GGTT. We will take it in i915_gem_resume() as any other GEM operation is likely to require the gT powerwell as well.

Quoted 2 lines

-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH 3/3 drm/i915: optimise intel_runtime_pm_{get, put}

In reply to David Weinehall

Benchmarking shows that on resume we spend quite a bit of time just taking and dropping these references, leaving us two options; either rewriting the code not to take these references more than once, which would be a rather invasive change since the involved functions are used from other places, or to optimise intel_runtime_pm_{get,put}(). This patch does the latter. Initial benchmarking indicate improvements of a couple of milliseconds on resume.

Original patch by Chris, with slight fixes by me.

---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/gpu/drm/i915/intel_runtime_pm.c +12 -0
index 356c662ad453..4bf279023b39 100644
@@ -2632,6 +2632,9 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	pm_runtime_get_sync(kdev);
 
 	atomic_inc(&dev_priv->pm.wakeref_count);
@@ -2653,6 +2656,9 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	if (IS_ENABLED(CONFIG_PM)) {
 		int ret = pm_runtime_get_if_in_use(kdev);
 
@@ -2695,6 +2701,9 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	assert_rpm_wakelock_held(dev_priv);
 	pm_runtime_get_noresume(kdev);
 
@@ -2714,6 +2723,9 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (!atomic_dec_and_test(&dev_priv->pm.wakeref_count))
+		return;
+
 	assert_rpm_wakelock_held(dev_priv);
 	atomic_dec(&dev_priv->pm.wakeref_count);
 
Signature · 6 lines
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

Re: [PATCH 3/3] drm/i915: optimise intel_runtime_pm_{get, put}

Quoted 52 lines · David Weinehall

Benchmarking shows that on resume we spend quite a bit of time just taking and dropping these references, leaving us two options; either rewriting the code not to take these references more than once, which would be a rather invasive change since the involved functions are used from other places, or to optimise intel_runtime_pm_{get,put}(). This patch does the latter. Initial benchmarking indicate improvements of a couple of milliseconds on resume.

Original patch by Chris, with slight fixes by me.

---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/gpu/drm/i915/intel_runtime_pm.c +9 -0
index 356c662ad453..4bf279023b39 100644
@@ -2632,6 +2632,9 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	pm_runtime_get_sync(kdev);
 
 	atomic_inc(&dev_priv->pm.wakeref_count);
@@ -2653,6 +2656,9 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	if (IS_ENABLED(CONFIG_PM)) {
 		int ret = pm_runtime_get_if_in_use(kdev);
 
@@ -2695,6 +2701,9 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	assert_rpm_wakelock_held(dev_priv);
 	pm_runtime_get_noresume(kdev);
 

drivers/gpu/drm/i915/intel_runtime_pm.c void intel_runtime_pm_put(struct drm_i915_private *dev_priv) · line 2730

Quoted 8 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +3 -0
@@ -2714,6 +2723,9 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (!atomic_dec_and_test(&dev_priv->pm.wakeref_count))
+		return;
+
 	assert_rpm_wakelock_held(dev_priv);
 	atomic_dec(&dev_priv->pm.wakeref_count);

Have to remove this dec. Time to retest ;-)
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

Re: [PATCH 3/3] drm/i915: optimise intel_runtime_pm_{get, put}

Quoted 56 lines · Chris Wilson
Quoted 55 lines · David Weinehall

Benchmarking shows that on resume we spend quite a bit of time just taking and dropping these references, leaving us two options; either rewriting the code not to take these references more than once, which would be a rather invasive change since the involved functions are used from other places, or to optimise intel_runtime_pm_{get,put}(). This patch does the latter. Initial benchmarking indicate improvements of a couple of milliseconds on resume.

Original patch by Chris, with slight fixes by me.

---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/gpu/drm/i915/intel_runtime_pm.c +9 -0
index 356c662ad453..4bf279023b39 100644
@@ -2632,6 +2632,9 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	pm_runtime_get_sync(kdev);
 
 	atomic_inc(&dev_priv->pm.wakeref_count);
@@ -2653,6 +2656,9 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	if (IS_ENABLED(CONFIG_PM)) {
 		int ret = pm_runtime_get_if_in_use(kdev);
 
@@ -2695,6 +2701,9 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
+	if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))
+		return;
+
 	assert_rpm_wakelock_held(dev_priv);
 	pm_runtime_get_noresume(kdev);
 
@@ -2714,6 +2723,9 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct device *kdev = &pdev->dev;
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_runtime_pm.c void intel_runtime_pm_put(struct drm_i915_private *dev_priv) · line 2730

Quoted 5 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +3 -0
+	if (!atomic_dec_and_test(&dev_priv->pm.wakeref_count))
+		return;
+
 	assert_rpm_wakelock_held(dev_priv);
 	atomic_dec(&dev_priv->pm.wakeref_count);

Have to remove this dec. Time to retest ;-)

Will retest with that (and fix the return-type error).

Kind regards, David
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

Re: [PATCH 3/3] drm/i915: optimise intel_runtime_pm_{get, put}

In reply to David Weinehall
reproduce:

Hi David,

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on next-20161117]
[cannot apply to v4.9-rc5]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/David-Weinehall/Resume-time-optimisation/20161118-181301
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-x009-201646 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

drivers/gpu/drm/i915/intel_runtime_pm.c: In function 'intel_runtime_pm_get_if_in_use':

>> drivers/gpu/drm/i915/intel_runtime_pm.c:2660:3: warning: 'return' with no value, in function returning non-void [-Wreturn-type]
      return;
      ^~~~~~

drivers/gpu/drm/i915/intel_runtime_pm.c:2654:6: note: declared here
bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

vim +/return +2660 drivers/gpu/drm/i915/intel_runtime_pm.c

2644 /**
2645 * intel_runtime_pm_get_if_in_use - grab a runtime pm reference if device in use
2646 * @dev_priv: i915 device instance
2647 *
2648 * This function grabs a device-level runtime pm reference if the device is
2649 * already in use and ensures that it is powered up.
2650 *
2651 * Any runtime pm reference obtained by this function must have a symmetric
2652 * call to intel_runtime_pm_put() to release the reference again.
2653 */
2654 bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
2655 {
2656 struct pci_dev *pdev = dev_priv->drm.pdev;
2657 struct device *kdev = &pdev->dev;
2658
2659 if (atomic_inc_not_zero(&dev_priv->pm.wakeref_count))

> 2660			return;

2661
2662 if (IS_ENABLED(CONFIG_PM)) {
2663 int ret = pm_runtime_get_if_in_use(kdev);
2664
2665 /*
2666 * In cases runtime PM is disabled by the RPM core and we get
2667 * an -EINVAL return value we are not supposed to call this
2668 * function, since the power state is undefined. This applies

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

✗ Fi.CI.BAT: failure for Resume time optimisation

In reply to David Weinehall
== Series Details ==

== Series Details ==

Series: Resume time optimisation
URL : https://patchwork.freedesktop.org/series/15545/
State : failure

== Summary ==

  CC [M]  drivers/gpu/drm/i915/gvt/interrupt.o
  CC [M]  drivers/gpu/drm/i915/gvt/gtt.o
  CC [M]  drivers/gpu/drm/i915/gvt/opregion.o
  CC [M]  drivers/gpu/drm/i915/gvt/cfg_space.o
  LD      lib/raid6/raid6_pq.o
  CC [M]  drivers/gpu/drm/i915/gvt/edid.o
  CC [M]  drivers/gpu/drm/i915/gvt/display.o
  LD      drivers/pci/built-in.o
  CC [M]  drivers/gpu/drm/i915/gvt/mmio.o
  CC [M]  drivers/gpu/drm/i915/gvt/execlist.o
  CC [M]  drivers/gpu/drm/i915/gvt/scheduler.o
  CC [M]  drivers/gpu/drm/i915/gvt/sched_policy.o
  CC [M]  drivers/gpu/drm/i915/gvt/render.o
  CC [M]  drivers/gpu/drm/i915/gvt/cmd_parser.o
  LD      lib/raid6/built-in.o
  LD [M]  drivers/ssb/ssb.o
  LD      drivers/acpi/acpica/acpi.o
  LD [M]  drivers/net/usb/asix.o
  LD      drivers/md/dm-mod.o
  LD [M]  drivers/misc/mei/mei-me.o
  LD      net/ipv6/ipv6.o
  LD      drivers/misc/built-in.o
  LD      drivers/acpi/acpica/built-in.o
  LD      net/xfrm/built-in.o
  LD      net/ipv6/built-in.o
  LD [M]  drivers/net/ethernet/broadcom/genet/genet.o
  LD      drivers/acpi/built-in.o
  LD      drivers/gpu/drm/drm.o
  LD      drivers/usb/storage/usb-storage.o
  LD      drivers/scsi/scsi_mod.o
  LD      drivers/usb/storage/built-in.o
  LD      drivers/tty/serial/8250/8250.o
  LD      drivers/iommu/built-in.o
  LD      drivers/spi/built-in.o
  LD [M]  sound/pci/hda/snd-hda-codec-generic.o
  LD      sound/pci/built-in.o
  LD      drivers/video/fbdev/core/fb.o

drivers/gpu/drm/i915/intel_runtime_pm.c: In function ‘intel_runtime_pm_get_if_in_use’:
drivers/gpu/drm/i915/intel_runtime_pm.c:2660:3: error: ‘return’ with no value, in function returning non-void [-Werror=return-type]
return;
^

  LD      drivers/video/fbdev/core/built-in.o
  LD      drivers/video/fbdev/built-in.o
  LD      sound/built-in.o
  LD      drivers/video/console/built-in.o
  LD [M]  drivers/usb/serial/usbserial.o
  LD      drivers/video/built-in.o
  LD      drivers/thermal/thermal_sys.o
  LD      drivers/thermal/built-in.o
  LD      drivers/usb/gadget/libcomposite.o
  LD      drivers/usb/gadget/udc/udc-core.o
  LD      drivers/usb/gadget/udc/built-in.o
  LD      drivers/usb/gadget/built-in.o
  LD      drivers/scsi/sd_mod.o
  LD      drivers/scsi/built-in.o
  LD [M]  drivers/net/ethernet/intel/e1000/e1000.o
  LD      fs/btrfs/btrfs.o
  LD [M]  drivers/net/ethernet/intel/igbvf/igbvf.o
  LD      net/ipv4/built-in.o
  AR      lib/lib.a
  LD      drivers/tty/serial/8250/8250_base.o
  LD      drivers/tty/serial/8250/built-in.o
  EXPORTS lib/lib-ksyms.o
  LD      drivers/tty/serial/built-in.o
  LD      fs/btrfs/built-in.o
  LD      lib/built-in.o

cc1: all warnings being treated as errors
scripts/Makefile.build:290: recipe for target 'drivers/gpu/drm/i915/intel_runtime_pm.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_runtime_pm.o] Error 1
make[4]: *** Waiting for unfinished jobs....

  LD      drivers/usb/core/usbcore.o
  LD      drivers/usb/core/built-in.o
  CC      arch/x86/kernel/cpu/capflags.o
  LD      arch/x86/kernel/cpu/built-in.o
  LD      arch/x86/kernel/built-in.o
  LD      drivers/tty/vt/built-in.o
  LD      drivers/tty/built-in.o
  LD      arch/x86/built-in.o
  LD      drivers/md/md-mod.o
  LD      drivers/md/built-in.o
  LD      drivers/usb/host/xhci-hcd.o
  LD      net/core/built-in.o
  LD      net/built-in.o
  LD [M]  drivers/net/ethernet/intel/igb/igb.o
  LD      fs/ext4/ext4.o
  LD      fs/ext4/built-in.o
  LD      fs/built-in.o
  LD      drivers/usb/host/built-in.o
  LD      drivers/usb/built-in.o
  LD [M]  drivers/net/ethernet/intel/e1000e/e1000e.o
  LD      drivers/net/ethernet/built-in.o
  LD      drivers/net/built-in.o

scripts/Makefile.build:475: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:475: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:475: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:985: recipe for target 'drivers' failed
make: *** [drivers] Error 2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx