Skip to content

Commit 0ae865e

Browse files
caihuoqing1990danvet
authored andcommitted
drm: Fix typo in comments
fix typo for drm v1->v2: respin with the change "iff ==> implies that" Signed-off-by: Cai Huoqing <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 33e1fc0 commit 0ae865e

36 files changed

+58
-58
lines changed

drivers/gpu/drm/drm_aperture.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
* Drivers that are susceptible to being removed by other drivers, such as
8080
* generic EFI or VESA drivers, have to register themselves as owners of their
81-
* given framebuffer memory. Ownership of the framebuffer memory is achived
81+
* given framebuffer memory. Ownership of the framebuffer memory is achieved
8282
* by calling devm_aperture_acquire_from_firmware(). On success, the driver
8383
* is the owner of the framebuffer range. The function fails if the
8484
* framebuffer is already by another driver. See below for an example.

drivers/gpu/drm/drm_atomic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
723723
* clocks, scaler units, bandwidth and fifo limits shared among a group of
724724
* planes or CRTCs, and so on) it makes sense to model these as independent
725725
* objects. Drivers then need to do similar state tracking and commit ordering for
726-
* such private (since not exposed to userpace) objects as the atomic core and
726+
* such private (since not exposed to userspace) objects as the atomic core and
727727
* helpers already provide for connectors, planes and CRTCs.
728728
*
729729
* To make this easier on drivers the atomic core provides some support to track

drivers/gpu/drm/drm_atomic_helper.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
634634
* connectors and a NULL mode.
635635
*
636636
* The other way around is true as well. enable != 0
637-
* iff connectors are attached and a mode is set.
637+
* implies that connectors are attached and a mode is set.
638638
*/
639639
new_crtc_state->mode_changed = true;
640640
new_crtc_state->connectors_changed = true;
@@ -1686,7 +1686,7 @@ static void commit_work(struct work_struct *work)
16861686
}
16871687

16881688
/**
1689-
* drm_atomic_helper_async_check - check if state can be commited asynchronously
1689+
* drm_atomic_helper_async_check - check if state can be committed asynchronously
16901690
* @dev: DRM device
16911691
* @state: the driver state object
16921692
*
@@ -1695,7 +1695,7 @@ static void commit_work(struct work_struct *work)
16951695
* but just do in-place changes on the current state.
16961696
*
16971697
* It will return 0 if the commit can happen in an asynchronous fashion or error
1698-
* if not. Note that error just mean it can't be commited asynchronously, if it
1698+
* if not. Note that error just mean it can't be committed asynchronously, if it
16991699
* fails the commit should be treated like a normal synchronous commit.
17001700
*/
17011701
int drm_atomic_helper_async_check(struct drm_device *dev,
@@ -2583,7 +2583,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_planes);
25832583
*
25842584
* This function can only be savely used when planes are not allowed to move
25852585
* between different CRTCs because this function doesn't handle inter-CRTC
2586-
* depencies. Callers need to ensure that either no such depencies exist,
2586+
* dependencies. Callers need to ensure that either no such dependencies exist,
25872587
* resolve them through ordering of commit calls or through some other means.
25882588
*/
25892589
void
@@ -2720,7 +2720,7 @@ EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);
27202720
/**
27212721
* drm_atomic_helper_swap_state - store atomic state into current sw state
27222722
* @state: atomic state
2723-
* @stall: stall for preceeding commits
2723+
* @stall: stall for preceding commits
27242724
*
27252725
* This function stores the atomic state into the current state pointers in all
27262726
* driver objects. It should be called after all failing steps have been done

drivers/gpu/drm/drm_atomic_uapi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
* in all its forms: The monster ATOMIC IOCTL itself, code for GET_PROPERTY and
4949
* SET_PROPERTY IOCTLs. Plus interface functions for compatibility helpers and
5050
* drivers which have special needs to construct their own atomic updates, e.g.
51-
* for load detect or similiar.
51+
* for load detect or similar.
5252
*/
5353

5454
/**
@@ -753,7 +753,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
753753
* restore the state it wants on VT switch. So if the userspace
754754
* tries to change the link_status from GOOD to BAD, driver
755755
* silently rejects it and returns a 0. This prevents userspace
756-
* from accidently breaking the display when it restores the
756+
* from accidentally breaking the display when it restores the
757757
* state.
758758
*/
759759
if (state->link_status != DRM_LINK_STATUS_GOOD)
@@ -1064,7 +1064,7 @@ int drm_atomic_set_property(struct drm_atomic_state *state,
10641064
* DOC: explicit fencing properties
10651065
*
10661066
* Explicit fencing allows userspace to control the buffer synchronization
1067-
* between devices. A Fence or a group of fences are transfered to/from
1067+
* between devices. A Fence or a group of fences are transferred to/from
10681068
* userspace using Sync File fds and there are two DRM properties for that.
10691069
* IN_FENCE_FD on each DRM Plane to send fences to the kernel and
10701070
* OUT_FENCE_PTR on each DRM CRTC to receive fences from the kernel.

drivers/gpu/drm/drm_auth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
*
5353
* In addition only one &drm_master can be the current master for a &drm_device.
5454
* It can be switched through the DROP_MASTER and SET_MASTER IOCTL, or
55-
* implicitly through closing/openeing the primary device node. See also
55+
* implicitly through closing/opening the primary device node. See also
5656
* drm_is_current_master().
5757
*
5858
* Clients can authenticate against the current master (if it matches their own)

drivers/gpu/drm/drm_bridge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ drm_atomic_bridge_propagate_bus_flags(struct drm_bridge *bridge,
982982
bridge_state->output_bus_cfg.flags = output_flags;
983983

984984
/*
985-
* Propage the output flags to the input end of the bridge. Again, it's
985+
* Propagate the output flags to the input end of the bridge. Again, it's
986986
* not necessarily what all bridges want, but that's what most of them
987987
* do, and by doing that by default we avoid forcing drivers to
988988
* duplicate the "dummy propagation" logic.

drivers/gpu/drm/drm_bufs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data,
15021502
*
15031503
* Maps the AGP, SG or PCI buffer region with vm_mmap(), and copies information
15041504
* about each buffer into user space. For PCI buffers, it calls vm_mmap() with
1505-
* offset equal to 0, which drm_mmap() interpretes as PCI buffers and calls
1505+
* offset equal to 0, which drm_mmap() interprets as PCI buffers and calls
15061506
* drm_mmap_dma().
15071507
*/
15081508
int __drm_legacy_mapbufs(struct drm_device *dev, void *data, int *p,

drivers/gpu/drm/drm_cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ drm_clflush_virt_range(void *addr, unsigned long length)
170170
for (; addr < end; addr += size)
171171
clflushopt(addr);
172172
clflushopt(end - 1); /* force serialisation */
173-
mb(); /*Ensure that evry data cache line entry is flushed*/
173+
mb(); /*Ensure that every data cache line entry is flushed*/
174174
return;
175175
}
176176

drivers/gpu/drm/drm_damage_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
116116
int ret = 0;
117117

118118
/*
119-
* When called from ioctl, we are interruptable, but not when called
119+
* When called from ioctl, we are interruptible, but not when called
120120
* internally (ie. defio worker)
121121
*/
122122
drm_modeset_acquire_init(&ctx,

drivers/gpu/drm/drm_dp_helper.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ int drm_dp_downstream_max_tmds_clock(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
772772
* It's left up to the driver to check the
773773
* DP dual mode adapter's max TMDS clock.
774774
*
775-
* Unfortunatley it looks like branch devices
775+
* Unfortunately it looks like branch devices
776776
* may not fordward that the DP dual mode i2c
777777
* access so we just usually get i2c nak :(
778778
*/
@@ -1365,7 +1365,7 @@ static int drm_dp_i2c_msg_duration(const struct drm_dp_aux_msg *msg,
13651365
}
13661366

13671367
/*
1368-
* Deterine how many retries should be attempted to successfully transfer
1368+
* Determine how many retries should be attempted to successfully transfer
13691369
* the specified message, based on the estimated durations of the
13701370
* i2c and AUX transfers.
13711371
*/
@@ -1418,7 +1418,7 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
14181418
/*
14191419
* While timeouts can be errors, they're usually normal
14201420
* behavior (for instance, when a driver tries to
1421-
* communicate with a non-existant DisplayPort device).
1421+
* communicate with a non-existent DisplayPort device).
14221422
* Avoid spamming the kernel log with timeout errors.
14231423
*/
14241424
if (ret == -ETIMEDOUT)
@@ -3329,7 +3329,7 @@ drm_edp_backlight_probe_max(struct drm_dp_aux *aux, struct drm_edp_backlight_inf
33293329
fxp = DIV_ROUND_CLOSEST(1000 * DP_EDP_BACKLIGHT_FREQ_BASE_KHZ, driver_pwm_freq_hz);
33303330

33313331
/* Use highest possible value of Pn for more granularity of brightness adjustment while
3332-
* satifying the conditions below.
3332+
* satisfying the conditions below.
33333333
* - Pn is in the range of Pn_min and Pn_max
33343334
* - F is in the range of 1 and 255
33353335
* - FxP is within 25% of desired value.

0 commit comments

Comments
 (0)