tests/device_reset: check for i915 in unbind_reset_rebind()

1/1

---
 tests/device_reset.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
index 9cb59ee4..9347a3f4 100644
@@ -232,7 +232,7 @@ static void set_device_filter(const char* dev_path)
 
 static void unbind_reset_rebind(struct device_fds *dev)
 {
-	uint32_t devid = intel_get_drm_devid(dev->fds.dev);
+	uint32_t devid;
 	igt_debug("close the device\n");
 	close_if_opened(&dev->fds.dev);
 

@@ -242,9 +242,12 @@ static void unbind_reset_rebind(struct device_fds *dev)
 	 * The below CI friendly user level workaround prevents the warning from
 	 * appearing. Drop this hack as soon as this is fixed in the kernel.
 	 */
-	if (igt_warn_on_f((bool) IS_HASWELL(devid) || IS_BROADWELL(devid),
-	    "Manually enabling audio PM to work around a kernel WARN\n"))
-		igt_pm_enable_audio_runtime_pm();
+	if (is_i915_device(dev->fds.dev)) {
+		devid = intel_get_drm_devid(dev->fds.dev);
+		if (igt_warn_on_f((bool) IS_HASWELL(devid) || IS_BROADWELL(devid),
+		    "Manually enabling audio PM to work around a kernel WARN\n"))
+			igt_pm_enable_audio_runtime_pm();
+	}
 
 	driver_unbind(dev);
 

2.28.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 tests/device_reset.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
index 9cb59ee4..9347a3f4 100644

@@ -232,7 +232,7 @@ static void set_device_filter(const char* dev_path)
 
 static void unbind_reset_rebind(struct device_fds *dev)
 {
-       uint32_t devid = intel_get_drm_devid(dev->fds.dev);
+       uint32_t devid;

        igt_debug("close the device\n");
        close_if_opened(&dev->fds.dev);
 

@@ -242,9 +242,12 @@ static void unbind_reset_rebind(struct device_fds *dev)
         * The below CI friendly user level workaround prevents the warning from
         * appearing. Drop this hack as soon as this is fixed in the kernel.
         */
-       if (igt_warn_on_f((bool) IS_HASWELL(devid) || IS_BROADWELL(devid),
-           "Manually enabling audio PM to work around a kernel WARN\n"))
-               igt_pm_enable_audio_runtime_pm();
+       if (is_i915_device(dev->fds.dev)) {
+               devid = intel_get_drm_devid(dev->fds.dev);
+               if (igt_warn_on_f((bool) IS_HASWELL(devid) || IS_BROADWELL(devid),

+                   "Manually enabling audio PM to work around a kernel WARN\n"))
+                       igt_pm_enable_audio_runtime_pm();
+       }
 
        driver_unbind(dev);
 

2.28.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
 tests/device_reset.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
index 9cb59ee4..eef70733 100644
@@ -232,7 +232,6 @@ static void set_device_filter(const char* dev_path)
 
 static void unbind_reset_rebind(struct device_fds *dev)
 {
-	uint32_t devid = intel_get_drm_devid(dev->fds.dev);
 	igt_debug("close the device\n");
 	close_if_opened(&dev->fds.dev);
 

@@ -242,9 +241,12 @@ static void unbind_reset_rebind(struct device_fds *dev)
 	 * The below CI friendly user level workaround prevents the warning from
 	 * appearing. Drop this hack as soon as this is fixed in the kernel.
 	 */
-	if (igt_warn_on_f((bool) IS_HASWELL(devid) || IS_BROADWELL(devid),
-	    "Manually enabling audio PM to work around a kernel WARN\n"))
-		igt_pm_enable_audio_runtime_pm();
+	if (is_i915_device(dev->fds.dev)) {
+		uint32_t devid = intel_get_drm_devid(dev->fds.dev);
+		if (igt_warn_on_f(IS_HASWELL(devid) || IS_BROADWELL(devid),
+		    "Manually enabling audio PM to work around a kernel WARN\n"))
+			igt_pm_enable_audio_runtime_pm();
+	}
 
 	driver_unbind(dev);
 

2.28.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
 tests/device_reset.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
index 9cb59ee4..eef70733 100644
@@ -232,7 +232,6 @@ static void set_device_filter(const char* dev_path)
 
 static void unbind_reset_rebind(struct device_fds *dev)
 {
-       uint32_t devid = intel_get_drm_devid(dev->fds.dev);
        igt_debug("close the device\n");
        close_if_opened(&dev->fds.dev);
 

@@ -242,9 +241,12 @@ static void unbind_reset_rebind(struct device_fds *dev)
         * The below CI friendly user level workaround prevents the warning from

         * appearing. Drop this hack as soon as this is fixed in the kernel.
         */
-       if (igt_warn_on_f((bool) IS_HASWELL(devid) || IS_BROADWELL(devid),
-           "Manually enabling audio PM to work around a kernel WARN\n"))
-               igt_pm_enable_audio_runtime_pm();
+       if (is_i915_device(dev->fds.dev)) {
+               uint32_t devid = intel_get_drm_devid(dev->fds.dev);
+               if (igt_warn_on_f(IS_HASWELL(devid) || IS_BROADWELL(devid),
+                   "Manually enabling audio PM to work around a kernel WARN\n"))
+                       igt_pm_enable_audio_runtime_pm();


tests/device_reset: check for i915 in unbind_reset_rebind()

Jeremy Cline

Chris Wilson

Patchwork

Jeremy Cline

Chris Wilson

Patchwork

Patchwork

Patchwork