diff options
author | Dave Airlie <airlied@redhat.com> | 2017-07-24 08:57:28 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-07-24 08:57:28 +0300 |
commit | 739b000994b7c813e4cac56c077abd8f6b0ccaab (patch) | |
tree | 469be35535b2db6eb5fbd2dcece50bbe45c22e2a /drivers/gpu/drm/vmwgfx/vmwgfx_context.c | |
parent | 507e8e5e5d3fd640e24420be9cbd1c50190bdb4a (diff) | |
parent | 8046306fb9dedf216fc37a7dadc0e35ce37e9567 (diff) | |
download | linux-739b000994b7c813e4cac56c077abd8f6b0ccaab.tar.xz |
Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes
misc vmwgfx fixes.
* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
drm/vmwgfx: constify pci_device_id.
drm/vmwgfx: Fix gcc-7.1.1 warning
drm/vmwgfx: Fix cursor hotspot issue with Wayland on Fedora
drm/vmwgfx: Limit max desktop dimensions to 8Kx8K
drm/vmwgfx: dma-buf: Constify ttm_place structures.
drm/vmwgfx: fix comment mistake for vmw_cmd_dx_set_index_buffer()
drm/vmwgfx: Use dma_pool_zalloc
drm/vmwgfx: Fix handling of errors returned by 'vmw_cotable_alloc()'
drm/vmwgfx: Fix NULL pointer comparison
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_context.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c index bcc6d4136c87..4212b3e673bc 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c @@ -210,8 +210,8 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv, for (i = 0; i < SVGA_COTABLE_DX10_MAX; ++i) { uctx->cotables[i] = vmw_cotable_alloc(dev_priv, &uctx->res, i); - if (unlikely(uctx->cotables[i] == NULL)) { - ret = -ENOMEM; + if (unlikely(IS_ERR(uctx->cotables[i]))) { + ret = PTR_ERR(uctx->cotables[i]); goto out_cotables; } } @@ -777,7 +777,7 @@ static int vmw_context_define(struct drm_device *dev, void *data, } ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); - if (unlikely(ctx == NULL)) { + if (unlikely(!ctx)) { ttm_mem_global_free(vmw_mem_glob(dev_priv), vmw_user_context_size); ret = -ENOMEM; |