aboutsummaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-06-28 09:29:04 +1000
committerDave Airlie <airlied@redhat.com>2013-06-28 09:29:04 +1000
commit4a009085978de90db40f9f38bcfad501f86ca959 (patch)
treef81e52842cb1b8d51be7ca5b6276f5c6cedb7aef /include/uapi
parentc0a608023006c5bc3512a374bb84a224a399786b (diff)
parentebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51 (diff)
Merge branch 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux into drm-next
These changes are mostly minor fixes to things introduced in 3.10. The biggest chunk is updates to the host1x firewall which checks job submissions from userspace and wasn't working properly. All other patches are mostly one-liners. Nothing new or too exciting this time around. * 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux: gpu: host1x: Rework CPU syncpoint increment gpu: host1x: Fix client_managed type gpu: host1x: Fix memory access in syncpt request gpu: host1x: Copy gathers before verification gpu: host1x: Don't reset firewall between gathers gpu: host1x: Check reloc table before usage gpu: host1x: Check INCR opcode correctly drm/tegra: Remove DRIVER_BUS_PLATFORM from driver_features drm/tegra: Fix return value drm/tegra: Include header drm/drm.h MAINTAINERS: Update Tegra DRM entry drm/tegra: fix error return code in gr2d_submit() drm/tegra: fix missing unlock on error drm/tegra: Honor pixel-format changes drm/tegra: Explicitly set irq_enabled drm/tegra: Don't disable unused planes
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/drm/tegra_drm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h
index 6e132a2f742..73bde4eaf16 100644
--- a/include/uapi/drm/tegra_drm.h
+++ b/include/uapi/drm/tegra_drm.h
@@ -17,6 +17,8 @@
#ifndef _UAPI_TEGRA_DRM_H_
#define _UAPI_TEGRA_DRM_H_
+#include <drm/drm.h>
+
struct drm_tegra_gem_create {
__u64 size;
__u32 flags;