src/via_driver.c | 3 ++- src/via_memmgr.c | 1 + src/via_xv_overlay.c | 16 ++++------------ 3 files changed, 7 insertions(+), 13 deletions(-)
New commits: commit 7e08492da289e495b8b4092f3a5eeb0c6aa46362 Author: James Simmons <jsimm...@infradead.org> Date: Fri Jul 5 18:18:41 2013 -0400 Remove comparisons that cannot be true. The variables compared here are all CARD32, which is an unsigned type. Signed-off-by: Thomas Klausner <w...@netbsd.org> Acked-by: James Simmons <jsimm...@infradead.org> --- src/via_xv_overlay.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c index bdcd383..85b2403 100644 --- a/src/via_xv_overlay.c +++ b/src/via_xv_overlay.c @@ -1759,24 +1759,16 @@ SetVideoWindow(ScrnInfoPtr pScrn, unsigned long videoFlag, } }*/ - if (top < 0) - top = 0; - else if (top > 2047) + if (top > 2047) top = 2047; - if (bottom < 0) - bottom = 0; - else if (bottom > 2047) + if (bottom > 2047) bottom = 2047; - if (left < 0) - left = 0; - else if (left > 2047) + if (left > 2047) left = 2047; - if (right < 0) - right = 0; - else if (right > 2047) + if (right > 2047) right = 2047; if (videoFlag & VIDEO_1_INUSE) { commit ab25ebc3d91248f0e411387e72331d102f90a386 Author: James Simmons <jsimm...@infradead.org> Date: Fri Jul 5 18:16:47 2013 -0400 Use appropriate format string. The variable is an unsigned long, so use %lu. Signed-off-by: Thomas Klausner <w...@netbsd.org> Acked-by: James Simmons <jsimm...@infradead.org> --- src/via_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/via_driver.c b/src/via_driver.c index 89e1c8c..dc956f5 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -826,7 +826,7 @@ via_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) goto fail; xf86DrvMsg(scrn->scrnIndex, X_INFO, - "Allocate new frame buffer %dx%d stride %d\n", + "Allocate new frame buffer %dx%d stride %lu\n", width, height, new_front->pitch); new_pixels = drm_bo_map(scrn, new_front); commit 12c4cb9d393e1620bfbf2e5f9ba8c6d30d3dc534 Author: James Simmons <jsimm...@infradead.org> Date: Fri Jul 5 18:12:09 2013 -0400 Add missing drm_fourcc.h header file. Signed-off-by: Thomas Klausner <w...@netbsd.org> Acked-by: James Simmons <jsimm...@infradead.org> --- src/via_driver.c | 1 + src/via_memmgr.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/via_driver.c b/src/via_driver.c index 139a0c3..89e1c8c 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -41,6 +41,7 @@ #include "version.h" #include "via_driver.h" +#include "drm_fourcc.h" #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" diff --git a/src/via_memmgr.c b/src/via_memmgr.c index 5d4cc3f..1847884 100644 --- a/src/via_memmgr.c +++ b/src/via_memmgr.c @@ -34,6 +34,7 @@ #include "xf86drm.h" #endif +#include "drm_fourcc.h" #include "via_driver.h" #ifdef HAVE_DRI #include "via_drm.h" _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/openchrome-devel