From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 3/4] drm/i915: don't call dpms funcs after set_mode
Date: Thu, 6 Sep 2012 22:08:34 +0200 [thread overview]
Message-ID: <1346962115-7267-4-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch>
... because our current set_mode implementation doesn't bother to adjust
for the dpms state, we just forcefully update it. So stop pretending that
we're better than we are and rip out this extranous call.
Note that this totally confuses userspace, because the exposed connector
property isn't actually updated ...
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0973797..805324d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7236,7 +7236,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
struct drm_mode_set save_set;
struct intel_set_config *config;
int ret;
- int i;
BUG_ON(!set);
BUG_ON(!set->crtc);
@@ -7300,15 +7299,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
ret = -EINVAL;
goto fail;
}
-
- if (set->crtc->enabled) {
- DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
- for (i = 0; i < set->num_connectors; i++) {
- DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
- drm_get_connector_name(set->connectors[i]));
- set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
- }
- }
} else if (config->fb_changed) {
ret = intel_pipe_set_base(set->crtc,
set->x, set->y, set->fb);
--
1.7.11.2
next prev parent reply other threads:[~2012-09-06 21:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 20:08 [PATCH 0/4] some follow-up fixlets from the modeset rework Daniel Vetter
2012-09-06 20:08 ` [PATCH 1/4] drm/i915: rip out intel_disable_pch_ports Daniel Vetter
2012-09-13 20:37 ` Jesse Barnes
2012-09-06 20:08 ` [PATCH 2/4] drm/i915: don't disable fdi links harder in ilk_crtc_enable Daniel Vetter
2012-09-13 20:38 ` Jesse Barnes
2012-09-06 20:08 ` Daniel Vetter [this message]
2012-09-13 20:41 ` [PATCH 3/4] drm/i915: don't call dpms funcs after set_mode Jesse Barnes
2012-09-06 20:08 ` [PATCH 4/4] drm/i915: update dpms property in set_mode Daniel Vetter
2012-09-13 20:42 ` Jesse Barnes
2012-09-14 21:38 ` 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=1346962115-7267-4-git-send-email-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--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