diff mbox series

[1/5] drm/nouveau: Check backlight IDs are >= 0, not > 0

Message ID 20180823012151.20099-2-lyude@redhat.com (mailing list archive)
State New, archived
Headers show
Series drm/nouveau: Backlight fixes and cleanup | expand

Commit Message

Lyude Paul Aug. 23, 2018, 1:21 a.m. UTC
Remember, ida IDs start at 0, not 1!

Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: stable@vger.kernel.org
Cc: Jeffery Miller <jmiller@neverware.com>
Cc: Karol Herbst <kherbst@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Karol Herbst Aug. 23, 2018, noon UTC | #1
Patches 1-5 are Reviewed-by: Karol Herbst <kherbst@redhat.com>

I think it might be worth to test those patches on a system without
any backlight devices just to verify we don't break things, but the
code looked good already, so maybe we don't really need to test.

On Thu, Aug 23, 2018 at 3:21 AM, Lyude Paul <lyude@redhat.com> wrote:
> Remember, ida IDs start at 0, not 1!
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> Cc: stable@vger.kernel.org
> Cc: Jeffery Miller <jmiller@neverware.com>
> Cc: Karol Herbst <kherbst@redhat.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> index 408b955e5c39..6dd72bc32897 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> @@ -116,7 +116,7 @@ nv40_backlight_init(struct drm_connector *connector)
>                                        &nv40_bl_ops, &props);
>
>         if (IS_ERR(bd)) {
> -               if (bl_connector.id > 0)
> +               if (bl_connector.id >= 0)
>                         ida_simple_remove(&bl_ida, bl_connector.id);
>                 return PTR_ERR(bd);
>         }
> @@ -249,7 +249,7 @@ nv50_backlight_init(struct drm_connector *connector)
>                                        nv_encoder, ops, &props);
>
>         if (IS_ERR(bd)) {
> -               if (bl_connector.id > 0)
> +               if (bl_connector.id >= 0)
>                         ida_simple_remove(&bl_ida, bl_connector.id);
>                 return PTR_ERR(bd);
>         }
> --
> 2.17.1
>
Lyude Paul Aug. 23, 2018, 4:29 p.m. UTC | #2
On Thu, 2018-08-23 at 14:00 +0200, Karol Herbst wrote:
> Patches 1-5 are Reviewed-by: Karol Herbst <kherbst@redhat.com>
> 
> I think it might be worth to test those patches on a system without
> any backlight devices just to verify we don't break things, but the
> code looked good already, so maybe we don't really need to test.
Did! The P50 lets you switch between dedicated GPU mode and hybrid GPU mode, and
it switches backlight control between the intel and nvidia GPUs. Seemed to work
just fine for me
> 
> On Thu, Aug 23, 2018 at 3:21 AM, Lyude Paul <lyude@redhat.com> wrote:
> > Remember, ida IDs start at 0, not 1!
> > 
> > Signed-off-by: Lyude Paul <lyude@redhat.com>
> > Cc: stable@vger.kernel.org
> > Cc: Jeffery Miller <jmiller@neverware.com>
> > Cc: Karol Herbst <kherbst@redhat.com>
> > ---
> >  drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > index 408b955e5c39..6dd72bc32897 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > @@ -116,7 +116,7 @@ nv40_backlight_init(struct drm_connector *connector)
> >                                        &nv40_bl_ops, &props);
> > 
> >         if (IS_ERR(bd)) {
> > -               if (bl_connector.id > 0)
> > +               if (bl_connector.id >= 0)
> >                         ida_simple_remove(&bl_ida, bl_connector.id);
> >                 return PTR_ERR(bd);
> >         }
> > @@ -249,7 +249,7 @@ nv50_backlight_init(struct drm_connector *connector)
> >                                        nv_encoder, ops, &props);
> > 
> >         if (IS_ERR(bd)) {
> > -               if (bl_connector.id > 0)
> > +               if (bl_connector.id >= 0)
> >                         ida_simple_remove(&bl_ida, bl_connector.id);
> >                 return PTR_ERR(bd);
> >         }
> > --
> > 2.17.1
> >
diff mbox series

Patch

diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 408b955e5c39..6dd72bc32897 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -116,7 +116,7 @@  nv40_backlight_init(struct drm_connector *connector)
 				       &nv40_bl_ops, &props);
 
 	if (IS_ERR(bd)) {
-		if (bl_connector.id > 0)
+		if (bl_connector.id >= 0)
 			ida_simple_remove(&bl_ida, bl_connector.id);
 		return PTR_ERR(bd);
 	}
@@ -249,7 +249,7 @@  nv50_backlight_init(struct drm_connector *connector)
 				       nv_encoder, ops, &props);
 
 	if (IS_ERR(bd)) {
-		if (bl_connector.id > 0)
+		if (bl_connector.id >= 0)
 			ida_simple_remove(&bl_ida, bl_connector.id);
 		return PTR_ERR(bd);
 	}