diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_state.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 5cae0b3eee9b..3f7c500b2115 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -272,7 +272,7 @@ EXPORT_SYMBOL(drm_mode_object_find); | |||
272 | * functions & device file and adds it to the master fd list. | 272 | * functions & device file and adds it to the master fd list. |
273 | * | 273 | * |
274 | * RETURNS: | 274 | * RETURNS: |
275 | * Zero on success, error code on falure. | 275 | * Zero on success, error code on failure. |
276 | */ | 276 | */ |
277 | int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, | 277 | int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, |
278 | const struct drm_framebuffer_funcs *funcs) | 278 | const struct drm_framebuffer_funcs *funcs) |
@@ -2328,7 +2328,7 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev, | |||
2328 | } else if (connector->funcs->set_property) | 2328 | } else if (connector->funcs->set_property) |
2329 | ret = connector->funcs->set_property(connector, property, out_resp->value); | 2329 | ret = connector->funcs->set_property(connector, property, out_resp->value); |
2330 | 2330 | ||
2331 | /* store the property value if succesful */ | 2331 | /* store the property value if successful */ |
2332 | if (!ret) | 2332 | if (!ret) |
2333 | drm_connector_property_set_value(connector, property, out_resp->value); | 2333 | drm_connector_property_set_value(connector, property, out_resp->value); |
2334 | out: | 2334 | out: |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index abfc27b0c2ea..a2a3fa599923 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1309,7 +1309,7 @@ out_free_list: | |||
1309 | * i915_gem_release_mmap - remove physical page mappings | 1309 | * i915_gem_release_mmap - remove physical page mappings |
1310 | * @obj: obj in question | 1310 | * @obj: obj in question |
1311 | * | 1311 | * |
1312 | * Preserve the reservation of the mmaping with the DRM core code, but | 1312 | * Preserve the reservation of the mmapping with the DRM core code, but |
1313 | * relinquish ownership of the pages back to the system. | 1313 | * relinquish ownership of the pages back to the system. |
1314 | * | 1314 | * |
1315 | * It is vital that we remove the page mapping if we have mapped a tiled | 1315 | * It is vital that we remove the page mapping if we have mapped a tiled |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 2b0fe54cd92c..40fcf6fdef38 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -70,7 +70,7 @@ static struct drm_fb_helper_funcs intel_fb_helper_funcs = { | |||
70 | 70 | ||
71 | 71 | ||
72 | /** | 72 | /** |
73 | * Curretly it is assumed that the old framebuffer is reused. | 73 | * Currently it is assumed that the old framebuffer is reused. |
74 | * | 74 | * |
75 | * LOCKING | 75 | * LOCKING |
76 | * caller should hold the mode config lock. | 76 | * caller should hold the mode config lock. |
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 083bec2e50f9..e7fa3279e2f8 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -2726,7 +2726,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device) | |||
2726 | /* Wrap with our custom algo which switches to DDC mode */ | 2726 | /* Wrap with our custom algo which switches to DDC mode */ |
2727 | intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo; | 2727 | intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo; |
2728 | 2728 | ||
2729 | /* In defaut case sdvo lvds is false */ | 2729 | /* In default case sdvo lvds is false */ |
2730 | intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps); | 2730 | intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps); |
2731 | 2731 | ||
2732 | if (intel_sdvo_output_setup(intel_output, | 2732 | if (intel_sdvo_output_setup(intel_output, |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 609719490ec2..00c739c44848 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -389,11 +389,11 @@ int r600_mc_init(struct radeon_device *rdev) | |||
389 | * AGP so that GPU can catch out of VRAM/AGP access | 389 | * AGP so that GPU can catch out of VRAM/AGP access |
390 | */ | 390 | */ |
391 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { | 391 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { |
392 | /* Enought place before */ | 392 | /* Enough place before */ |
393 | rdev->mc.vram_location = rdev->mc.gtt_location - | 393 | rdev->mc.vram_location = rdev->mc.gtt_location - |
394 | rdev->mc.mc_vram_size; | 394 | rdev->mc.mc_vram_size; |
395 | } else if (tmp > rdev->mc.mc_vram_size) { | 395 | } else if (tmp > rdev->mc.mc_vram_size) { |
396 | /* Enought place after */ | 396 | /* Enough place after */ |
397 | rdev->mc.vram_location = rdev->mc.gtt_location + | 397 | rdev->mc.vram_location = rdev->mc.gtt_location + |
398 | rdev->mc.gtt_size; | 398 | rdev->mc.gtt_size; |
399 | } else { | 399 | } else { |
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index b38c4c8e2c61..d10eb43645c8 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
@@ -59,7 +59,7 @@ static struct fb_ops radeonfb_ops = { | |||
59 | }; | 59 | }; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * Curretly it is assumed that the old framebuffer is reused. | 62 | * Currently it is assumed that the old framebuffer is reused. |
63 | * | 63 | * |
64 | * LOCKING | 64 | * LOCKING |
65 | * caller should hold the mode config lock. | 65 | * caller should hold the mode config lock. |
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index 38537d971a3e..067167cb39ca 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c | |||
@@ -1950,7 +1950,7 @@ static void radeon_apply_surface_regs(int surf_index, | |||
1950 | * Note that refcount can be at most 2, since during a free refcount=3 | 1950 | * Note that refcount can be at most 2, since during a free refcount=3 |
1951 | * might mean we have to allocate a new surface which might not always | 1951 | * might mean we have to allocate a new surface which might not always |
1952 | * be available. | 1952 | * be available. |
1953 | * For example : we allocate three contigous surfaces ABC. If B is | 1953 | * For example : we allocate three contiguous surfaces ABC. If B is |
1954 | * freed, we suddenly need two surfaces to store A and C, which might | 1954 | * freed, we suddenly need two surfaces to store A and C, which might |
1955 | * not always be available. | 1955 | * not always be available. |
1956 | */ | 1956 | */ |
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 765bd184b6fc..5a664000bf70 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -372,7 +372,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, | |||
372 | new_mem->mem_type == TTM_PL_SYSTEM) || | 372 | new_mem->mem_type == TTM_PL_SYSTEM) || |
373 | (old_mem->mem_type == TTM_PL_SYSTEM && | 373 | (old_mem->mem_type == TTM_PL_SYSTEM && |
374 | new_mem->mem_type == TTM_PL_TT)) { | 374 | new_mem->mem_type == TTM_PL_TT)) { |
375 | /* bind is enought */ | 375 | /* bind is enough */ |
376 | radeon_move_null(bo, new_mem); | 376 | radeon_move_null(bo, new_mem); |
377 | return 0; | 377 | return 0; |
378 | } | 378 | } |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 595ac638039d..9e9826ace305 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -807,11 +807,11 @@ int rv770_mc_init(struct radeon_device *rdev) | |||
807 | * AGP so that GPU can catch out of VRAM/AGP access | 807 | * AGP so that GPU can catch out of VRAM/AGP access |
808 | */ | 808 | */ |
809 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { | 809 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { |
810 | /* Enought place before */ | 810 | /* Enough place before */ |
811 | rdev->mc.vram_location = rdev->mc.gtt_location - | 811 | rdev->mc.vram_location = rdev->mc.gtt_location - |
812 | rdev->mc.mc_vram_size; | 812 | rdev->mc.mc_vram_size; |
813 | } else if (tmp > rdev->mc.mc_vram_size) { | 813 | } else if (tmp > rdev->mc.mc_vram_size) { |
814 | /* Enought place after */ | 814 | /* Enough place after */ |
815 | rdev->mc.vram_location = rdev->mc.gtt_location + | 815 | rdev->mc.vram_location = rdev->mc.gtt_location + |
816 | rdev->mc.gtt_size; | 816 | rdev->mc.gtt_size; |
817 | } else { | 817 | } else { |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index c70927ecda21..61c5572d2b91 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c | |||
@@ -427,7 +427,7 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo, | |||
427 | 427 | ||
428 | /* | 428 | /* |
429 | * We need to use vmap to get the desired page protection | 429 | * We need to use vmap to get the desired page protection |
430 | * or to make the buffer object look contigous. | 430 | * or to make the buffer object look contiguous. |
431 | */ | 431 | */ |
432 | prot = (mem->placement & TTM_PL_FLAG_CACHED) ? | 432 | prot = (mem->placement & TTM_PL_FLAG_CACHED) ? |
433 | PAGE_KERNEL : | 433 | PAGE_KERNEL : |