History

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes

* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung: drm/exynos: fixed exynos broken ioctl drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv drm/exynos: fix struct for operation callback functions to driver name drm/exynos: use define instead of default_win member in struct mixer_context drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR drm/exynos: remove unused codes in hdmi and mixer drm/exynos: remove unnecessary type conversion of hdmi and mixer drm/exynos: add format list of plane drm/exynos: fixed duplicated page allocation bug. drm/exynos: fixed page align and code clean.

Dave Airlie committed 14 years ago

Commit 173fa4e2 parents 19e5c4e 490aa6013 files · +192 −187Browse files

Showing the changes to include/drm (1 of 13 files). Show all

Unified · Split

include/drm/exynos_drm.h+3−2
@@ -85,7 +85,7 @@ struct drm_exynos_gem_mmap { · 84 unmodified lines
8585 struct drm_exynos_vidi_connection {
8686 unsigned int connection;
8787 unsigned int extensions;
88− uint64_t *edid;
88+ uint64_t edid;
8989 };
9090
9191 struct drm_exynos_plane_set_zpos {
@@ -96,7 +96,8 @@ struct drm_exynos_plane_set_zpos { · 4 unmodified lines
9696 /* memory type definitions. */
9797 enum e_drm_exynos_gem_mem_type {
9898 /* Physically Non-Continuous memory. */
99− EXYNOS_BO_NONCONTIG = 1 << 0
99+ EXYNOS_BO_NONCONTIG = 1 << 0,
100+ EXYNOS_BO_MASK = EXYNOS_BO_NONCONTIG
100101 };
101102
102103 #define DRM_EXYNOS_GEM_CREATE 0x00