]> Git Repo - linux.git/commitdiff
Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux...
authorDave Airlie <[email protected]>
Tue, 31 Jan 2017 22:40:13 +0000 (08:40 +1000)
committerDave Airlie <[email protected]>
Tue, 31 Jan 2017 22:40:13 +0000 (08:40 +1000)
This is to address what we've discussed, moving some of the minor changes
into a drm-next request.

* 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux:
  drm/vmwgfx: Use kmemdup instead of kmalloc and memcpy
  drm/vmwgfx: Fix depth input into drm_mode_legacy_fb_format
  drm/vmwgfx: Fix a potential integer overflow
  drm/vmwgfx: Clear an uninitialized struct member
  drm/vmwgfx: Annotate ignored return values
  drm/vmwgfx: Clear uninitialized fields of a parameter

1  2 
drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

index 1de96693f2a7699318a1917df1e2683c0ce65185,c7cf48c0ad3eab44148109549dc54c4d4254ccd3..4c7f24a67a2e8e681986f964cffe59f7e15f2a63
@@@ -825,7 -825,6 +825,7 @@@ static int vmw_ttm_fault_reserve_notify
   * (currently only resources).
   */
  static void vmw_move_notify(struct ttm_buffer_object *bo,
 +                          bool evict,
                            struct ttm_mem_reg *mem)
  {
        vmw_resource_move_notify(bo, mem);
   */
  static void vmw_swap_notify(struct ttm_buffer_object *bo)
  {
-       ttm_bo_wait(bo, false, false);
+       (void) ttm_bo_wait(bo, false, false);
  }
  
  
@@@ -859,4 -858,6 +859,4 @@@ struct ttm_bo_driver vmw_bo_driver = 
        .fault_reserve_notify = &vmw_ttm_fault_reserve_notify,
        .io_mem_reserve = &vmw_ttm_io_mem_reserve,
        .io_mem_free = &vmw_ttm_io_mem_free,
 -      .lru_tail = &ttm_bo_default_lru_tail,
 -      .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
  };
This page took 0.064149 seconds and 4 git commands to generate.