diff options
author | Dave Airlie <airlied@redhat.com> | 2012-12-16 01:05:03 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-12-16 01:05:03 -0500 |
commit | 55bde6b1442fed8af67b92d21acce67db454c9f9 (patch) | |
tree | ab52a043257fe7952b45ee9fda1db7a9c8ff0f9f /include/drm | |
parent | 2f3f24061c5c489074ad492bf694a5a76ebd8fc5 (diff) | |
parent | 20652097dadd9a7fb4d652f25466299974bc78f9 (diff) |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
Daniel writes:
A few leftover fixes for 3.8:
- VIC support for hdmi infoframes with the associated drm helper, fixes
some black TVs (Paulo Zanoni)
- Modeset state check (and fixup if the BIOS messed with the hw) for
lid-open. modeset-rework fallout. Somehow the original reporter went
awol, so this stalled for way too long until we've found a new
victim^Wreporter with broken BIOS.
- seqno wrap fixes from Mika and Chris.
- Some minor fixes all over from various people.
- Another race fix in the pageflip vs. unpin code from Chris.
- hsw vga resume support and a few more fdi link fixes (only used for vga
on hsw) from Paulo.
- Regression fix for DMAR from Zhenyu Wang - I've scavenged memory from my
DMAR for a while and it broke right away :(
- Regression fix from Takashi Iwai for ivb lvds - some w/a needs to be
(partially) moved back into place. Note that these are regressions in
-next.
- One more fix for ivb 3 pipe support - it now actually seems to work.
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: (25 commits)
drm/i915: Fix missed needs_dmar setting
drm/i915: Fix shifted screen on top of LVDS on IVY laptop
drm/i915: disable cpt phase pointer fdi rx workaround
drm/i915: set the LPT FDI RX polarity reversal bit when needed
drm/i915: add lpt_init_pch_refclk
drm/i915: add support for mPHY destination on intel_sbi_{read, write}
drm/i915: reject modes the LPT FDI receiver can't handle
drm/i915: fix hsw_fdi_link_train "retry" code
drm/i915: Close race between processing unpin task and queueing the flip
drm/i915: fixup l3 parity sysfs access check
drm/i915: Clear the existing watermarks for g4x when modifying the cursor sr
drm/i915: do not access BLC_PWM_CTL2 on pre-gen4 hardware
drm/i915: Don't allow ring tail to reach the same cacheline as head
drm/i915: Decouple the object from the unbound list before freeing pages
drm/i915: Set sync_seqno properly after seqno wrap
drm/i915: Include the last semaphore sync point in the error-state
drm/i915: Rearrange code to only have a single method for waiting upon the ring
drm/i915: Simplify flushing activity on the ring
drm/i915: Preallocate next seqno before touching the ring
drm/i915: force restore on lid open
...
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index ee9b0b59237f..00d78b5161c0 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -1047,6 +1047,7 @@ extern struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev, | |||
1047 | int GTF_2C, int GTF_K, int GTF_2J); | 1047 | int GTF_2C, int GTF_K, int GTF_2J); |
1048 | extern int drm_add_modes_noedid(struct drm_connector *connector, | 1048 | extern int drm_add_modes_noedid(struct drm_connector *connector, |
1049 | int hdisplay, int vdisplay); | 1049 | int hdisplay, int vdisplay); |
1050 | extern uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode); | ||
1050 | 1051 | ||
1051 | extern int drm_edid_header_is_valid(const u8 *raw_edid); | 1052 | extern int drm_edid_header_is_valid(const u8 *raw_edid); |
1052 | extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid); | 1053 | extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid); |