drm/i915/selftests: Attach a stub pm_domain
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 18 Jul 2017 17:30:28 +0000 (18:30 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 19 Jul 2017 12:19:51 +0000 (13:19 +0100)
Supply a pm_domain and its ops for our mock GEM device so that
device runtime pm doesn't complain even though we only want to mark it
permanently active!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20170718173028.31207-1-chris@chris-wilson.co.uk
Tested-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
drivers/gpu/drm/i915/selftests/mock_gem_device.c

index 7a468cb309466d631223268deef736128740d855..d451dfbe9bbbbc4a7bcb1ef7f97c4790ec9806f7 100644 (file)
@@ -22,6 +22,7 @@
  *
  */
 
+#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 
 #include "mock_engine.h"
@@ -109,6 +110,23 @@ static void mock_idle_work_handler(struct work_struct *work)
 {
 }
 
+static int pm_domain_resume(struct device *dev)
+{
+       return pm_generic_runtime_resume(dev);
+}
+
+static int pm_domain_suspend(struct device *dev)
+{
+       return pm_generic_runtime_suspend(dev);
+}
+
+static struct dev_pm_domain pm_domain = {
+       .ops = {
+               .runtime_suspend = pm_domain_suspend,
+               .runtime_resume = pm_domain_resume,
+       },
+};
+
 struct drm_i915_private *mock_gem_device(void)
 {
        struct drm_i915_private *i915;
@@ -127,8 +145,10 @@ struct drm_i915_private *mock_gem_device(void)
        dev_set_name(&pdev->dev, "mock");
        dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 
+       dev_pm_domain_set(&pdev->dev, &pm_domain);
+       pm_runtime_enable(&pdev->dev);
        pm_runtime_dont_use_autosuspend(&pdev->dev);
-       pm_runtime_get_sync(&pdev->dev);
+       WARN_ON(pm_runtime_get_sync(&pdev->dev));
 
        i915 = (struct drm_i915_private *)(pdev + 1);
        pci_set_drvdata(pdev, i915);