[igt-dev] [PATCH i-g-t v2] tests/device_reset: check for i915 in unbind_reset_rebind()

[Chris Wilson]

Quoting Jeremy Cline (2020-12-15 19:09:36)
> Commit 265f1d4a5a14 ("tests/device_reset: Work around for driver unbind
> issue with audio") introduced an assertion on is_i915_device() by way of
> intel_get_drm_devid(). Since this is a work-around for an i915-specific
> issue, guard it with a check on the device type so the test runs on
> other devices.
> 
> Signed-off-by: Jeremy Cline <jcline at redhat.com>
> ---
> Changes since v1:
>  - dropped redundant cast to bool in guarded code, moved devid
>    declaration (thanks Chris Wilson for the review)
> 
>  tests/device_reset.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/device_reset.c b/tests/device_reset.c
> index 9cb59ee4..eef70733 100644
> --- a/tests/device_reset.c
> +++ b/tests/device_reset.c
> @@ -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();

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris