Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64912e99 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: set HPD polarity in hpd_init() 



Polarity needs to be set accordingly to connector status (connected
or disconnected). Set it up in hpd_init() so first hotplug works
reliably no matter what is the initial set of connector. hpd_init()
also covers resume so HPD will work correctly after resume as well.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: Jerome Glisse <j.glisse@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a18cee15

drivers/gpu/drm/radeon/evergreen.c

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ void evergreen_hpd_init(struct radeon_device *rdev) 
		default:

			break;

		}

		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);

	}

	if (rdev->irq.installed)

		evergreen_irq_set(rdev);

drivers/gpu/drm/radeon/r100.c

+1 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ void r100_hpd_init(struct radeon_device *rdev) 
		default:

			break;

		}

		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);

	}

	if (rdev->irq.installed)

		r100_irq_set(rdev);

drivers/gpu/drm/radeon/r600.c

+9 −10
Original line number Diff line number Diff line
@@ -762,13 +762,14 @@ void r600_hpd_init(struct radeon_device *rdev) 
	struct drm_device *dev = rdev->ddev;

	struct drm_connector *connector;



	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) {

			case RADEON_HPD_1:

				WREG32(DC_HPD1_CONTROL, tmp);
@@ -798,10 +799,7 @@ void r600_hpd_init(struct radeon_device *rdev) 
			default:

				break;

			}

		}

		} else {

		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) {

			case RADEON_HPD_1:

				WREG32(DC_HOT_PLUG_DETECT1_CONTROL, DC_HOT_PLUG_DETECTx_EN);
@@ -819,6 +817,7 @@ void r600_hpd_init(struct radeon_device *rdev) 
				break;

			}

		}

		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);

	}

	if (rdev->irq.installed)

		r600_irq_set(rdev);

drivers/gpu/drm/radeon/radeon_connectors.c

+0 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,6 @@ radeon_add_atom_connector(struct drm_device *dev, 
			connector->polled = DRM_CONNECTOR_POLL_CONNECT;

	} else

		connector->polled = DRM_CONNECTOR_POLL_HPD;

	radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);



	connector->display_info.subpixel_order = subpixel_order;

	drm_sysfs_connector_add(connector);

drivers/gpu/drm/radeon/rs600.c

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ void rs600_hpd_init(struct radeon_device *rdev) 
		default:

			break;

		}

		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);

	}

	if (rdev->irq.installed)

		rs600_irq_set(rdev);