diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 53c87254be4c..5b2cbb778162 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -210,7 +210,7 @@ static int drm_mode_object_get(struct drm_device *dev, | |||
210 | int ret; | 210 | int ret; |
211 | 211 | ||
212 | WARN(!mutex_is_locked(&dev->mode_config.mutex), | 212 | WARN(!mutex_is_locked(&dev->mode_config.mutex), |
213 | "%s called w/o mode_config lock\n", __FUNCTION__); | 213 | "%s called w/o mode_config lock\n", __func__); |
214 | again: | 214 | again: |
215 | if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) { | 215 | if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) { |
216 | DRM_ERROR("Ran out memory getting a mode number\n"); | 216 | DRM_ERROR("Ran out memory getting a mode number\n"); |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 14afc23a0e24..1384d6686555 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1445,7 +1445,7 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg) | |||
1445 | 1445 | ||
1446 | if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) || | 1446 | if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) || |
1447 | (obj_priv->gtt_offset & (obj->size - 1))) { | 1447 | (obj_priv->gtt_offset & (obj->size - 1))) { |
1448 | WARN(1, "%s: object not 1M or size aligned\n", __FUNCTION__); | 1448 | WARN(1, "%s: object not 1M or size aligned\n", __func__); |
1449 | return; | 1449 | return; |
1450 | } | 1450 | } |
1451 | 1451 | ||
@@ -1478,7 +1478,7 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg) | |||
1478 | 1478 | ||
1479 | if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) || | 1479 | if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) || |
1480 | (obj_priv->gtt_offset & (obj->size - 1))) { | 1480 | (obj_priv->gtt_offset & (obj->size - 1))) { |
1481 | WARN(1, "%s: object not 1M or size aligned\n", __FUNCTION__); | 1481 | WARN(1, "%s: object not 1M or size aligned\n", __func__); |
1482 | return; | 1482 | return; |
1483 | } | 1483 | } |
1484 | 1484 | ||