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 60/76] drm/i915: push commit_output_state past crtc disabling
Date: Thu, 26 Jul 2012 20:49:25 +0200 [thread overview]
Message-ID: <1343328581-2324-61-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch>
This requires a few changes
- We still need a noop function for crtc->disable, becuase the fb
helper is a bit too intimate with the crtc helper.
- We need to clear crtc->fb ourselves in intel_crtc_disable now that
we no longer rely on the helper's disable_unused_functions to do
that.
- We need to split out the sare update code, becuase the crtc code
can't call update_dpms any more, it needs to disable the crtc
unconditionally. This is because we now keep onto the encoder ->
crtc mapping of the (still) active output pipe configuration.
- To check that we really disable a crtc that still has encoders,
insert a WARN_ON(!enabled) in the crtc disable function.
- Lastly, we need to walk over all crtcs to update their enabled state
after having called commit_output_state - for all disabled crtc the
crtc helper code has done that for us previously.
v2: Update connector dpms and encoder->connectors_active after
disabling the crtc, too.
v3: Noop-out intel_encoder_disable. Similarly to the crtc disable
callback used by the crtc helper code we can't simply remove all these
encoder callbacks: The fb helper (which we still use) has a rather
incetious relationship with the crtc helper code ...
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 81 ++++++++++++++++++++++------------
1 file changed, 53 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4a487a2..bcf935d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3461,26 +3461,13 @@ static void i9xx_crtc_off(struct drm_crtc *crtc)
{
}
-/**
- * Sets the power management mode of the pipe and plane.
- */
-void intel_crtc_update_dpms(struct drm_crtc *crtc)
+static void intel_crtc_update_sarea(struct drm_crtc *crtc,
+ bool enabled)
{
struct drm_device *dev = crtc->dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_master_private *master_priv;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct intel_encoder *intel_encoder;
int pipe = intel_crtc->pipe;
- bool enabled, enable = false;
-
- for_each_encoder_on_crtc(dev, crtc, intel_encoder)
- enable |= intel_encoder->connectors_active;
-
- if (enable)
- dev_priv->display.crtc_enable(crtc);
- else
- dev_priv->display.crtc_disable(crtc);
if (!dev->primary->master)
return;
@@ -3489,8 +3476,6 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc)
if (!master_priv->sarea_priv)
return;
- enabled = crtc->enabled && enable;
-
switch (pipe) {
case 0:
master_priv->sarea_priv->pipeA_w = enabled ? crtc->mode.hdisplay : 0;
@@ -3506,14 +3491,42 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc)
}
}
+/**
+ * Sets the power management mode of the pipe and plane.
+ */
+void intel_crtc_update_dpms(struct drm_crtc *crtc)
+{
+ struct drm_device *dev = crtc->dev;
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_encoder *intel_encoder;
+ bool enable = false;
+
+ for_each_encoder_on_crtc(dev, crtc, intel_encoder)
+ enable |= intel_encoder->connectors_active;
+
+ if (enable)
+ dev_priv->display.crtc_enable(crtc);
+ else
+ dev_priv->display.crtc_disable(crtc);
+
+ intel_crtc_update_sarea(crtc, enable);
+}
+
+static void intel_crtc_noop(struct drm_crtc *crtc)
+{
+}
+
static void intel_crtc_disable(struct drm_crtc *crtc)
{
struct drm_device *dev = crtc->dev;
+ struct drm_connector *connector;
struct drm_i915_private *dev_priv = dev->dev_private;
- /* crtc->disable is only called when we have no encoders, hence this
- * will disable the pipe. */
- intel_crtc_update_dpms(crtc);
+ /* crtc should still be enabled when we disable it. */
+ WARN_ON(!crtc->enabled);
+
+ dev_priv->display.crtc_disable(crtc);
+ intel_crtc_update_sarea(crtc, false);
dev_priv->display.off(crtc);
assert_plane_disabled(dev->dev_private, to_intel_crtc(crtc)->plane);
@@ -3523,14 +3536,24 @@ static void intel_crtc_disable(struct drm_crtc *crtc)
mutex_lock(&dev->struct_mutex);
intel_unpin_fb_obj(to_intel_framebuffer(crtc->fb)->obj);
mutex_unlock(&dev->struct_mutex);
+ crtc->fb = NULL;
+ }
+
+ /* Update computed state. */
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ if (!connector->encoder || !connector->encoder->crtc)
+ continue;
+
+ if (connector->encoder->crtc != crtc)
+ continue;
+
+ connector->dpms = DRM_MODE_DPMS_OFF;
+ to_intel_encoder(connector->encoder)->connectors_active = false;
}
}
void intel_encoder_disable(struct drm_encoder *encoder)
{
- struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
-
- intel_encoder->disable(intel_encoder);
}
void intel_encoder_destroy(struct drm_encoder *encoder)
@@ -6487,7 +6510,7 @@ free_work:
static struct drm_crtc_helper_funcs intel_helper_funcs = {
.mode_set_base_atomic = intel_pipe_set_base_atomic,
.load_lut = intel_crtc_load_lut,
- .disable = intel_crtc_disable,
+ .disable = intel_crtc_noop,
};
bool intel_encoder_check_non_cloned(struct intel_encoder *encoder)
@@ -6743,12 +6766,14 @@ bool intel_set_mode(struct drm_crtc *crtc,
DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n",
modeset_pipes, prepare_pipes, disable_pipes);
- intel_modeset_commit_output_state(dev);
+ for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc)
+ intel_crtc_disable(&intel_crtc->base);
- crtc->enabled = drm_helper_crtc_in_use(crtc);
+ intel_modeset_commit_output_state(dev);
- for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc)
- drm_helper_disable_unused_functions(dev);
+ list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list,
+ base.head)
+ intel_crtc->base.enabled = drm_helper_crtc_in_use(crtc);
saved_hwmode = crtc->hwmode;
saved_mode = crtc->mode;
--
1.7.10.4
next prev parent reply other threads:[~2012-07-26 19:57 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 18:48 [PATCH 00/76] modeset rework, lightly reworked Daniel Vetter
2012-07-26 18:48 ` [PATCH 01/76] drm/fb-helper: don't clobber output routing in setup_crtcs Daniel Vetter
2012-08-29 16:57 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 02/76] drm/i915: add missing gen2 pipe A quirk entries Daniel Vetter
2012-08-29 16:58 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 03/76] drm/i915/ns2501: kill pll A enabling hack Daniel Vetter
2012-08-29 16:59 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 04/76] drm/i915: rip out the overlay pipe A workaround Daniel Vetter
2012-08-29 16:59 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 05/76] drm/i915: prepare load-detect pipe code for dpms changes Daniel Vetter
2012-08-29 17:07 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 06/76] drm/i915: simplify dvo dpms interface Daniel Vetter
2012-08-29 17:09 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 07/76] drm/i915: kill a few unused things in dev_priv Daniel Vetter
2012-08-29 17:37 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 08/76] drm/i915: extract ironlake_fdi_pll_disable Daniel Vetter
2012-08-29 17:47 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 09/76] drm/i915: add crtc->enable/disable vfuncs insted of dpms Daniel Vetter
2012-08-29 17:49 ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 10/76] drm/i915: rip out crtc prepare/commit indirection Daniel Vetter
2012-07-26 18:48 ` [PATCH 11/76] drm/i915: add direct encoder disable/enable infrastructure Daniel Vetter
2012-07-26 18:48 ` [PATCH 12/76] drm/i915/hdmi: convert to encoder->disable/enable Daniel Vetter
2012-07-26 18:48 ` [PATCH 13/76] drm/i915/tv: convert to encoder enable/disable Daniel Vetter
2012-07-26 18:48 ` [PATCH 14/76] drm/i915/lvds: convert to encoder disable/enable Daniel Vetter
2012-07-26 18:48 ` [PATCH 15/76] drm/i915/dp: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 16/76] drm/i915/crt: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 17/76] drm/i915/sdvo: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 18/76] drm/i915/dvo: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 19/76] drm/i915: convert dpms functions of dvo/sdvo/crt Daniel Vetter
2012-07-26 18:48 ` [PATCH 20/76] drm/i915: rip out encoder->disable/enable checks Daniel Vetter
2012-07-26 18:48 ` [PATCH 21/76] drm/i915: clean up encoder_prepare/commit Daniel Vetter
2012-07-26 18:48 ` [PATCH 22/76] drm/i915: copy&paste drm_crtc_helper_set_config Daniel Vetter
2012-07-26 18:48 ` [PATCH 23/76] drm/i915: call set_base directly Daniel Vetter
2012-07-26 18:48 ` [PATCH 24/76] drm/i915: inline intel_best_encoder Daniel Vetter
2012-07-26 18:48 ` [PATCH 25/76] drm/i915: copy&paste drm_crtc_helper_set_mode Daniel Vetter
2012-07-26 18:48 ` [PATCH 26/76] drm/i915: simplify intel_crtc_prepare_encoders Daniel Vetter
2012-07-26 18:48 ` [PATCH 27/76] drm/i915: rip out encoder->prepare/commit Daniel Vetter
2012-07-26 18:48 ` [PATCH 28/76] drm/i915: call crtc functions directly Daniel Vetter
2012-07-26 18:48 ` [PATCH 29/76] drm/i915: WARN when trying to enabled an unused crtc Daniel Vetter
2012-07-26 18:48 ` [PATCH 30/76] drm/i915: Add interfaces to read out encoder/connector hw state Daniel Vetter
2012-07-26 18:48 ` [PATCH 31/76] drm/i915/dp: implement get_hw_state Daniel Vetter
2012-07-26 18:48 ` [PATCH 32/76] drm/i915/hdmi: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 33/76] drm/i915/tv: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 34/76] drm/i915/lvds: " Daniel Vetter
2012-07-26 18:49 ` [PATCH 35/76] drm/i915/crt: " Daniel Vetter
2012-07-26 18:49 ` [PATCH 36/76] drm/i915/sdvo: " Daniel Vetter
2012-07-26 18:49 ` [PATCH 37/76] drm/i915/dvo: " Daniel Vetter
2012-07-26 18:49 ` [PATCH 38/76] drm/i915: read out the modeset hw state at load and resume time Daniel Vetter
2012-07-26 18:49 ` [PATCH 39/76] drm/i915: check connector hw/sw state Daniel Vetter
2012-07-26 18:49 ` [PATCH 40/76] drm/i915: rip out intel_crtc->dpms_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 41/76] drm/i915: rip out intel_dp->dpms_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 42/76] drm/i915: ensure the force pipe A quirk is actually followed Daniel Vetter
2012-07-26 18:49 ` [PATCH 43/76] drm/i915: introduce struct intel_set_config Daniel Vetter
2012-07-26 18:49 ` [PATCH 44/76] drm/i915: extract modeset config save/restore code Daniel Vetter
2012-07-26 18:49 ` [PATCH 45/76] drm/i915: extract intel_set_config_compute_mode_changes Daniel Vetter
2012-07-26 18:49 ` [PATCH 46/76] drm/i915: extract intel_set_config_update_output_state Daniel Vetter
2012-07-26 18:49 ` [PATCH 47/76] drm/i915: implement crtc helper semantics relied upon by the fb helper Daniel Vetter
2012-07-26 18:49 ` [PATCH 48/76] drm/i915: don't update the fb base if there is no fb Daniel Vetter
2012-07-26 18:49 ` [PATCH 49/76] drm/i915: convert pointless error checks in set_config to BUGs Daniel Vetter
2012-07-26 18:49 ` [PATCH 50/76] drm/i915: don't save all the encoder/crtc state in set_config Daniel Vetter
2012-07-26 18:49 ` [PATCH 51/76] drm/i915: stage modeset output changes Daniel Vetter
2012-07-26 18:49 ` [PATCH 52/76] drm/i915: push crtc->fb update into pipe_set_base Daniel Vetter
2012-07-26 18:49 ` [PATCH 53/76] drm/i915: remove crtc disabling special case Daniel Vetter
2012-07-26 18:49 ` [PATCH 54/76] drm/i915: move output commit and crtc disabling into set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 55/76] drm/i915: extract adjusted mode computation Daniel Vetter
2012-07-26 18:49 ` [PATCH 56/76] drm/i915: use staged outuput config in tv->mode_fixup Daniel Vetter
2012-07-26 18:49 ` [PATCH 57/76] drm/i915: use staged outuput config in lvds->mode_fixup Daniel Vetter
2012-07-26 18:49 ` [PATCH 58/76] drm/i915: compute masks of crtcs affected in set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 59/76] drm/i915: implement new set_mode code flow Daniel Vetter
2012-07-26 18:49 ` Daniel Vetter [this message]
2012-07-26 18:49 ` [PATCH 61/76] drm/i915: s/intel_encoder_disable/intel_encoder_noop Daniel Vetter
2012-07-26 18:49 ` [PATCH 62/76] drm/i915: WARN if the pipe won't turn off Daniel Vetter
2012-07-26 18:49 ` [PATCH 63/76] drm/i915: switch the load detect code to the staged modeset config Daniel Vetter
2012-07-26 18:49 ` [PATCH 64/76] drm/i915: push commit_output_state past the crtc/encoder preparing Daniel Vetter
2012-07-26 18:49 ` [PATCH 65/76] drm/i915: disable all crtcs at suspend time Daniel Vetter
2012-07-26 18:49 ` [PATCH 66/76] drm/i915: add tons of modeset state checks Daniel Vetter
2012-07-26 18:49 ` [PATCH 67/76] drm/i915: rip out intel_disable_pch_ports Daniel Vetter
2012-07-26 18:49 ` [PATCH 68/76] drm/i915: don't disable fdi links harder in ilk_crtc_enable Daniel Vetter
2012-07-26 18:49 ` [PATCH 69/76] drm/i915: don't call dpms funcs after set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 70/76] drm/i915: update dpms property in set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 71/76] drm/i915: add encoder->pre_enable/post_disable Daniel Vetter
2012-07-26 18:49 ` [PATCH 72/76] drm/i915: clean up the cpu edp pll special case Daniel Vetter
2012-07-26 18:49 ` [PATCH 73/76] drm/i915: robustify edp_pll_on/off Daniel Vetter
2012-07-26 18:49 ` [PATCH 74/76] drm/i915: rip out dp port enabling cludges^Wchecks Daniel Vetter
2012-07-26 18:49 ` [PATCH 75/76] drm/i915: disable the cpu edp port after the cpu pipe Daniel Vetter
2012-07-26 18:49 ` [PATCH 76/76] drm/i915: move encoder->mode_set calls to crtc_mode_set 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=1343328581-2324-61-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;
as well as URLs for NNTP newsgroup(s).