diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-14 14:07:17 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-14 14:07:18 +0100 |
| commit | 8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0 (patch) | |
| tree | 299ada5e68937f5f356974c49ae0b3e5c4145f05 /drivers/gpu/drm/drm_agpsupport.c | |
| parent | 16065fcdd19ddb9e093192914ac863884f308766 (diff) | |
| parent | 6649a95d35d850e417f125821a803ca7889c713c (diff) | |
| download | linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.tar.gz linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.tar.bz2 linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.zip | |
Merge tag 'drm-misc-next-2019-02-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.1:
UAPI Changes:
- New fourcc for P010 and P016 formats
Cross-subsystem Changes:
Core Changes:
- Removal of drm_calc_{h,v}scale_relaxed
- A few fixes for DP-MST
Driver Changes:
- More drmP.h cleanups
- A bunch of vkms fixes
- Conversion of the Cadence DSI bridge and Allwinner DSI driver to the
generic phy MIPI-DPHY API
- New panel: Innolux EE101IA-01D
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190211095220.3oeodszr2dgxrwqq@flea
Diffstat (limited to 'drivers/gpu/drm/drm_agpsupport.c')
| -rw-r--r-- | drivers/gpu/drm/drm_agpsupport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index 737f02885c28..40fba1c04dfc 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c @@ -348,7 +348,7 @@ int drm_agp_bind_ioctl(struct drm_device *dev, void *data, * \return zero on success or a negative number on failure. * * Verifies the AGP device is present and has been acquired and looks up the - * AGP memory entry. If the memory it's currently bound, unbind it via + * AGP memory entry. If the memory is currently bound, unbind it via * unbind_agp(). Frees it via free_agp() as well as the entry itself * and unlinks from the doubly linked list it's inserted in. */ |