aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm/drm_crtc.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-06-30 18:43:56 +1000
committerJames Morris <jmorris@namei.org>2011-06-30 18:43:56 +1000
commit5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch)
tree9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /include/drm/drm_crtc.h
parent0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff)
parentc017d0d1351f916c0ced3f358afc491fdcf490b4 (diff)
downloadkernel_replicant_linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.gz
kernel_replicant_linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.bz2
kernel_replicant_linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.zip
Merge branch 'linus' into next
Diffstat (limited to 'include/drm/drm_crtc.h')
-rw-r--r--include/drm/drm_crtc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 9573e0ce3120..33d12f87f0e0 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -520,6 +520,8 @@ struct drm_connector {
uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
uint32_t force_encoder_id;
struct drm_encoder *encoder; /* currently active encoder */
+
+ int null_edid_counter; /* needed to workaround some HW bugs where we get all 0s */
};
/**