summaryrefslogtreecommitdiff
path: root/include/drm/drm_modes.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-05-01 03:26:53 +0400
committerDave Airlie <airlied@redhat.com>2014-05-01 03:26:53 +0400
commitb87577b7c768683736eea28f70779e8c75b4df62 (patch)
tree22930353aa540db01208f444ca57dfb56915e277 /include/drm/drm_modes.h
parent885ac04ab3a226d28147853d6d98eee3897a5636 (diff)
downloadlinux-b87577b7c768683736eea28f70779e8c75b4df62.tar.xz
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_modes.h')
-rw-r--r--include/drm/drm_modes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 2dbbf9976669..91d0582f924e 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -223,7 +223,7 @@ void drm_mode_validate_size(struct drm_device *dev,
void drm_mode_prune_invalid(struct drm_device *dev,
struct list_head *mode_list, bool verbose);
void drm_mode_sort(struct list_head *mode_list);
-void drm_mode_connector_list_update(struct drm_connector *connector);
+void drm_mode_connector_list_update(struct drm_connector *connector, bool merge_type_bits);
/* parsing cmdline modes */
bool