diff options
Diffstat (limited to 'drivers/gpu/drm/i915')
-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 |
3 files changed, 3 insertions, 3 deletions
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, |