From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 07/14] drm/i915: Warn about want_panel_vdd in edp_panel_vdd_off_sync() Date: Tue, 26 Aug 2014 11:21:30 +0200 Message-ID: <20140826092130.GJ15520@phenom.ffwll.local> References: <1408389369-22898-1-git-send-email-ville.syrjala@linux.intel.com> <1408389369-22898-8-git-send-email-ville.syrjala@linux.intel.com> <87tx59gcbv.fsf@intel.com> <20140819103913.GY4193@intel.com> <87fvgsha80.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E91F6E15F for ; Tue, 26 Aug 2014 02:21:08 -0700 (PDT) Received: by mail-wg0-f50.google.com with SMTP id n12so14117094wgh.33 for ; Tue, 26 Aug 2014 02:21:07 -0700 (PDT) Content-Disposition: inline In-Reply-To: <87fvgsha80.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Aug 19, 2014 at 04:37:03PM +0300, Jani Nikula wrote: > On Tue, 19 Aug 2014, Ville Syrj=E4l=E4 wr= ote: > > On Tue, Aug 19, 2014 at 10:36:52AM +0300, Jani Nikula wrote: > >> On Mon, 18 Aug 2014, ville.syrjala@linux.intel.com wrote: > >> > From: Ville Syrj=E4l=E4 > >> > > >> > If we force vdd off warn if someone is still using it. With this > >> > change the delayed vdd off work needs to check want_panel_vdd > >> > itself to make sure it doesn't try to turn vdd off when someone > >> > is using it. > >> = > >> I think this calls for a prep cleanup patch to check and fix the uses = of > >> edp_panel_vdd_off(intel_dp, true) > >> vs. edp_panel_vdd_off_sync(intel_dp). In particular, why are there > >> direct calls to the latter all over the place? Seems wrong. > > > > edp_panel_vdd_off() should always be paired with a edp_panel_vdd_on(). > > If we were to call edp_panel_vdd_off() without the correct pairing we > > would get a warning due to want_panel_vdd=3D=3Dfalse, whereas > > edp_panel_vdd_off_sync() will now warn when want_panel_vdd=3D=3Dtrue. > > The direct calls to edp_panel_vdd_off_sync() are in places where we > > should not have want_panel_vdd=3D=3Dtrue (eg. system suspend) but we > > just want to force vdd off even if the delayed off work has alrady > > been scheduled. > = > Okay, care to add some of that as brief documentation comments for the > functions in question, as follow-up? IMO detailed kernel-docs here won't > be read by anyone and will just get stale. Hm, imo a wrappe for vdd_off_sync or would be clearer than piles of comments. Or maybe just vdd_sync, akin to all the work/time _sync functions. Our system suspend/resume code is splattered with such functions, so the code pattern should be clear with just that. Perhaps as a follow-up patch on top of all of this? -Daniel > = > BR, > Jani. > = > > > >> = > >> BR, > >> Jani. > >> = > >> = > >> > > >> > Signed-off-by: Ville Syrj=E4l=E4 > >> > --- > >> > drivers/gpu/drm/i915/intel_dp.c | 7 +++++-- > >> > 1 file changed, 5 insertions(+), 2 deletions(-) > >> > > >> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/= intel_dp.c > >> > index e6b4d4d..0fb510c 100644 > >> > --- a/drivers/gpu/drm/i915/intel_dp.c > >> > +++ b/drivers/gpu/drm/i915/intel_dp.c > >> > @@ -1241,7 +1241,9 @@ static void edp_panel_vdd_off_sync(struct inte= l_dp *intel_dp) > >> > = > >> > WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)= ); > >> > = > >> > - if (intel_dp->want_panel_vdd || !edp_have_panel_vdd(intel_dp)) > >> > + WARN_ON(intel_dp->want_panel_vdd); > >> > + > >> > + if (!edp_have_panel_vdd(intel_dp)) > >> > return; > >> > = > >> > DRM_DEBUG_KMS("Turning eDP VDD off\n"); > >> > @@ -1273,7 +1275,8 @@ static void edp_panel_vdd_work(struct work_str= uct *__work) > >> > struct drm_device *dev =3D intel_dp_to_dev(intel_dp); > >> > = > >> > drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); > >> > - edp_panel_vdd_off_sync(intel_dp); > >> > + if (!intel_dp->want_panel_vdd) > >> > + edp_panel_vdd_off_sync(intel_dp); > >> > drm_modeset_unlock(&dev->mode_config.connection_mutex); > >> > } > >> > = > >> > -- = > >> > 1.8.5.5 > >> > > >> > _______________________________________________ > >> > Intel-gfx mailing list > >> > Intel-gfx@lists.freedesktop.org > >> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > >> = > >> -- = > >> Jani Nikula, Intel Open Source Technology Center > > > > -- = > > Ville Syrj=E4l=E4 > > Intel OTC > = > -- = > Jani Nikula, Intel Open Source Technology Center > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch