diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-06 01:52:45 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-06 03:01:56 +0300 |
| commit | a1c3b49523aeb89a7f5ffa852c29db9c4e5ac8dd (patch) | |
| tree | 25119ff623073a26f79608c50cdd78a8e8b50078 /drivers/gpu/drm/vmwgfx/vmwgfx_va.c | |
| parent | c5be9b54034339a7983a1167cdc80dc27fea1799 (diff) | |
| parent | 968d72e6a5105a18fe17c0a8b4ef2951d0eb42dd (diff) | |
| download | linux-a1c3b49523aeb89a7f5ffa852c29db9c4e5ac8dd.tar.xz | |
Merge tag 'drm-misc-next-2018-07-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.19:
UAPI Changes:
v3d: add fourcc modicfier for fourcc for the Broadcom UIF format (Eric Anholt)
Cross-subsystem Changes:
console/fbcon: Add support for deferred console takeover (Hans de Goede)
Core Changes:
dma-fence clean up, improvements and docs (Daniel Vetter)
add mask function for crtc, plane, encoder and connector DRM objects(Ville Syrjälä)
Driver Changes:
pl111: add Nomadik LCDC variant (Linus Walleij)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180704234641.GA3981@juma
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_va.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_va.c b/drivers/gpu/drm/vmwgfx/vmwgfx_va.c index b4162fd78600..ebc1d83c34b4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_va.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_va.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT /************************************************************************** * - * Copyright © 2012-2016 VMware, Inc., Palo Alto, CA., USA - * All Rights Reserved. + * Copyright 2012-2016 VMware, Inc., Palo Alto, CA., USA * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the |