[Intel-gfx] [PATCH] drm/i915/selftests: Avoid warning if runtime pm is disabled

Rodrigo Vivi rodrigo.vivi at intel.com
Fri Jul 6 21:21:40 UTC 2018


On Fri, Jul 06, 2018 at 09:59:47PM +0100, Chris Wilson wrote:
> Inside the mock GEM device, we try to grab the runtime pm for the fake
> device to prevent it from ever suspending. However, if CONFIG_PM is not
> set, trying to obtain the wakref returns an error which we WARN about.
> Suppress the expected warning.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> index c97075c5ccaf..43ed8b28aeaa 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> @@ -157,7 +157,8 @@ struct drm_i915_private *mock_gem_device(void)
>  	dev_pm_domain_set(&pdev->dev, &pm_domain);
>  	pm_runtime_enable(&pdev->dev);
>  	pm_runtime_dont_use_autosuspend(&pdev->dev);
> -	WARN_ON(pm_runtime_get_sync(&pdev->dev));
> +	if (pm_runtime_enabled(&pdev->dev))

I have the impression there are more places that we need this check...

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> +		WARN_ON(pm_runtime_get_sync(&pdev->dev));
>  
>  	i915 = (struct drm_i915_private *)(pdev + 1);
>  	pci_set_drvdata(pdev, i915);
> -- 
> 2.18.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx


More information about the Intel-gfx mailing list