diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-06-06 05:07:09 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-06 05:07:09 -0400 |
| commit | ecb889e6205171ecbf80b15d903549aa6b15d23b (patch) | |
| tree | 64380a55d07a0e4c6dae660fa918e2f78e797949 /include/drm | |
| parent | c7560f1281640b1232d1c3cb242aabf5bd83a857 (diff) | |
| parent | 15d24aa5602fb87c7b1358cfabcfeb9b26db290f (diff) | |
Merge tag 'drm-intel-fixes-2014-06-06' of git://anongit.freedesktop.org/drm-intel into drm-next
> Bunch of stuff for 3.16 still:
> - Mipi dsi panel support for byt. Finally! From Shobhit&others. I've
> squeezed this in since it's a regression compared to vbios and we've
> been ridiculed about it a bit too often ...
> - connection_mutex deadlock fix in get_connector (only affects i915).
> - Core patches from Matt's primary plane from Matt Roper, I've pushed the
> i915 stuff to 3.17.
> - vlv power well sequencing fixes from Jesse.
> - Fix for cursor size changes from Chris.
> - agpbusy fixes from Ville.
> - A few smaller things.
>
* tag 'drm-intel-fixes-2014-06-06' of git://anongit.freedesktop.org/drm-intel: (32 commits)
drm/i915: BDW: Adding missing cursor offsets.
drm: Fix getconnector connection_mutex locking
drm/i915/bdw: Only use 2g GGTT for 32b platforms
drm/i915: Nuke pipe A quirk on i830M
drm/i915: fix display power sw state reporting
drm/i915: Always apply cursor width changes
drm/i915: tell the user if both KMS and UMS are disabled
drm/plane-helper: Add drm_plane_helper_check_update() (v3)
drm: Check CRTC compatibility in setplane
drm/i915: use VBT to determine whether to enumerate the VGA port
drm/i915: Don't WARN about ring idle bit on gen2
drm/i915: Silence the WARN if the user tries to GTT mmap an incoherent object
drm/i915: Move the C3 LP write bit setup to gen3_init_clock_gating() for KMS
drm/i915: Enable interrupt-based AGPBUSY# enable on 85x
drm/i915: Flip the sense of AGPBUSY_DIS bit
drm/i915: Set AGPBUSY# bit in init_clock_gating
drm/i915/vlv: add pll assertion when disabling DPIO common well
drm/i915/vlv: move DPIO common reset de-assert into __vlv_set_power_well
drm/i915/vlv: re-order power wells so DPIO common comes after TX
drm/i915/vlv: move CRI refclk enable into __vlv_set_power_well
...
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_plane_helper.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h index c5e7ab9503c8..52e6870534b2 100644 --- a/include/drm/drm_plane_helper.h +++ b/include/drm/drm_plane_helper.h | |||
| @@ -24,6 +24,17 @@ | |||
| 24 | #ifndef DRM_PLANE_HELPER_H | 24 | #ifndef DRM_PLANE_HELPER_H |
| 25 | #define DRM_PLANE_HELPER_H | 25 | #define DRM_PLANE_HELPER_H |
| 26 | 26 | ||
| 27 | #include <drm/drm_rect.h> | ||
| 28 | |||
| 29 | /* | ||
| 30 | * Drivers that don't allow primary plane scaling may pass this macro in place | ||
| 31 | * of the min/max scale parameters of the update checker function. | ||
| 32 | * | ||
| 33 | * Due to src being in 16.16 fixed point and dest being in integer pixels, | ||
| 34 | * 1<<16 represents no scaling. | ||
| 35 | */ | ||
| 36 | #define DRM_PLANE_HELPER_NO_SCALING (1<<16) | ||
| 37 | |||
| 27 | /** | 38 | /** |
| 28 | * DOC: plane helpers | 39 | * DOC: plane helpers |
| 29 | * | 40 | * |
| @@ -31,6 +42,17 @@ | |||
| 31 | * planes. | 42 | * planes. |
| 32 | */ | 43 | */ |
| 33 | 44 | ||
| 45 | extern int drm_plane_helper_check_update(struct drm_plane *plane, | ||
| 46 | struct drm_crtc *crtc, | ||
| 47 | struct drm_framebuffer *fb, | ||
| 48 | struct drm_rect *src, | ||
| 49 | struct drm_rect *dest, | ||
| 50 | const struct drm_rect *clip, | ||
| 51 | int min_scale, | ||
| 52 | int max_scale, | ||
| 53 | bool can_position, | ||
| 54 | bool can_update_disabled, | ||
| 55 | bool *visible); | ||
| 34 | extern int drm_primary_helper_update(struct drm_plane *plane, | 56 | extern int drm_primary_helper_update(struct drm_plane *plane, |
| 35 | struct drm_crtc *crtc, | 57 | struct drm_crtc *crtc, |
| 36 | struct drm_framebuffer *fb, | 58 | struct drm_framebuffer *fb, |