OSDN Git Service

drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM)
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 25 Feb 2016 21:10:28 +0000 (21:10 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 1 Mar 2016 02:36:47 +0000 (12:36 +1000)
commitead8f34c701ec7bf3234118b8c746227f30dfd1a
tree318c870bc9f81257a72dfbd9bbd919b731337efd
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af
drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM)

commit 09731280028ce03e6a27e1998137f1775a2839f3
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 17 14:17:42 2016 +0200

    drm/i915: Add helper to get a display power ref if it was already enabled

left the rpm wakelock assertions unbalanced if CONFIG_PM was disabled as
intel_runtime_pm_get_if_in_use() would return true without incrementing
the local bookkeeping required for the assertions.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
CC: Mika Kuoppala <mika.kuoppala@intel.com>
CC: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
CC: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/i915/intel_runtime_pm.c