diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-12-09 12:27:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-12-09 12:27:54 +1000 |
| commit | 6f21890989b761d2f5a0d89a4dac1f6531be7d44 (patch) | |
| tree | 35936c43ed43c69f123befba5138f82d6c0ca048 /include | |
| parent | e783fd0cdc749716155ddebff660a98236f23f97 (diff) | |
| parent | 5c2a392d574231793a156bff4d4391b3c1ba11c5 (diff) | |
Merge tag 'omapdrm-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
omapdrm fixes for v4.10
* fix tpd12s015's error handling, which causes omap5 uevm HDMI to fail
* fix omapdrm primary plane allocation bug, which makes the display to fail to
come up
* tag 'omapdrm-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
drm/omap: tpd12s015: fix error handling
drm/omap: fix primary-plane's possible_crtcs
drm: fix possible_crtc's type
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_plane.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 5b38eb94783b..db3bbdeb36d5 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -513,7 +513,7 @@ struct drm_plane { extern __printf(8, 9) int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, - unsigned long possible_crtcs, + uint32_t possible_crtcs, const struct drm_plane_funcs *funcs, const uint32_t *formats, unsigned int format_count, @@ -521,7 +521,7 @@ int drm_universal_plane_init(struct drm_device *dev, const char *name, ...); extern int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, - unsigned long possible_crtcs, + uint32_t possible_crtcs, const struct drm_plane_funcs *funcs, const uint32_t *formats, unsigned int format_count, bool is_primary); |