Merge branch 'drm-vmware-next' into drm-core-next

Browse source

* drm-vmware-next:
  drm/vmwgfx: Bump driver minor
  vmwgfx: Move function declaration to correct header
  drm/vmwgfx: Treat out-of-range initial width and height as host errors
  vmwgfx: Pick up the initial size from the width and height regs
  vmwgfx: Add page flip support
  vmwgfx: Pipe fence out of screen object dirty functions
  vmwgfx: Make it possible to get fence from execbuf
  vmwgfx: Clean up pending event references to struct drm_file objects on close
  vmwgfx: Rework fence event action

...

This commit is contained in:

Dave Airlie 2012-02-13 12:04:11 +00:00

parent 8bf42225da 0a240ec436

commit ade510153e

10 changed files with 350 additions and 138 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

53

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

10

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

View file

15

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

View file

8

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

View file

252

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

View file

9

drivers/gpu/drm/vmwgfx/vmwgfx_fence.h

View file

91

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

View file

8

drivers/gpu/drm/vmwgfx/vmwgfx_kms.h

View file

4

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

View file

38

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

View file