diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-14 11:07:23 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-09-14 20:38:48 +1000 |
commit | 930a9e283516a3a3595c0c515113f1b78d07f695 (patch) | |
tree | b527736ae76d678f8791755be28a250a6e2593bc /include | |
parent | a41ceb1c17af06a17c0d88e987215ef20b93c471 (diff) | |
download | op-kernel-dev-930a9e283516a3a3595c0c515113f1b78d07f695.zip op-kernel-dev-930a9e283516a3a3595c0c515113f1b78d07f695.tar.gz |
drm: Use a nondestructive mode for output detect when polling (v2)
v2: Julien Cristau pointed out that @nondestructive results in
double-negatives and confusion when trying to interpret the parameter,
so use @force instead. Much easier to type as well. ;-)
And fix the miscompilation of vmgfx reported by Sedat Dilek.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/drm_crtc.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 5536223..3e5a51a 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -386,8 +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); + + /* 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 nondestructive); + 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); |