From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 6/6] drm/i915: Use atomic state in intel_fb_initial_config.
Date: Thu, 11 Feb 2016 16:38:16 +0200 [thread overview]
Message-ID: <20160211143816.GD23290@intel.com> (raw)
In-Reply-To: <1454334242-23354-7-git-send-email-maarten.lankhorst@linux.intel.com>
On Mon, Feb 01, 2016 at 02:44:02PM +0100, Maarten Lankhorst wrote:
> This is another step in removing legacy state.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Patches 2,3,4,6 lgtm.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Though I'd still prefer some locking asserts to avoid having to go
double check all the callers.
> ---
> drivers/gpu/drm/i915/intel_fbdev.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index 09840f4380f9..97a91e631915 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -406,8 +406,8 @@ retry:
> continue;
> }
>
> - encoder = connector->encoder;
> - if (!encoder || WARN_ON(!encoder->crtc)) {
> + encoder = connector->state->best_encoder;
> + if (!encoder || WARN_ON(!connector->state->crtc)) {
> if (connector->force > DRM_FORCE_OFF)
> goto bail;
>
> @@ -420,7 +420,7 @@ retry:
>
> num_connectors_enabled++;
>
> - new_crtc = intel_fb_helper_crtc(fb_helper, encoder->crtc);
> + new_crtc = intel_fb_helper_crtc(fb_helper, connector->state->crtc);
>
> /*
> * Make sure we're not trying to drive multiple connectors
> @@ -466,17 +466,22 @@ retry:
> * usually contains. But since our current
> * code puts a mode derived from the post-pfit timings
> * into crtc->mode this works out correctly.
> + *
> + * This is crtc->mode and not crtc->state->mode for the
> + * fastboot check to work correctly. crtc_state->mode has
> + * I915_MODE_FLAG_INHERITED, which we clear to force check
> + * state.
> */
> DRM_DEBUG_KMS("looking for current mode on connector %s\n",
> connector->name);
> - modes[i] = &encoder->crtc->mode;
> + modes[i] = &connector->state->crtc->mode;
> }
> crtcs[i] = new_crtc;
>
> DRM_DEBUG_KMS("connector %s on pipe %c [CRTC:%d]: %dx%d%s\n",
> connector->name,
> - pipe_name(to_intel_crtc(encoder->crtc)->pipe),
> - encoder->crtc->base.id,
> + pipe_name(to_intel_crtc(connector->state->crtc)->pipe),
> + connector->state->crtc->base.id,
> modes[i]->hdisplay, modes[i]->vdisplay,
> modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" :"");
>
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-02-11 14:38 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 13:43 [PATCH 0/6] Use more atomic state in i915 Maarten Lankhorst
2016-02-01 13:43 ` [PATCH 1/6] drm/i915: Use atomic state to obtain load detection crtc Maarten Lankhorst
2016-02-01 16:08 ` Ville Syrjälä
2016-02-02 10:41 ` Maarten Lankhorst
2016-02-01 17:09 ` Ville Syrjälä
2016-02-02 12:46 ` Maarten Lankhorst
2016-02-02 12:48 ` [PATCH v2 1/6] drm/i915: Use atomic state to obtain load detection crtc, v2 Maarten Lankhorst
2016-02-02 17:32 ` Ville Syrjälä
2016-02-03 8:57 ` Maarten Lankhorst
2016-02-03 16:34 ` Ville Syrjälä
2016-02-09 8:57 ` Maarten Lankhorst
2016-02-09 12:52 ` [PATCH 1/3] drm/i915: Clear shared dpll based on old state Maarten Lankhorst
2016-02-09 12:52 ` [PATCH 2/3] drm/i915: Use atomic helpers for suspend Maarten Lankhorst
2016-02-09 13:37 ` Ville Syrjälä
2016-02-09 14:05 ` Maarten Lankhorst
2016-02-09 14:58 ` Ville Syrjälä
2016-02-15 12:34 ` Maarten Lankhorst
2016-02-16 9:06 ` [PATCH v2 2/3] drm/i915: Use atomic helpers for suspend, v2 Maarten Lankhorst
2016-02-16 9:55 ` Ville Syrjälä
2016-02-09 12:52 ` [PATCH 3/3] drm/i915: Use atomic state to obtain load detection crtc, v3 Maarten Lankhorst
2016-02-16 11:13 ` Ville Syrjälä
2016-02-09 13:25 ` [PATCH 1/3] drm/i915: Clear shared dpll based on old state Ville Syrjälä
2016-02-11 8:56 ` [PATCH 1/6] drm/i915: Use atomic state to obtain load detection crtc Daniel Vetter
2016-02-01 13:43 ` [PATCH 2/6] drm/i915: Use atomic state in crt load detection Maarten Lankhorst
2016-02-01 13:43 ` [PATCH 3/6] drm/i915: Use atomic state in tv " Maarten Lankhorst
2016-02-01 13:44 ` [PATCH 4/6] drm/i915: Use correct dpms for intel_enable_crt Maarten Lankhorst
2016-02-01 13:44 ` [IGT PATCH 5/6] kms_force_connector_basic: Add force-load-detect test Maarten Lankhorst
2016-02-11 8:59 ` Daniel Vetter
2016-02-11 11:50 ` Maarten Lankhorst
2016-02-01 13:44 ` [PATCH 6/6] drm/i915: Use atomic state in intel_fb_initial_config Maarten Lankhorst
2016-02-11 14:38 ` Ville Syrjälä [this message]
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=20160211143816.GD23290@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
/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).