linux-stable.git/drivers/gpu/drm/vmwgfx, branch linux-5.0.y

drm/vmwgfx: Return 0 when gmrid::get_node runs out of ID's

2019-03-27T05:17:52+00:00

commit 4b9ce3a651a37c60527101db4451a315a8b9588f upstream.

If it's not a system error and get_node implementation accommodate the
buffer object then it should return 0 with memm::mm_node set to NULL.

v2: Test for id != -ENOMEM instead of id == -ENOSPC.

Cc: 
Fixes: 4eb085e42fde ("drm/vmwgfx: Convert to new IDA API")
Signed-off-by: Deepak Rawat 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Thomas Hellstrom 
Signed-off-by: Greg Kroah-Hartman

drm/vmwgfx: Don't double-free the mode stored in par->set_mode

2019-03-27T05:17:52+00:00

commit c2d311553855395764e2e5bf401d987ba65c2056 upstream.

When calling vmw_fb_set_par(), the mode stored in par->set_mode gets free'd
twice. The first free is in vmw_fb_kms_detach(), the second is near the
end of vmw_fb_set_par() under the name of 'old_mode'. The mode-setting code
only works correctly if the mode doesn't actually change. Removing
'old_mode' in favor of using par->set_mode directly fixes the problem.

Cc: 
Fixes: a278724aa23c ("drm/vmwgfx: Implement fbdev on kms v2")
Signed-off-by: Thomas Zimmermann 
Reviewed-by: Deepak Rawat 
Signed-off-by: Thomas Hellstrom 
Signed-off-by: Greg Kroah-Hartman

drm/vmwgfx: Improve on IOMMU detection

2019-02-05T12:55:16+00:00

instead of relying on intel_iommu_enabled, use the fact that the
dma_map_ops::map_page != dma_direct_map_page.

Signed-off-by: Thomas Hellstrom 
Reviewed-by: Deepak Rawat

drm/vmwgfx: Fix setting of dma masks

2019-02-05T12:54:21+00:00

Previously we set only the dma mask and not the coherent mask. Fix that.
Also, for clarity, make sure both are initially set to 64 bits.

Cc: 
Fixes: 0d00c488f3de: ("drm/vmwgfx: Fix the driver for large dma addresses")
Signed-off-by: Thomas Hellstrom 
Reviewed-by: Deepak Rawat

drm/vmwgfx: Also check for crtc status while checking for DU active

2019-02-05T12:53:28+00:00

During modeset check it is possible to have all crtc_state's in atomic
state. Check for crtc enable status while checking for display unit
active status. Only error if enabling a crtc while display unit is not
active.

Cc: 
Fixes: 9da6e26c0aae: ("drm/vmwgfx: Fix a layout race condition")
Signed-off-by: Deepak Rawat 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Thomas Hellstrom

drm/vmwgfx: Fix an uninitialized fence handle value

2019-02-05T12:51:57+00:00

if vmw_execbuf_fence_commands() fails, The handle value will be
uninitialized and a bogus fence handle might be copied to user-space.

Cc: 
Fixes: 2724b2d54cda: ("drm/vmwgfx: Use new validation interface for the modesetting code v2")
Reported-by: Dan Carpenter 
Signed-off-by: Thomas Hellstrom 
Reviewed-by: Brian Paul  #v1
Reviewed-by: Sinclair Yeh  #v1
Reviewed-by: Deepak Rawat

drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user

2019-02-05T12:50:53+00:00

The function was unconditionally returning 0, and a caller would have to
rely on the returned fence pointer being NULL to detect errors. However,
the function vmw_execbuf_copy_fence_user() would expect a non-zero error
code in that case and would BUG otherwise.

So make sure we return a proper non-zero error code if the fence pointer
returned is NULL.

Cc: 
Fixes: ae2a104058e2: ("vmwgfx: Implement fence objects")
Signed-off-by: Thomas Hellstrom 
Reviewed-by: Deepak Rawat

drm/vmwgfx: unwind spaghetti code in vmw_dma_select_mode

2019-01-29T11:30:24+00:00

Just use a simple if/else chain to select the DMA mode.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Thomas Hellstrom

drm/vmwgfx: fix the check when to use dma_alloc_coherent

2019-01-29T11:30:17+00:00

Since Linux 4.21 we merged the swiotlb ops into the DMA direct ops,
so they would always have a the sync_single methods.  But late in
the cicle we also removed the direct ops entirely, so we'd see NULL
DMA ops.  Switch vmw_dma_select_mode to only detect swiotlb presence
using swiotlb_nr_tbl() instead.

Fixes: 55897af630 ("dma-direct: merge swiotlb_dma_ops into the dma_direct code")
Fixes: 356da6d0cd ("dma-mapping: bypass indirect calls for dma-direct")
Signed-off-by: Christoph Hellwig 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Thomas Hellstrom

drm/vmwgfx: remove CONFIG_INTEL_IOMMU ifdefs v2

2019-01-29T11:30:11+00:00

intel_iommu_enabled is defined as always false for !CONFIG_INTEL_IOMMU,
so remove the ifdefs around it.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Thomas Hellstrom