diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-08 09:42:51 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-06-08 09:42:51 +0100 |
| commit | 2d5c7cd35f1addb812e0b1709b3c727f1a58ca9c (patch) | |
| tree | a08ec4c74b7b9ab423c879baace645ce3666c875 /include | |
| parent | 6cf98d6ebb37a183d92c4183dc228cdeef9a7083 (diff) | |
| parent | 5736603bef2383b6bb07f88596ccc8c387d91121 (diff) | |
| download | kernel-common-2d5c7cd35f1addb812e0b1709b3c727f1a58ca9c.tar.gz kernel-common-2d5c7cd35f1addb812e0b1709b3c727f1a58ca9c.tar.bz2 kernel-common-2d5c7cd35f1addb812e0b1709b3c727f1a58ca9c.zip | |
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes
* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
drm/exynos: fixed blending for hdmi graphic layer
drm/exynos: Remove dummy encoder get_crtc operation implementation
drm/exynos: Keep a reference to frame buffer GEM objects
drm/exynos: Don't cast GEM object to Exynos GEM object when not needed
drm/exynos: DRIVER_BUS_PLATFORM is not a driver feature
drm/exynos: fixed size type.
drm/exynos: Use DRM_FORMAT_{NV12, YUV420} instead of DRM_FORMAT_{NV12M, YUV420M}
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/exynos_drm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h index b6d7ce92eadd..68733587e700 100644 --- a/include/drm/exynos_drm.h +++ b/include/drm/exynos_drm.h @@ -64,6 +64,7 @@ struct drm_exynos_gem_map_off { * A structure for mapping buffer. * * @handle: a handle to gem object created. + * @pad: just padding to be 64-bit aligned. * @size: memory size to be mapped. * @mapped: having user virtual address mmaped. * - this variable would be filled by exynos gem module @@ -72,7 +73,8 @@ struct drm_exynos_gem_map_off { */ struct drm_exynos_gem_mmap { unsigned int handle; - unsigned int size; + unsigned int pad; + uint64_t size; uint64_t mapped; }; |