diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-05-01 01:26:53 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-05-01 01:26:53 +0200 |
| commit | b87577b7c768683736eea28f70779e8c75b4df62 (patch) | |
| tree | 22930353aa540db01208f444ca57dfb56915e277 /include/drm/drm_crtc_helper.h | |
| parent | Merge tag 'drm-intel-next-2014-04-16' of git://anongit.freedesktop.org/drm-in... (diff) | |
| download | linux-b87577b7c768683736eea28f70779e8c75b4df62.tar.xz linux-b87577b7c768683736eea28f70779e8c75b4df62.zip | |
drm: try harder to avoid regression when merging mode bits
For QXL hw we really want the bits to be replaced as we change
the preferred mode on the fly, and the same goes for virgl when
I get to it, however the original fix for this seems to have caused
a wierd regression on Intel G33 that in a stunning display of failure
at opposition to his normal self, Daniel failed to diagnose.
So we are left doing this, ugly ugly ugly ugly, Daniel you fixed
that G33 yet?, ugly, ugly.
Tested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drm_crtc_helper.h')
| -rw-r--r-- | include/drm/drm_crtc_helper.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 36a5febac2a6..f51c8393e9a8 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -165,6 +165,10 @@ extern void drm_helper_resume_force_mode(struct drm_device *dev); extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); +extern int drm_helper_probe_single_connector_modes_nomerge(struct drm_connector + *connector, + uint32_t maxX, + uint32_t maxY); extern void drm_kms_helper_poll_init(struct drm_device *dev); extern void drm_kms_helper_poll_fini(struct drm_device *dev); extern bool drm_helper_hpd_irq_event(struct drm_device *dev); |