diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-09-07 21:27:23 +0200 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-10-25 12:03:53 -0700 |
| commit | 6c67b7bf25d837e8610650932195c096f1dd6bc2 (patch) | |
| tree | 13b5e196150e5b8911859e770ec1ccf9622e98b2 /vmwgfx_execbuf.c | |
| parent | 749baed003d4f8eab1a1b03d03048110fbd0d7f0 (diff) | |
vmwgfx: Update stand alone to v4.12
Mostly straight copy-and-paste from upstream, with the following
notable changes
* Added #undef CONFIG_DEBUG_FS in drmP.h to exclude all debugfs code
* Minor updates to a few vmwgfx files due to API change
* Carried over from the v4.11 update: Skipped update to drm_mm and
drm_vma_manager because the switch to using interval tree makes
porting difficult
* Added #include <linux/highuid.h> to drm_ioctl.c to make CentOS
build
* Rolled in [Commit 3bacf4361cd0: drm/vmwgfx: Fix fbdev emulation
using legacy functions]
* Updated vmwgfx code to match upstream v4.12 code
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'vmwgfx_execbuf.c')
| -rw-r--r-- | vmwgfx_execbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vmwgfx_execbuf.c b/vmwgfx_execbuf.c index 1c6a4fc..ea5eac1 100644 --- a/vmwgfx_execbuf.c +++ b/vmwgfx_execbuf.c @@ -502,7 +502,7 @@ static void vmw_resource_relocations_apply(uint32_t *cb, list_for_each_entry(rel, list, head) { u32 *addr = (u32 *)((unsigned long) cb + rel->offset); - switch(rel->rel_type) { + switch (rel->rel_type) { case vmw_res_rel_normal: *addr = rel->res->id; break; @@ -3086,7 +3086,7 @@ static int vmw_cmd_dx_genmips(struct vmw_private *dev_priv, } *cmd = container_of(header, typeof(*cmd), header); return vmw_view_id_val_add(sw_context, vmw_view_sr, - cmd->body.shaderResourceViewId); + cmd->body.shaderResourceViewId); } /** |