Dave Airlie
21de54b3c4
Merge tag 'drm-vc4-next-2015-12-11' of http://github.com/anholt/linux into drm-next
...
This pull request brings in 3D acceleration support for the VC4 GPU.
While there is still performance work to be done (particularly
surrounding RCL generation), the CL submit ABI should be settled and
done now.
* tag 'drm-vc4-next-2015-12-11' of http://github.com/anholt/linux :
drm/vc4: Add an interface for capturing the GPU state after a hang.
drm/vc4: Add support for async pageflips.
drm/vc4: Add support for drawing 3D frames.
drm/vc4: Bind and initialize the V3D engine.
drm/vc4: Fix a typo in a V3D debug register.
drm/vc4: Add an API for creating GPU shaders in GEM BOs.
drm/vc4: Add create and map BO ioctls.
drm/vc4: Add a BO cache.
drm: Create a driver hook for allocating GEM object structs.
2015-12-15 10:43:27 +10:00
Rob Clark
8979a05928
drm/msm: trivial whitespace fix
...
Signed-off-by: Rob Clark <robdclark@gmail.com >
2015-12-14 11:49:33 -05:00
Dave Airlie
663a233eef
Merge branch 'drm-header-fixes' of https://github.com/GabrielL/linux into drm-next
...
Fix all the problems with the header files and userspace builds
off them. I really care so little about this, but hey who am
I to stop progress.
* 'drm-header-fixes' of https://github.com/GabrielL/linux: (30 commits)
drm: fix inclusion of drm.h in via_drm.h
drm: fix inclusion of drm.h in vmwgfx_drm.h
drm: fix inclusion of drm.h in virtgpu_drm.h
drm: fix inclusion of drm.h in tegra_drm.h
drm: fix inclusion of drm.h in savage_drm.h
drm: fix inclusion of drm.h in r128_drm.h
drm: fix inclusion of drm.h in qxl_drm.h
drm: fix inclusion of drm.h in omap_drm.h
drm: fix inclusion of drm.h in msm_drm.h
drm: fix inclusion of drm.h in mga_drm.h
drm: fix inclusion of drm.h in exynos_sarea.h
drm: fix inclusion of drm.h in i810_drm.h
drm: fix inclusion of drm.h in exynos_sarea.h
drm: fix inclusion of drm.h in drm_sarea.h
drm: drm_mode.h fix includes
drm: drm_fourcc.h fix includes
drm: include drm.h in armada_drm.h
include/uapi/drm/amdgpu_drm.h: use __u32 and __u64 from <linux/types.h>
drm: Kbuild: add admgpu_drm.h to the installed headers
drm: use __u{32,64} instead of uint{32,64}_t in virtgpu_drm.h
...
2015-12-11 13:46:05 +10:00
Gabriel Laskar
d7e12cd7b8
drm: fix inclusion of drm.h in via_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
3a4197afc4
drm: fix inclusion of drm.h in vmwgfx_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
6e82e9c857
drm: fix inclusion of drm.h in virtgpu_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
678205a6c4
drm: fix inclusion of drm.h in tegra_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
3e2d2cdfa0
drm: fix inclusion of drm.h in savage_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
355f47803a
drm: fix inclusion of drm.h in r128_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
8ca3284632
drm: fix inclusion of drm.h in qxl_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
7ef500e431
drm: fix inclusion of drm.h in omap_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
06577d042d
drm: fix inclusion of drm.h in msm_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
559003d067
drm: fix inclusion of drm.h in mga_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
1049102ff7
drm: fix inclusion of drm.h in exynos_sarea.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
13635d6120
drm: fix inclusion of drm.h in i810_drm.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for
the libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
19b1e97aef
drm: fix inclusion of drm.h in exynos_sarea.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
c6da66dff7
drm: fix inclusion of drm.h in drm_sarea.h
...
Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
abd5422db2
drm: drm_mode.h fix includes
...
Instead of using linux/types.h, drm headers should use drm.h, in order
to handle the portability issues in only one place.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
47f06c2f93
drm: drm_fourcc.h fix includes
...
Instead of using linux/types.h, drm headers should use drm.h, in order
to handle the portability issues in only one place.
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
6a14d01b91
drm: include drm.h in armada_drm.h
...
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Mikko Rapeli
2ce9dde0d4
include/uapi/drm/amdgpu_drm.h: use __u32 and __u64 from <linux/types.h>
...
Kernel headers exported to userspace are supposed to use these.
Fixes compilation errors in userspace:
error: unknown type name ‘uint64_t’
error: unknown type name ‘uint32_t’
Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
f95d3aa438
drm: Kbuild: add admgpu_drm.h to the installed headers
...
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
Acked-by: Alex Deucher <alexander.deucher@amd.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Gabriel Laskar
29e08b0518
drm: use __u{32,64} instead of uint{32,64}_t in virtgpu_drm.h
...
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr >
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com >
CC: Emil Velikov <emil.l.velikov@gmail.com >
CC: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Mikko Rapeli
35d0f1d54e
include/uapi/linux/agpgart.h: include stdlib.h in userspace
...
Fixes userspace compiler error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00
Mikko Rapeli
89545d6d5c
include/uapi/linux/virtio_gpu.h: use __u8 from <linux/types.h>
...
Kernel headers exported to userspace are should these types.
Fixes userspace compilation error:
error: unknown type name ‘uint8_t’
Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi >
2015-12-10 12:33:23 +01:00