rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Quiet WARN in i915 edp VDD handling

This commit is contained in:
Josh Boyer 2014-11-14 09:24:46 -05:00
parent 0bf585729e
commit 3df10215a6
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch Normal file
View File

@ -0,0 +1,30 @@
From 267eb54f9e4be5e78a1375553f3ea0f5768cd117 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Fri, 14 Nov 2014 09:17:39 -0500
Subject: [PATCH] drm/i915: Don't WARN in edp_panel_vdd_off
After talking with ajax, this isn't really worth splashing a backtrace
about. The handling here is reworked in 3.18, but the fixes are a bit
larger than we want to backport. Just shut it up for now.
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
---
drivers/gpu/drm/i915/intel_dp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index fdff1d420c14..37d576141a36 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1303,7 +1303,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
if (!is_edp(intel_dp))
return;
- WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
+ DRM_DEBUG_KMS(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
intel_dp->want_panel_vdd = false;
--
1.9.3

3
kernel.spec
View File

@ -551,6 +551,7 @@ Patch1019: Add-sysrq-option-to-disable-secure-boot-mode.patch
# nouveau + drm fixes
# intel drm is all merged upstream
Patch1826: drm-i915-hush-check-crtc-state.patch
Patch1827: drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch
# Quiet boot fixes
@ -1385,6 +1386,7 @@ ApplyPatch Add-sysrq-option-to-disable-secure-boot-mode.patch
# Intel DRM
ApplyPatch drm-i915-hush-check-crtc-state.patch
ApplyPatch drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch
# Radeon DRM
@ -2384,6 +2386,7 @@ fi
# || ||
%changelog
* Fri Nov 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Quiet WARN in i915 edp VDD handling
- Enable I40EVF driver (rhbz 1164029)
* Thu Nov 13 2014 Josh Boyer <jwboyer@fedoraproject.org>