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 12/13] drm/i915: rip out legacy encoder->mode_set callback
Date: Sun, 21 Jul 2013 21:37:08 +0200 [thread overview]
Message-ID: <1374435429-5543-13-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1374435429-5543-1-git-send-email-daniel.vetter@ffwll.ch>
The encoder->mode_set callback from the crtc helpers is now completely
unused in our driver. Good riddance!
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1ff8f9c..b07f891e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6015,11 +6015,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
{
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- struct drm_encoder_helper_funcs *encoder_funcs;
struct intel_encoder *encoder;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct drm_display_mode *adjusted_mode =
- &intel_crtc->config.adjusted_mode;
struct drm_display_mode *mode = &intel_crtc->config.requested_mode;
int pipe = intel_crtc->pipe;
int ret;
@@ -6038,12 +6035,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
encoder->base.base.id,
drm_get_encoder_name(&encoder->base),
mode->base.id, mode->name);
- if (encoder->mode_set) {
- encoder->mode_set(encoder);
- } else {
- encoder_funcs = encoder->base.helper_private;
- encoder_funcs->mode_set(&encoder->base, mode, adjusted_mode);
- }
+ encoder->mode_set(encoder);
}
return 0;
--
1.8.1.4
next prev parent reply other threads:[~2013-07-21 20:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-21 19:36 [PATCH 00/13] modeset interface cleanups Daniel Vetter
2013-07-21 19:36 ` [PATCH 01/13] drm/i915/dvo: use intel_encoder to the upcast macro Daniel Vetter
2013-07-21 19:36 ` [PATCH 02/13] drm/i915/dvo: switch ->mode_fixup to ->compute_config Daniel Vetter
2013-07-26 18:39 ` Rodrigo Vivi
2013-07-26 19:23 ` Daniel Vetter
2013-07-21 19:36 ` [PATCH 03/13] drm/i915: rip out legacy encoder->mode_fixup logic Daniel Vetter
2013-07-21 19:37 ` [PATCH 04/13] drm/i915/dvo: use native encoder ->mode_set callback Daniel Vetter
2013-07-21 19:37 ` [PATCH 05/13] drm/i915/sdvo: use intel_encoder for upcast helper Daniel Vetter
2013-07-21 19:37 ` [PATCH 06/13] drm/i915/tv: Use native encoder->mode_set callback Daniel Vetter
2013-07-21 19:37 ` [PATCH 07/13] drm/i915/crt: use " Daniel Vetter
2013-07-21 19:37 ` [PATCH 08/13] drm/i915/hdmi: use native encoder mode_set callback Daniel Vetter
2013-07-21 19:37 ` [PATCH 09/13] drm/i915/dp: use native encoder ->mode_set callback Daniel Vetter
2013-07-21 19:37 ` [PATCH 10/13] drm/i915/lvds: use the " Daniel Vetter
2013-07-21 19:37 ` [PATCH 11/13] drm/i915/ddi: " Daniel Vetter
2013-07-21 19:37 ` Daniel Vetter [this message]
2013-07-21 19:37 ` [PATCH 13/13] drm/i915: clean up crtc timings computation Daniel Vetter
2013-07-26 18:40 ` Rodrigo Vivi
2013-07-26 19:24 ` Daniel Vetter
2013-07-26 18:42 ` [PATCH 00/13] modeset interface cleanups Rodrigo Vivi
2013-07-26 22:05 ` 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=1374435429-5543-13-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.