From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 6/6] drm/i915: inform drm_fb_helper if we abandoned a connected output
Date: Thu, 12 Dec 2013 12:41:57 -0800 [thread overview]
Message-ID: <1386880917-2951-6-git-send-email-jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <1386880917-2951-1-git-send-email-jbarnes@virtuousgeek.org>
Otherwise subsequent fb activity will try to do blank/unblank on outputs
that were never fully enabled.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
drivers/gpu/drm/i915/intel_fbdev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 53675d2..dcadd32 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -308,6 +308,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
if (!encoder || !encoder->crtc) {
DRM_DEBUG_KMS("connector %d has no encoder or crtc, skipping\n",
connector->base.id);
+ enabled[i] = false;
continue;
}
@@ -315,6 +316,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
DRM_DEBUG_KMS("connector %s on crtc %d has inconsistent state, aborting\n",
drm_get_connector_name(connector),
encoder->crtc->base.id);
+ enabled[i] = false;
return false;
}
@@ -322,6 +324,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
DRM_DEBUG_KMS("connector %s on inactive crtc %d, borting\n",
drm_get_connector_name(connector),
encoder->crtc->base.id);
+ enabled[i] = false;
return false;
}
--
1.8.4.2
next prev parent reply other threads:[~2013-12-12 20:48 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 20:41 [PATCH 1/6] drm/i915: unconditionally copy mode into crtc at boot time Jesse Barnes
2013-12-12 20:41 ` [PATCH 2/6] drm/i915: retrieve current fb config into new plane_config structure at init Jesse Barnes
2013-12-14 11:01 ` Daniel Vetter
2013-12-17 0:01 ` Jesse Barnes
2013-12-17 8:38 ` Daniel Vetter
2013-12-17 21:04 ` Jesse Barnes
2013-12-17 21:19 ` Daniel Vetter
2013-12-12 20:41 ` [PATCH 3/6] drm/i915: Wrap the preallocated BIOS framebuffer and preserve for KMS fbcon v7 Jesse Barnes
2013-12-12 22:54 ` Daniel Vetter
2013-12-12 23:45 ` Jesse Barnes
2013-12-13 19:09 ` Jesse Barnes
2013-12-13 20:47 ` Daniel Vetter
2013-12-14 0:43 ` Jesse Barnes
2013-12-14 10:44 ` Daniel Vetter
2013-12-14 11:33 ` Daniel Vetter
2013-12-14 11:13 ` Daniel Vetter
2013-12-14 11:36 ` Daniel Vetter
2014-02-05 14:57 ` Jesse Barnes
2013-12-12 20:41 ` [PATCH 4/6] drm/i915: don't memset the fb buffer if preallocated Jesse Barnes
2013-12-14 11:28 ` Daniel Vetter
2013-12-17 0:17 ` Jesse Barnes
2013-12-17 7:56 ` Daniel Vetter
2013-12-12 20:41 ` [PATCH 5/6] drm/i915/vlv: move DPIO init earlier v2 Jesse Barnes
2013-12-14 10:47 ` Daniel Vetter
2013-12-17 0:02 ` Jesse Barnes
2013-12-12 20:41 ` Jesse Barnes [this message]
2013-12-12 22:30 ` [PATCH 6/6] drm/i915: inform drm_fb_helper if we abandoned a connected output Chris Wilson
2013-12-12 22:34 ` Jesse Barnes
2013-12-17 0:18 ` Jesse Barnes
2013-12-12 21:21 ` [PATCH 1/6] drm/i915: unconditionally copy mode into crtc at boot time Daniel Vetter
2013-12-12 21:29 ` Jesse Barnes
2013-12-12 22:39 ` Daniel Vetter
2013-12-12 22:44 ` Jesse Barnes
2013-12-12 23:04 ` Daniel Vetter
2013-12-17 0:35 ` Jesse Barnes
2013-12-17 8:00 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386880917-2951-6-git-send-email-jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox