|
@@ -762,13 +762,14 @@ void r600_hpd_init(struct radeon_device *rdev)
|
|
struct drm_device *dev = rdev->ddev;
|
|
struct drm_device *dev = rdev->ddev;
|
|
struct drm_connector *connector;
|
|
struct drm_connector *connector;
|
|
|
|
|
|
- if (ASIC_IS_DCE3(rdev)) {
|
|
|
|
- u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa);
|
|
|
|
- if (ASIC_IS_DCE32(rdev))
|
|
|
|
- tmp |= DC_HPDx_EN;
|
|
|
|
|
|
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
+ struct radeon_connector *radeon_connector = to_radeon_connector(connector);
|
|
|
|
+
|
|
|
|
+ if (ASIC_IS_DCE3(rdev)) {
|
|
|
|
+ u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa);
|
|
|
|
+ if (ASIC_IS_DCE32(rdev))
|
|
|
|
+ tmp |= DC_HPDx_EN;
|
|
|
|
|
|
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
- struct radeon_connector *radeon_connector = to_radeon_connector(connector);
|
|
|
|
switch (radeon_connector->hpd.hpd) {
|
|
switch (radeon_connector->hpd.hpd) {
|
|
case RADEON_HPD_1:
|
|
case RADEON_HPD_1:
|
|
WREG32(DC_HPD1_CONTROL, tmp);
|
|
WREG32(DC_HPD1_CONTROL, tmp);
|
|
@@ -798,10 +799,7 @@ void r600_hpd_init(struct radeon_device *rdev)
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
- struct radeon_connector *radeon_connector = to_radeon_connector(connector);
|
|
|
|
|
|
+ } else {
|
|
switch (radeon_connector->hpd.hpd) {
|
|
switch (radeon_connector->hpd.hpd) {
|
|
case RADEON_HPD_1:
|
|
case RADEON_HPD_1:
|
|
WREG32(DC_HOT_PLUG_DETECT1_CONTROL, DC_HOT_PLUG_DETECTx_EN);
|
|
WREG32(DC_HOT_PLUG_DETECT1_CONTROL, DC_HOT_PLUG_DETECTx_EN);
|
|
@@ -819,6 +817,7 @@ void r600_hpd_init(struct radeon_device *rdev)
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
|
|
}
|
|
}
|
|
if (rdev->irq.installed)
|
|
if (rdev->irq.installed)
|
|
r600_irq_set(rdev);
|
|
r600_irq_set(rdev);
|