From: Eric Anholt <eric@anholt.net>
Date: Mon, 15 May 2017 16:28:36 +0000 (-0700)
Subject: drm/vc4: Mark the device as active when enabling runtime PM.
X-Git-Tag: archive/raspbian/4.9.30-2+deb9u2+rpi1~5^2~68
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9c4d459e96bceffc290c8b86af8af62ae7202ac7;p=linux-4.9.git

drm/vc4: Mark the device as active when enabling runtime PM.

Failing to do so meant that we got a resume() callback on first use of
the device, so we would leak the bin BO that we allocated during
probe.

Signed-off-by: Eric Anholt <eric@anholt.net>
Fixes: 553c942f8b2c ("drm/vc4: Allow using more than 256MB of CMA memory.")
---

diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
index 882ec06225f1..77ed4ef3b8c8 100644
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -372,6 +372,7 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data)
 		return ret;
 	}
 
+	pm_runtime_set_active(dev);
 	pm_runtime_use_autosuspend(dev);
 	pm_runtime_set_autosuspend_delay(dev, 40); /* a little over 2 frames. */
 	pm_runtime_enable(dev);