diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-19 12:05:06 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-19 12:05:06 -0700 |
| commit | e1d176680ed4f6970582086191eb7377a80a2d4e (patch) | |
| tree | 757c360511d776ec94d2404741ed7752eb4c57ba /drivers/gpu/drm/i915 | |
| parent | 7c9f84b144ef3bf73befadc8652731b5dabb27c2 (diff) | |
| parent | 5dfe87ac34e2326ae2957fc68b63212d84f78701 (diff) | |
Merge tag 'v4.14.70' into linux-linaro-lsk-v4.14
This is the 4.14.70 stable release
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lpe_audio.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lspcon.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c index 2fdf302ebdad..8a541d0e3e80 100644 --- a/drivers/gpu/drm/i915/intel_lpe_audio.c +++ b/drivers/gpu/drm/i915/intel_lpe_audio.c @@ -128,9 +128,7 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv) kfree(rsc); - pm_runtime_forbid(&platdev->dev); - pm_runtime_set_active(&platdev->dev); - pm_runtime_enable(&platdev->dev); + pm_runtime_no_callbacks(&platdev->dev); return platdev; diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c index beb9baaf2f2e..f71fef10ecc6 100644 --- a/drivers/gpu/drm/i915/intel_lspcon.c +++ b/drivers/gpu/drm/i915/intel_lspcon.c @@ -75,7 +75,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon, lspcon_mode_name(mode)); wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode || - current_mode == DRM_LSPCON_MODE_INVALID, 100); + current_mode == DRM_LSPCON_MODE_INVALID, 400); if (current_mode != mode) DRM_DEBUG_KMS("LSPCON mode hasn't settled\n"); |