diff options
| -rw-r--r-- | sys/dev/pci/drm/drmP.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_gem_context.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_cursor.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_object.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h index f48e9ad8df2..b464f402683 100644 --- a/sys/dev/pci/drm/drmP.h +++ b/sys/dev/pci/drm/drmP.h @@ -1,4 +1,4 @@ -/* $OpenBSD: drmP.h,v 1.151 2013/11/02 22:58:10 kettenis Exp $ */ +/* $OpenBSD: drmP.h,v 1.152 2013/11/07 05:33:05 jsg Exp $ */ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com */ @@ -176,6 +176,10 @@ do { \ (condition); \ }) +#define WARN_ON_ONCE(condition) ({ \ + (condition); \ +}) + #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-ELAST) static inline void * diff --git a/sys/dev/pci/drm/i915/i915_gem_context.c b/sys/dev/pci/drm/i915/i915_gem_context.c index 2323b4512b4..0290d072dca 100644 --- a/sys/dev/pci/drm/i915/i915_gem_context.c +++ b/sys/dev/pci/drm/i915/i915_gem_context.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_gem_context.c,v 1.2 2013/10/05 07:30:06 jsg Exp $ */ +/* $OpenBSD: i915_gem_context.c,v 1.3 2013/11/07 05:33:05 jsg Exp $ */ /* * Copyright © 2011-2012 Intel Corporation * @@ -422,7 +422,7 @@ static int do_switch(struct i915_hw_context *to) if (!to->is_initialized || is_default_context(to)) hw_flags |= MI_RESTORE_INHIBIT; - else if (/*WARN_ON_ONCE*/(from_obj == to->obj)) /* not yet expected */ + else if (WARN_ON_ONCE(from_obj == to->obj)) /* not yet expected */ hw_flags |= MI_FORCE_RESTORE; ret = mi_set_context(ring, to, hw_flags); diff --git a/sys/dev/pci/drm/radeon/radeon_cursor.c b/sys/dev/pci/drm/radeon/radeon_cursor.c index 6ad03230358..9225e63f116 100644 --- a/sys/dev/pci/drm/radeon/radeon_cursor.c +++ b/sys/dev/pci/drm/radeon/radeon_cursor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_cursor.c,v 1.1 2013/08/12 04:11:53 jsg Exp $ */ +/* $OpenBSD: radeon_cursor.c,v 1.2 2013/11/07 05:33:05 jsg Exp $ */ /* * Copyright 2007-8 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -272,9 +272,7 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, cursor_end = x - xorigin + w; if (!(cursor_end & 0x7f)) { x--; -#ifdef notyet WARN_ON_ONCE(x < 0); -#endif } } } diff --git a/sys/dev/pci/drm/radeon/radeon_object.c b/sys/dev/pci/drm/radeon/radeon_object.c index 7e94abea811..8bf28c47964 100644 --- a/sys/dev/pci/drm/radeon/radeon_object.c +++ b/sys/dev/pci/drm/radeon/radeon_object.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_object.c,v 1.2 2013/08/13 19:43:10 kettenis Exp $ */ +/* $OpenBSD: radeon_object.c,v 1.3 2013/11/07 05:33:05 jsg Exp $ */ /* * Copyright 2009 Jerome Glisse. * All Rights Reserved. @@ -233,10 +233,8 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset, domain_start = bo->rdev->mc.vram_start; else domain_start = bo->rdev->mc.gtt_start; -#ifdef notyet WARN_ON_ONCE(max_offset < (radeon_bo_gpu_offset(bo) - domain_start)); -#endif } return 0; |