Module Name: src Committed By: maya Date: Fri May 31 03:41:32 UTC 2019
Modified Files: src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c Log Message: Restore previous KASSERT but with the same condition as in nouveaufb.c, which is the code I was trying to mimic. Thanks riastradh for the heads up and fix. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.11 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.12 --- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.11 Fri May 31 03:28:48 2019 +++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Fri May 31 03:41:32 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: radeondrmkmsfb.c,v 1.11 2019/05/31 03:28:48 maya Exp $ */ +/* $NetBSD: radeondrmkmsfb.c,v 1.12 2019/05/31 03:41:32 maya Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.11 2019/05/31 03:28:48 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.12 2019/05/31 03:41:32 maya Exp $"); #include <sys/types.h> #include <sys/device.h> @@ -192,6 +192,9 @@ radeonfb_drmfb_mmapfb(struct drmfb_softc if (offset < 0) return -1; + const unsigned num_pages __diagused = rbo->tbo.num_pages; + + KASSERT(offset < (num_pages << PAGE_SHIFT)); KASSERT(rbo->tbo.mem.bus.is_iomem); if (ISSET(rbo->tbo.mem.placement, TTM_PL_FLAG_WC))