diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-29 06:31:47 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-01 01:12:17 +0100 |
| commit | 97b94ccb9aa1b82ed7a9a045d0ae5b32c99b84a0 (patch) | |
| tree | 0b2a40ecd440ec9ed36b7ca282fab514cb2358cb /drivers/gpu | |
| parent | drm/radeon/kms: preface warning printk with driver name (diff) | |
| download | linux-97b94ccb9aa1b82ed7a9a045d0ae5b32c99b84a0.tar.xz linux-97b94ccb9aa1b82ed7a9a045d0ae5b32c99b84a0.zip | |
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')
| -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, struct radeon_connector *radeon_connector; struct radeon_connector_atom_dig *dig_connector; - if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) || + if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) && (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) return; @@ -583,7 +583,7 @@ void dp_link_train(struct drm_encoder *encoder, u8 train_set[4]; int i; - if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) || + if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) && (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) return; |