From: Daniel Vetter <daniel@ffwll.ch>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 2/6] drm/atomic: Pass connector and state to update_connector_routing.
Date: Fri, 4 Mar 2016 17:18:19 +0100 [thread overview]
Message-ID: <20160304161819.GV32705@phenom.ffwll.local> (raw)
In-Reply-To: <20160301151953.GJ15993@intel.com>
On Tue, Mar 01, 2016 at 05:19:53PM +0200, Ville Syrjälä wrote:
> On Wed, Feb 24, 2016 at 09:37:29AM +0100, Maarten Lankhorst wrote:
> > Minor cleanup, connector and connector_state are always non-NULL here.
> >
> > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Merged the first 2 patches to drm-misc, thanks.
-Daniel
>
> > ---
> > drivers/gpu/drm/drm_atomic_helper.c | 15 +++++----------
> > 1 file changed, 5 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> > index a0226d4b949a..3d1f97a832fc 100644
> > --- a/drivers/gpu/drm/drm_atomic_helper.c
> > +++ b/drivers/gpu/drm/drm_atomic_helper.c
> > @@ -215,22 +215,16 @@ steal_encoder(struct drm_atomic_state *state,
> > }
> >
> > static int
> > -update_connector_routing(struct drm_atomic_state *state, int conn_idx)
> > +update_connector_routing(struct drm_atomic_state *state,
> > + struct drm_connector *connector,
> > + struct drm_connector_state *connector_state)
> > {
> > const struct drm_connector_helper_funcs *funcs;
> > struct drm_encoder *new_encoder;
> > struct drm_crtc *encoder_crtc;
> > - struct drm_connector *connector;
> > - struct drm_connector_state *connector_state;
> > struct drm_crtc_state *crtc_state;
> > int idx, ret;
> >
> > - connector = state->connectors[conn_idx];
> > - connector_state = state->connector_states[conn_idx];
> > -
> > - if (!connector)
> > - return 0;
> > -
> > DRM_DEBUG_ATOMIC("Updating routing for [CONNECTOR:%d:%s]\n",
> > connector->base.id,
> > connector->name);
> > @@ -494,7 +488,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
> > * drivers must set crtc->mode_changed themselves when connector
> > * properties need to be updated.
> > */
> > - ret = update_connector_routing(state, i);
> > + ret = update_connector_routing(state, connector,
> > + connector_state);
> > if (ret)
> > return ret;
> > }
> > --
> > 2.1.0
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-03-04 16:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 8:37 [PATCH v2 0/6] drm/atomic: Fix encoder stealing, v2 Maarten Lankhorst
2016-02-24 8:37 ` [PATCH v2 1/6] drm/atomic: Clean up update_output_state Maarten Lankhorst
2016-03-01 15:16 ` Ville Syrjälä
2016-02-24 8:37 ` [PATCH v2 2/6] drm/atomic: Pass connector and state to update_connector_routing Maarten Lankhorst
2016-03-01 15:19 ` Ville Syrjälä
2016-03-04 16:18 ` Daniel Vetter [this message]
2016-02-24 8:37 ` [PATCH v2 3/6] drm/atomic: Always call steal_encoder Maarten Lankhorst
2016-03-01 13:52 ` [PATCH v2.1 3/6] drm/atomic: Always call steal_encoder, v2 Maarten Lankhorst
2016-03-04 16:20 ` Daniel Vetter
2016-02-24 8:37 ` [PATCH v2 4/6] drm/atomic: Handle encoder stealing from set_config better Maarten Lankhorst
2016-03-04 16:20 ` Daniel Vetter
2016-02-24 8:37 ` [PATCH v2 5/6] drm/atomic: Handle encoder assignment conflicts in a separate check Maarten Lankhorst
2016-02-25 9:34 ` [PATCH v2.1 5/6] drm/atomic: Handle encoder assignment conflicts in a separate check, v2 Maarten Lankhorst
2016-03-01 17:21 ` [PATCH v2 5/6] drm/atomic: Handle encoder assignment conflicts in a separate check Ville Syrjälä
2016-03-01 17:45 ` [Intel-gfx] " Maarten Lankhorst
2016-03-01 17:58 ` Ville Syrjälä
2016-03-02 13:38 ` [PATCH v2.1 5/6] drm/atomic: Handle encoder assignment conflicts in a separate check, v3 Maarten Lankhorst
2016-02-24 8:37 ` [PATCH v2 6/6] drm/atomic: Clean up steal_encoder Maarten Lankhorst
2016-03-02 17:32 ` Ville Syrjälä
2016-03-02 17:36 ` Ville Syrjälä
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=20160304161819.GV32705@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@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