diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-08-16 12:43:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-08-16 12:43:21 +1000 |
| commit | 8120ed5ebd2aaad1fee1a777effa158e5284b816 (patch) | |
| tree | af18fb0b82892b0f63d8f5ebdb7b575a2b52ec79 /drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | |
| parent | e7f7287bf5f746d29f3607178851246a005dd398 (diff) | |
| parent | a0a63940b0c9ebc6d3156bbfe0c2cf7560b580cd (diff) | |
| download | talos-op-linux-8120ed5ebd2aaad1fee1a777effa158e5284b816.tar.gz talos-op-linux-8120ed5ebd2aaad1fee1a777effa158e5284b816.zip | |
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next
A couple of independent patches extracted from the 5.3 pull request, fixed for
merge conflicts and a single unused variable warning.
And the drmP.h removal from Sam.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c index ff3586cb6851..e5252ef3812f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c @@ -25,10 +25,12 @@ * **************************************************************************/ -#include "vmwgfx_drv.h" -#include <drm/drmP.h> +#include <linux/sched/signal.h> + #include <drm/ttm/ttm_placement.h> +#include "vmwgfx_drv.h" + struct vmw_temp_set_context { SVGA3dCmdHeader header; SVGA3dCmdDXTempSetContext body; |
