From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752390AbcEKQzJ (ORCPT ); Wed, 11 May 2016 12:55:09 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36858 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbcEKQzH (ORCPT ); Wed, 11 May 2016 12:55:07 -0400 Date: Wed, 11 May 2016 18:55:04 +0200 From: Daniel Vetter To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: dri-devel@lists.freedesktop.org, daniel@ffwll.ch, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 4/6] drm/atomic: Don't skip drm_bridge_*() calls if !drm_encoder_helper_funcs Message-ID: <20160511165504.GS27098@phenom.ffwll.local> Mail-Followup-To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <1462982962-10530-1-git-send-email-noralf@tronnes.org> <1462982962-10530-5-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1462982962-10530-5-git-send-email-noralf@tronnes.org> X-Operating-System: Linux phenom 4.6.0-rc5+ User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 11, 2016 at 06:09:20PM +0200, Noralf Trønnes wrote: > Don't skip drm_bridge_*() calls if encoder->helper_private is NULL. > > Signed-off-by: Noralf Trønnes Applied to drm-misc, thanks. -Daniel > --- > drivers/gpu/drm/drm_atomic_helper.c | 39 ++++++++++++++++--------------------- > 1 file changed, 17 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 027b227..46a3201 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -384,8 +384,6 @@ mode_fixup(struct drm_atomic_state *state) > */ > encoder = conn_state->best_encoder; > funcs = encoder->helper_private; > - if (!funcs) > - continue; > > ret = drm_bridge_mode_fixup(encoder->bridge, &crtc_state->mode, > &crtc_state->adjusted_mode); > @@ -394,7 +392,7 @@ mode_fixup(struct drm_atomic_state *state) > return -EINVAL; > } > > - if (funcs->atomic_check) { > + if (funcs && funcs->atomic_check) { > ret = funcs->atomic_check(encoder, crtc_state, > conn_state); > if (ret) { > @@ -402,7 +400,7 @@ mode_fixup(struct drm_atomic_state *state) > encoder->base.id, encoder->name); > return ret; > } > - } else if (funcs->mode_fixup) { > + } else if (funcs && funcs->mode_fixup) { > ret = funcs->mode_fixup(encoder, &crtc_state->mode, > &crtc_state->adjusted_mode); > if (!ret) { > @@ -696,8 +694,6 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > continue; > > funcs = encoder->helper_private; > - if (!funcs) > - continue; > > DRM_DEBUG_ATOMIC("disabling [ENCODER:%d:%s]\n", > encoder->base.id, encoder->name); > @@ -709,12 +705,14 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > drm_bridge_disable(encoder->bridge); > > /* Right function depends upon target state. */ > - if (connector->state->crtc && funcs->prepare) > - funcs->prepare(encoder); > - else if (funcs->disable) > - funcs->disable(encoder); > - else if (funcs->dpms) > - funcs->dpms(encoder, DRM_MODE_DPMS_OFF); > + if (funcs) { > + if (connector->state->crtc && funcs->prepare) > + funcs->prepare(encoder); > + else if (funcs->disable) > + funcs->disable(encoder); > + else if (funcs->dpms) > + funcs->dpms(encoder, DRM_MODE_DPMS_OFF); > + } > > drm_bridge_post_disable(encoder->bridge); > } > @@ -861,9 +859,6 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > > encoder = connector->state->best_encoder; > funcs = encoder->helper_private; > - if (!funcs) > - continue; > - > new_crtc_state = connector->state->crtc->state; > mode = &new_crtc_state->mode; > adjusted_mode = &new_crtc_state->adjusted_mode; > @@ -878,7 +873,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > * Each encoder has at most one connector (since we always steal > * it away), so we won't call mode_set hooks twice. > */ > - if (funcs->mode_set) > + if (funcs && funcs->mode_set) > funcs->mode_set(encoder, mode, adjusted_mode); > > drm_bridge_mode_set(encoder->bridge, mode, adjusted_mode); > @@ -969,8 +964,6 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > > encoder = connector->state->best_encoder; > funcs = encoder->helper_private; > - if (!funcs) > - continue; > > DRM_DEBUG_ATOMIC("enabling [ENCODER:%d:%s]\n", > encoder->base.id, encoder->name); > @@ -981,10 +974,12 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > */ > drm_bridge_pre_enable(encoder->bridge); > > - if (funcs->enable) > - funcs->enable(encoder); > - else if (funcs->commit) > - funcs->commit(encoder); > + if (funcs) { > + if (funcs->enable) > + funcs->enable(encoder); > + else if (funcs->commit) > + funcs->commit(encoder); > + } > > drm_bridge_enable(encoder->bridge); > } > -- > 2.8.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch