aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-14 06:07:23 -0400
committerDave Airlie <airlied@redhat.com>2010-09-14 06:38:48 -0400
commit930a9e283516a3a3595c0c515113f1b78d07f695 (patch)
treeb527736ae76d678f8791755be28a250a6e2593bc /drivers/gpu/drm/radeon
parenta41ceb1c17af06a17c0d88e987215ef20b93c471 (diff)
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 'drivers/gpu/drm/radeon')
-rw-r--r--drivers/gpu/drm/radeon/radeon_connectors.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 31d309a8e75b..ecc1a8fafbfd 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -482,8 +482,7 @@ static int radeon_lvds_mode_valid(struct drm_connector *connector,
482} 482}
483 483
484static enum drm_connector_status 484static enum drm_connector_status
485radeon_lvds_detect(struct drm_connector *connector, 485radeon_lvds_detect(struct drm_connector *connector, bool force)
486 bool nondestructive)
487{ 486{
488 struct radeon_connector *radeon_connector = to_radeon_connector(connector); 487 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
489 struct drm_encoder *encoder = radeon_best_single_encoder(connector); 488 struct drm_encoder *encoder = radeon_best_single_encoder(connector);
@@ -597,8 +596,7 @@ static int radeon_vga_mode_valid(struct drm_connector *connector,
597} 596}
598 597
599static enum drm_connector_status 598static enum drm_connector_status
600radeon_vga_detect(struct drm_connector *connector, 599radeon_vga_detect(struct drm_connector *connector, bool force)
601 bool nondestructive)
602{ 600{
603 struct radeon_connector *radeon_connector = to_radeon_connector(connector); 601 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
604 struct drm_encoder *encoder; 602 struct drm_encoder *encoder;
@@ -696,8 +694,7 @@ static int radeon_tv_mode_valid(struct drm_connector *connector,
696} 694}
697 695
698static enum drm_connector_status 696static enum drm_connector_status
699radeon_tv_detect(struct drm_connector *connector, 697radeon_tv_detect(struct drm_connector *connector, bool force)
700 bool nondestructive)
701{ 698{
702 struct drm_encoder *encoder; 699 struct drm_encoder *encoder;
703 struct drm_encoder_helper_funcs *encoder_funcs; 700 struct drm_encoder_helper_funcs *encoder_funcs;
@@ -755,8 +752,7 @@ static int radeon_dvi_get_modes(struct drm_connector *connector)
755 * if its shared we have to set the other connector to disconnected. 752 * if its shared we have to set the other connector to disconnected.
756 */ 753 */
757static enum drm_connector_status 754static enum drm_connector_status
758radeon_dvi_detect(struct drm_connector *connector, 755radeon_dvi_detect(struct drm_connector *connector, bool force)
759 bool nondestructive)
760{ 756{
761 struct radeon_connector *radeon_connector = to_radeon_connector(connector); 757 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
762 struct drm_encoder *encoder = NULL; 758 struct drm_encoder *encoder = NULL;
@@ -981,8 +977,7 @@ static int radeon_dp_get_modes(struct drm_connector *connector)
981} 977}
982 978
983static enum drm_connector_status 979static enum drm_connector_status
984radeon_dp_detect(struct drm_connector *connector, 980radeon_dp_detect(struct drm_connector *connector, bool force)
985 bool nondestructive)
986{ 981{
987 struct radeon_connector *radeon_connector = to_radeon_connector(connector); 982 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
988 enum drm_connector_status ret = connector_status_disconnected; 983 enum drm_connector_status ret = connector_status_disconnected;