diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-29 00:31:47 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-31 19:12:17 -0500 |
| commit | 97b94ccb9aa1b82ed7a9a045d0ae5b32c99b84a0 (patch) | |
| tree | 0b2a40ecd440ec9ed36b7ca282fab514cb2358cb /drivers/gpu/drm/radeon/atombios_dp.c | |
| parent | 7087e16286913b41ba9a5186360645b57b8508dd (diff) | |
drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.
This makes displayport work again here.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_dp.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_dp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 3eb0ca5b3d73..9c023d25aad0 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
| @@ -468,7 +468,7 @@ void radeon_dp_set_link_config(struct drm_connector *connector, | |||
| 468 | struct radeon_connector *radeon_connector; | 468 | struct radeon_connector *radeon_connector; |
| 469 | struct radeon_connector_atom_dig *dig_connector; | 469 | struct radeon_connector_atom_dig *dig_connector; |
| 470 | 470 | ||
| 471 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) || | 471 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) && |
| 472 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) | 472 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) |
| 473 | return; | 473 | return; |
| 474 | 474 | ||
| @@ -583,7 +583,7 @@ void dp_link_train(struct drm_encoder *encoder, | |||
| 583 | u8 train_set[4]; | 583 | u8 train_set[4]; |
| 584 | int i; | 584 | int i; |
| 585 | 585 | ||
| 586 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) || | 586 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) && |
| 587 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) | 587 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) |
| 588 | return; | 588 | return; |
| 589 | 589 | ||