diff options
Diffstat (limited to 'drivers/gpu/drm')
| -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/atombios.h | 16 | ||||
| -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 | 
11 files changed, 21 insertions, 21 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 5cae0b3eee9..3f7c500b211 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);   * functions & device file and adds it to the master fd list.   *   * RETURNS: - * Zero on success, error code on falure. + * Zero on success, error code on failure.   */  int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,  			 const struct drm_framebuffer_funcs *funcs) @@ -2328,7 +2328,7 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev,  	} else if (connector->funcs->set_property)  		ret = connector->funcs->set_property(connector, property, out_resp->value); -	/* store the property value if succesful */ +	/* store the property value if successful */  	if (!ret)  		drm_connector_property_set_value(connector, property, out_resp->value);  out: diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index abfc27b0c2e..a2a3fa59992 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1309,7 +1309,7 @@ out_free_list:   * i915_gem_release_mmap - remove physical page mappings   * @obj: obj in question   * - * Preserve the reservation of the mmaping with the DRM core code, but + * Preserve the reservation of the mmapping with the DRM core code, but   * relinquish ownership of the pages back to the system.   *   * 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 2b0fe54cd92..40fcf6fdef3 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 = {  /** - * Curretly it is assumed that the old framebuffer is reused. + * Currently it is assumed that the old framebuffer is reused.   *   * LOCKING   * 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 083bec2e50f..e7fa3279e2f 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)  	/* Wrap with our custom algo which switches to DDC mode */  	intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo; -	/* In defaut case sdvo lvds is false */ +	/* In default case sdvo lvds is false */  	intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps);  	if (intel_sdvo_output_setup(intel_output, diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index c11ddddfb3b..6643afc36ce 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h @@ -1141,7 +1141,7 @@ typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS {  /* ucTableFormatRevision=1,ucTableContentRevision=2 */  typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS_V2 {  	USHORT usPixelClock;	/*  in 10KHz; for bios convenient */ -	UCHAR ucMisc;		/*  see PANEL_ENCODER_MISC_xx defintions below */ +	UCHAR ucMisc;		/*  see PANEL_ENCODER_MISC_xx definitions below */  	UCHAR ucAction;		/*  0: turn off encoder */  	/*  1: setup and turn on encoder */  	UCHAR ucTruncate;	/*  bit0=0: Disable truncate */ @@ -1424,7 +1424,7 @@ typedef struct _ATOM_MULTIMEDIA_CONFIG_INFO {  /*  Structures used in FirmwareInfoTable */  /****************************************************************************/ -/*  usBIOSCapability Defintion: */ +/*  usBIOSCapability Definition: */  /*  Bit 0 = 0: Bios image is not Posted, =1:Bios image is Posted; */  /*  Bit 1 = 0: Dual CRTC is not supported, =1: Dual CRTC is supported; */  /*  Bit 2 = 0: Extended Desktop is not supported, =1: Extended Desktop is supported; */ @@ -2386,7 +2386,7 @@ typedef struct _ATOM_ANALOG_TV_INFO_V1_2 {  } ATOM_ANALOG_TV_INFO_V1_2;  /**************************************************************************/ -/*  VRAM usage and their defintions */ +/*  VRAM usage and their definitions */  /*  One chunk of VRAM used by Bios are for HWICON surfaces,EDID data. */  /*  Current Mode timing and Dail Timing and/or STD timing data EACH device. They can be broken down as below. */ @@ -3046,7 +3046,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO {  #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_DC     2  #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_LITEAC 3 -/* Byte aligned defintion for BIOS usage */ +/* Byte aligned definition for BIOS usage */  #define ATOM_S0_CRT1_MONOb0             0x01  #define ATOM_S0_CRT1_COLORb0            0x02  #define ATOM_S0_CRT1_MASKb0             (ATOM_S0_CRT1_MONOb0+ATOM_S0_CRT1_COLORb0) @@ -3131,7 +3131,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO {  #define ATOM_S2_DISPLAY_ROTATION_DEGREE_SHIFT 30  #define ATOM_S2_DISPLAY_ROTATION_ANGLE_MASK   0xC0000000L -/* Byte aligned defintion for BIOS usage */ +/* Byte aligned definition for BIOS usage */  #define ATOM_S2_TV1_STANDARD_MASKb0     0x0F  #define ATOM_S2_CURRENT_BL_LEVEL_MASKb1 0xFF  #define ATOM_S2_CRT1_DPMS_STATEb2       0x01 @@ -3190,7 +3190,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO {  #define ATOM_S3_ALLOW_FAST_PWR_SWITCH   0x40000000L  #define ATOM_S3_RQST_GPU_USE_MIN_PWR    0x80000000L -/* Byte aligned defintion for BIOS usage */ +/* Byte aligned definition for BIOS usage */  #define ATOM_S3_CRT1_ACTIVEb0           0x01  #define ATOM_S3_LCD1_ACTIVEb0           0x02  #define ATOM_S3_TV1_ACTIVEb0            0x04 @@ -3230,7 +3230,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO {  #define ATOM_S4_LCD1_REFRESH_MASK       0x0000FF00L  #define ATOM_S4_LCD1_REFRESH_SHIFT      8 -/* Byte aligned defintion for BIOS usage */ +/* Byte aligned definition for BIOS usage */  #define ATOM_S4_LCD1_PANEL_ID_MASKb0	  0x0FF  #define ATOM_S4_LCD1_REFRESH_MASKb1		  ATOM_S4_LCD1_PANEL_ID_MASKb0  #define ATOM_S4_VRAM_INFO_MASKb2        ATOM_S4_LCD1_PANEL_ID_MASKb0 @@ -3310,7 +3310,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO {  #define ATOM_S6_VRI_BRIGHTNESS_CHANGE       0x40000000L  #define ATOM_S6_CONFIG_DISPLAY_CHANGE_MASK  0x80000000L -/* Byte aligned defintion for BIOS usage */ +/* Byte aligned definition for BIOS usage */  #define ATOM_S6_DEVICE_CHANGEb0         0x01  #define ATOM_S6_SCALER_CHANGEb0         0x02  #define ATOM_S6_LID_CHANGEb0            0x04 diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 278f646bc18..6740ed24358 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -394,11 +394,11 @@ int r600_mc_init(struct radeon_device *rdev)  		 * AGP so that GPU can catch out of VRAM/AGP access  		 */  		if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { -			/* Enought place before */ +			/* Enough place before */  			rdev->mc.vram_location = rdev->mc.gtt_location -  							rdev->mc.mc_vram_size;  		} else if (tmp > rdev->mc.mc_vram_size) { -			/* Enought place after */ +			/* Enough place after */  			rdev->mc.vram_location = rdev->mc.gtt_location +  							rdev->mc.gtt_size;  		} else { diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index b38c4c8e2c6..d10eb43645c 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 = {  };  /** - * Curretly it is assumed that the old framebuffer is reused. + * Currently it is assumed that the old framebuffer is reused.   *   * LOCKING   * 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 38537d971a3..067167cb39c 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,   * Note that refcount can be at most 2, since during a free refcount=3   * might mean we have to allocate a new surface which might not always   * be available. - * For example : we allocate three contigous surfaces ABC. If B is + * For example : we allocate three contiguous surfaces ABC. If B is   * freed, we suddenly need two surfaces to store A and C, which might   * not always be available.   */ diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 1381e06d6af..eda4ade24c3 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -378,7 +378,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,  	     new_mem->mem_type == TTM_PL_SYSTEM) ||  	    (old_mem->mem_type == TTM_PL_SYSTEM &&  	     new_mem->mem_type == TTM_PL_TT)) { -		/* bind is enought */ +		/* bind is enough */  		radeon_move_null(bo, new_mem);  		return 0;  	} diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index b0efd0ddae7..5e06ee7076f 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -829,11 +829,11 @@ int rv770_mc_init(struct radeon_device *rdev)  		 * AGP so that GPU can catch out of VRAM/AGP access  		 */  		if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { -			/* Enought place before */ +			/* Enough place before */  			rdev->mc.vram_location = rdev->mc.gtt_location -  							rdev->mc.mc_vram_size;  		} else if (tmp > rdev->mc.mc_vram_size) { -			/* Enought place after */ +			/* Enough place after */  			rdev->mc.vram_location = rdev->mc.gtt_location +  							rdev->mc.gtt_size;  		} else { diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index c70927ecda2..61c5572d2b9 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,  		/*  		 * We need to use vmap to get the desired page protection -		 * or to make the buffer object look contigous. +		 * or to make the buffer object look contiguous.  		 */  		prot = (mem->placement & TTM_PL_FLAG_CACHED) ?  			PAGE_KERNEL :  |