Ilia Mirkin
2015-May-20 17:13 UTC
[Nouveau] [PATCH] fix a wrong use of a logical operator in drmmode_output_dpms()
This is obviously a bug, but one that has been there for some time. Please figure out what this is guarding, and confirm that the feature continues to work. On Wed, May 20, 2015 at 1:11 PM, Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de> wrote:> looks good to me! :) > > Feel free to add my R-b. > > On 20.05.2015 17:08, Samuel Pitoiset wrote: >> >> This is probably a typo error which has been introduced in 2009... >> This fixes the following warning detected by Clang : >> >> drmmode_display.c:907:30: warning: use of logical '&&' with constant >> operand [-Wconstant-logical-operand] >> if (props && (props->flags && DRM_MODE_PROP_ENUM)) { >> >> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com> >> --- >> src/drmmode_display.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/src/drmmode_display.c b/src/drmmode_display.c >> index 7c1d2bb..161bccd 100644 >> --- a/src/drmmode_display.c >> +++ b/src/drmmode_display.c >> @@ -904,7 +904,7 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) >> for (i = 0; i < koutput->count_props; i++) { >> props = drmModeGetProperty(drmmode->fd, >> koutput->props[i]); >> - if (props && (props->flags && DRM_MODE_PROP_ENUM)) { >> + if (props && (props->flags & DRM_MODE_PROP_ENUM)) { >> if (!strcmp(props->name, "DPMS")) { >> mode_id = koutput->props[i]; >> drmModeFreeProperty(props); > > > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau
Samuel Pitoiset
2015-May-20 17:26 UTC
[Nouveau] [PATCH] fix a wrong use of a logical operator in drmmode_output_dpms()
On 05/20/2015 07:13 PM, Ilia Mirkin wrote:> This is obviously a bug, but one that has been there for some time. > Please figure out what this is guarding, and confirm that the feature > continues to work.Sure, but do you have any ideas how to test this part of the DDX ? It's the first time I play with it...> > On Wed, May 20, 2015 at 1:11 PM, Tobias Klausmann > <tobias.johannes.klausmann at mni.thm.de> wrote: >> looks good to me! :) >> >> Feel free to add my R-b. >> >> On 20.05.2015 17:08, Samuel Pitoiset wrote: >>> This is probably a typo error which has been introduced in 2009... >>> This fixes the following warning detected by Clang : >>> >>> drmmode_display.c:907:30: warning: use of logical '&&' with constant >>> operand [-Wconstant-logical-operand] >>> if (props && (props->flags && DRM_MODE_PROP_ENUM)) { >>> >>> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com> >>> --- >>> src/drmmode_display.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/src/drmmode_display.c b/src/drmmode_display.c >>> index 7c1d2bb..161bccd 100644 >>> --- a/src/drmmode_display.c >>> +++ b/src/drmmode_display.c >>> @@ -904,7 +904,7 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) >>> for (i = 0; i < koutput->count_props; i++) { >>> props = drmModeGetProperty(drmmode->fd, >>> koutput->props[i]); >>> - if (props && (props->flags && DRM_MODE_PROP_ENUM)) { >>> + if (props && (props->flags & DRM_MODE_PROP_ENUM)) { >>> if (!strcmp(props->name, "DPMS")) { >>> mode_id = koutput->props[i]; >>> drmModeFreeProperty(props); >> >> _______________________________________________ >> Nouveau mailing list >> Nouveau at lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/nouveau
Dave Airlie
2015-May-21 04:40 UTC
[Nouveau] [PATCH] fix a wrong use of a logical operator in drmmode_output_dpms()
On 21 May 2015 at 03:26, Samuel Pitoiset <samuel.pitoiset at gmail.com> wrote:> > > On 05/20/2015 07:13 PM, Ilia Mirkin wrote: >> >> This is obviously a bug, but one that has been there for some time. >> Please figure out what this is guarding, and confirm that the feature >> continues to work. > > > Sure, but do you have any ideas how to test this part of the DDX ? > It's the first time I play with it... >It's fine, the code just avoids going into the name checks if the type isn't a enum, it won't break anything actually fixing it. The fix is Reviewed-by: Dave Airlie <airlied at redhat.com>