diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-11-13 07:16:16 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-11-13 07:52:32 +0300 |
| commit | 14346c08fac465332f229fbfb0adb1d1a75de96c (patch) | |
| tree | 56875e6e322d9f6f1d99f258f80cfa5d51720021 /drivers/gpu/drm/omapdrm/omap_gem.c | |
| parent | 512bce50a41c528fa15c4c014293e7bebf018658 (diff) | |
| parent | 05481f072787e96d08cc304cda0c10e0d02cdadc (diff) | |
| download | linux-14346c08fac465332f229fbfb0adb1d1a75de96c.tar.xz | |
Merge tag 'drm-misc-next-2020-11-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.11:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- Remove pgprot_decrypt() before calling io_remap_pfn_range()
- Revert "drm/dp_mst: Retrieve extended DPCD caps for topology manager"
- ttm: Add multihop infrastructure
- doc: Update dma-buf
Driver Changes:
- amdgpu: Use TTM multihop
- kmb: select DRM_MIPI_DSI and depend on ARCH_KEEMBAY; Fix build warning;
Fix typos
- nouveau: Use TTM multihop; Fix out-of-bounds access
- radeon: Use TTM multihop
- ingenic: Search for scaling coefficients to to 102% of screen size
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201112080115.GA7954@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index d8e09792793a..68c271f4250b 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/ * Author: Rob Clark <rob.clark@linaro.org> */ @@ -580,7 +580,7 @@ int omap_gem_mmap_obj(struct drm_gem_object *obj, /** * omap_gem_dumb_create - create a dumb buffer - * @drm_file: our client file + * @file: our client file * @dev: our device * @args: the requested arguments copied from userspace * @@ -610,6 +610,7 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev, * @file: our drm client file * @dev: drm device * @handle: GEM handle to the object (from dumb_create) + * @offset: memory map offset placeholder * * Do the necessary setup to allow the mapping of the frame buffer * into user memory. We don't have to do much here at the moment. |