diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-06-22 20:12:40 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-22 20:12:40 -0400 |
| commit | b7ddeee58bee54553552c1be9cf477efcdb2f30e (patch) | |
| tree | 00d6ba29a1c1dc49dc062e1b0ea34c134c32d8ee /include/drm | |
| parent | 26093813eabebcd3c9967f58a2581df45e91c2fe (diff) | |
| parent | c30f55a7b1336cdfeac74c7931ebff40a32e72b7 (diff) | |
Merge tag 'topic/drm-misc-2015-06-22' of git://anongit.freedesktop.org/drm-intel into drm-next
One more drm-misc pull for 4.2. The important one is the fix from Laurent
for Daniel Stone's mode_blob work.
* tag 'topic/drm-misc-2015-06-22' of git://anongit.freedesktop.org/drm-intel:
drm/atomic: Don't set crtc_state->enable manually
drm: prime: Document gem_prime_mmap
drm: Avoid the double clflush on the last cache line in drm_clflush_virt_range()
drm/atomic: Extract needs_modeset function
drm/cma: Fix 64-bit size_t build warnings
Documentation/drm: Update rotation property
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_atomic.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 1bbfedf466b9..8a3a913320eb 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h | |||
| @@ -163,5 +163,11 @@ int __must_check drm_atomic_async_commit(struct drm_atomic_state *state); | |||
| 163 | (plane_state) = (state)->plane_states[__i], 1); \ | 163 | (plane_state) = (state)->plane_states[__i], 1); \ |
| 164 | (__i)++) \ | 164 | (__i)++) \ |
| 165 | if (plane_state) | 165 | if (plane_state) |
| 166 | static inline bool | ||
| 167 | drm_atomic_crtc_needs_modeset(struct drm_crtc_state *state) | ||
| 168 | { | ||
| 169 | return state->mode_changed || state->active_changed; | ||
| 170 | } | ||
| 171 | |||
| 166 | 172 | ||
| 167 | #endif /* DRM_ATOMIC_H_ */ | 173 | #endif /* DRM_ATOMIC_H_ */ |
