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

Commit 5898b1f3 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup 



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d8fe2fa9

drivers/gpu/drm/radeon/r600.c

+7 −7
Original line number Diff line number Diff line
@@ -2396,19 +2396,19 @@ static void r600_disable_interrupt_state(struct radeon_device *rdev) 
		WREG32(DC_HPD4_INT_CONTROL, tmp);

		if (ASIC_IS_DCE32(rdev)) {

			tmp = RREG32(DC_HPD5_INT_CONTROL) & DC_HPDx_INT_POLARITY;

			WREG32(DC_HPD5_INT_CONTROL, 0);

			WREG32(DC_HPD5_INT_CONTROL, tmp);

			tmp = RREG32(DC_HPD6_INT_CONTROL) & DC_HPDx_INT_POLARITY;

			WREG32(DC_HPD6_INT_CONTROL, 0);

			WREG32(DC_HPD6_INT_CONTROL, tmp);

		}

	} else {

		WREG32(DACA_AUTODETECT_INT_CONTROL, 0);

		WREG32(DACB_AUTODETECT_INT_CONTROL, 0);

		tmp = RREG32(DC_HOT_PLUG_DETECT1_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY;

		WREG32(DC_HOT_PLUG_DETECT1_INT_CONTROL, 0);

		WREG32(DC_HOT_PLUG_DETECT1_INT_CONTROL, tmp);

		tmp = RREG32(DC_HOT_PLUG_DETECT2_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY;

		WREG32(DC_HOT_PLUG_DETECT2_INT_CONTROL, 0);

		WREG32(DC_HOT_PLUG_DETECT2_INT_CONTROL, tmp);

		tmp = RREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY;

		WREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL, 0);

		WREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL, tmp);

	}

}
@@ -2834,14 +2834,14 @@ int r600_irq_process(struct radeon_device *rdev) 
				break;

			case 10:

				if (disp_int_cont2 & DC_HPD5_INTERRUPT) {

					disp_int_cont &= ~DC_HPD5_INTERRUPT;

					disp_int_cont2 &= ~DC_HPD5_INTERRUPT;

					queue_hotplug = true;

					DRM_DEBUG("IH: HPD5\n");

				}

				break;

			case 12:

				if (disp_int_cont2 & DC_HPD6_INTERRUPT) {

					disp_int_cont &= ~DC_HPD6_INTERRUPT;

					disp_int_cont2 &= ~DC_HPD6_INTERRUPT;

					queue_hotplug = true;

					DRM_DEBUG("IH: HPD6\n");

				}