From 98ec45f763e8b06d05adf490ced353d889e02757 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Tue, 18 Dec 2012 20:30:47 +0100 Subject: [PATCH] --- yaml --- r: 348641 b: refs/heads/master c: 92441b2263866c27ef48137be5aa6c8c692652fc h: refs/heads/master i: 348639: c54a33e92ee97127d56a1d0c55583474472d3e05 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_dfp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aabe074304cd..3cb47c194b66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd5700ea98ad0b375a72525ce7d7edddf15b2693 +refs/heads/master: 92441b2263866c27ef48137be5aa6c8c692652fc diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_dfp.c b/trunk/drivers/gpu/drm/nouveau/nv04_dfp.c index 184cdf806761..39ffc07f906b 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv04_dfp.c +++ b/trunk/drivers/gpu/drm/nouveau/nv04_dfp.c @@ -505,7 +505,7 @@ static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) static inline bool is_powersaving_dpms(int mode) { - return (mode != DRM_MODE_DPMS_ON); + return mode != DRM_MODE_DPMS_ON && mode != NV_DPMS_CLEARED; } static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode)