Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

4b7ba869

Commit 4b7ba869 authored 10 years ago by Dave Airlie

Downloads
- Plain Diff

Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 2014-07-04

* tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix compat shader namespace

parents cd3de83f 18e4a466

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/gpu/drm/vmwgfx/Makefile 2 additions, 1 deletion

drivers/gpu/drm/vmwgfx/Makefile
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c 341 additions, 0 deletions

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
drivers/gpu/drm/vmwgfx/vmwgfx_context.c 28 additions, 10 deletions

drivers/gpu/drm/vmwgfx/vmwgfx_context.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c 0 additions, 7 deletions

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 50 additions, 24 deletions

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 128 additions, 99 deletions

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c 124 additions, 272 deletions

drivers/gpu/drm/vmwgfx/vmwgfx_shader.c

with 673 additions and 413 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment