summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_crtc.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-10-13 15:44:24 +0200
committerIngo Molnar <mingo@elte.hu>2010-10-13 15:44:24 +0200
commit3d8a1a6a8af910cc2da566080d111e062a124ba6 (patch)
tree0c78b30a5c7aa083e215222989f982313c5141c0 /include/drm/drm_crtc.h
parent1b13fe6a6e9986dbc079cbb05090be75edbffa5d (diff)
parent5d0d71569e671239ae0d905ced9b65cd843f99ee (diff)
downloadop-kernel-dev-3d8a1a6a8af910cc2da566080d111e062a124ba6.zip
op-kernel-dev-3d8a1a6a8af910cc2da566080d111e062a124ba6.tar.gz
Merge branch 'amd-iommu/2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'include/drm/drm_crtc.h')
-rw-r--r--include/drm/drm_crtc.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index c9f3cc5..3e5a51a 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -386,7 +386,15 @@ struct drm_connector_funcs {
void (*dpms)(struct drm_connector *connector, int mode);
void (*save)(struct drm_connector *connector);
void (*restore)(struct drm_connector *connector);
- enum drm_connector_status (*detect)(struct drm_connector *connector);
+
+ /* Check to see if anything is attached to the connector.
+ * @force is set to false whilst polling, true when checking the
+ * connector due to user request. @force can be used by the driver
+ * to avoid expensive, destructive operations during automated
+ * probing.
+ */
+ enum drm_connector_status (*detect)(struct drm_connector *connector,
+ bool force);
int (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height);
int (*set_property)(struct drm_connector *connector, struct drm_property *property,
uint64_t val);
OpenPOWER on IntegriCloud