From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Eliminate lots of WARNs when there's no backlight present Date: Fri, 17 Jan 2014 14:32:00 +0100 Message-ID: <20140117133200.GG4770@phenom.ffwll.local> References: <1389889635-27623-1-git-send-email-ville.syrjala@linux.intel.com> <87zjmu7slo.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-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 003301060DC for ; Fri, 17 Jan 2014 05:32:04 -0800 (PST) Received: by mail-ee0-f42.google.com with SMTP id e49so2143968eek.29 for ; Fri, 17 Jan 2014 05:32:04 -0800 (PST) Content-Disposition: inline In-Reply-To: <87zjmu7slo.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Jan 17, 2014 at 01:30:59PM +0200, Jani Nikula wrote: > On Thu, 16 Jan 2014, ville.syrjala@linux.intel.com wrote: > > From: Ville Syrj=E4l=E4 > > > > My 855gm doesn't register the intel backlight but it still ends up > > calling the backlight code to enable/disable the backlight via the > > LVDS code. This leads to some WARNs due to backlight.max being 0. > > > > Let's have intel_panel_enable_backlight() and intel_panel_disable_backl= ight() > > check whether there's a backlight present or not. > > > > Also move the backlight.present check from asle_set_backlight() into > > intel_panel_set_backlight() for some extra symmetry. > = > I have an identical patch in my local repo dated Dec 13... should've > sent it out weeks ago. Damn. > = > Reviewed-by: Jani Nikula Queued for -next, thanks for the patch. -Daniel > = > > Signed-off-by: Ville Syrj=E4l=E4 > > --- > > drivers/gpu/drm/i915/intel_opregion.c | 10 ++-------- > > drivers/gpu/drm/i915/intel_panel.c | 6 +++--- > > 2 files changed, 5 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i9= 15/intel_opregion.c > > index 3da259e..37e9a96 100644 > > --- a/drivers/gpu/drm/i915/intel_opregion.c > > +++ b/drivers/gpu/drm/i915/intel_opregion.c > > @@ -396,9 +396,7 @@ int intel_opregion_notify_adapter(struct drm_device= *dev, pci_power_t state) > > static u32 asle_set_backlight(struct drm_device *dev, u32 bclp) > > { > > struct drm_i915_private *dev_priv =3D dev->dev_private; > > - struct drm_connector *connector; > > struct intel_connector *intel_connector; > > - struct intel_panel *panel; > > struct opregion_asle __iomem *asle =3D dev_priv->opregion.asle; > > = > > DRM_DEBUG_DRIVER("bclp =3D 0x%08x\n", bclp); > > @@ -417,12 +415,8 @@ static u32 asle_set_backlight(struct drm_device *d= ev, u32 bclp) > > * only one). > > */ > > DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp); > > - list_for_each_entry(connector, &dev->mode_config.connector_list, head= ) { > > - intel_connector =3D to_intel_connector(connector); > > - panel =3D &intel_connector->panel; > > - if (panel->backlight.present) > > - intel_panel_set_backlight(intel_connector, bclp, 255); > > - } > > + list_for_each_entry(intel_connector, &dev->mode_config.connector_list= , base.head) > > + intel_panel_set_backlight(intel_connector, bclp, 255); > > iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cbl= v); > > = > > mutex_unlock(&dev->mode_config.mutex); > > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/= intel_panel.c > > index 20ebc3e..350de35 100644 > > --- a/drivers/gpu/drm/i915/intel_panel.c > > +++ b/drivers/gpu/drm/i915/intel_panel.c > > @@ -502,7 +502,7 @@ void intel_panel_set_backlight(struct intel_connect= or *connector, u32 level, > > u32 freq; > > unsigned long flags; > > = > > - if (pipe =3D=3D INVALID_PIPE) > > + if (!panel->backlight.present || pipe =3D=3D INVALID_PIPE) > > return; > > = > > spin_lock_irqsave(&dev_priv->backlight_lock, flags); > > @@ -579,7 +579,7 @@ void intel_panel_disable_backlight(struct intel_con= nector *connector) > > enum pipe pipe =3D intel_get_pipe_from_connector(connector); > > unsigned long flags; > > = > > - if (pipe =3D=3D INVALID_PIPE) > > + if (!panel->backlight.present || pipe =3D=3D INVALID_PIPE) > > return; > > = > > /* > > @@ -782,7 +782,7 @@ void intel_panel_enable_backlight(struct intel_conn= ector *connector) > > enum pipe pipe =3D intel_get_pipe_from_connector(connector); > > unsigned long flags; > > = > > - if (pipe =3D=3D INVALID_PIPE) > > + if (!panel->backlight.present || pipe =3D=3D INVALID_PIPE) > > return; > > = > > DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe)); > > -- = > > 1.8.3.2 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > = > -- = > 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