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

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

drm/radeon/kms/atom: fix potential oops in spread spectrum code 



Make sure we have an LVDS encoder before casting enc_priv.

[airlied: also fix two missing cpu_to_le16 casts we noticed on irc]

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

drivers/gpu/drm/radeon/atombios_crtc.c

+12 −9
Original line number Diff line number Diff line
@@ -368,8 +368,9 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable) 
	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		if (encoder->crtc == crtc) {

			radeon_encoder = to_radeon_encoder(encoder);

			dig = radeon_encoder->enc_priv;

			/* only enable spread spectrum on LVDS */

			if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

				dig = radeon_encoder->enc_priv;

				if (dig && dig->ss) {

					percentage = dig->ss->percentage;

					type = dig->ss->type;
@@ -378,6 +379,8 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable) 
					range = dig->ss->range;

				} else if (enable)

					return;

			} else if (enable)

				return;

			break;

		}

	}
@@ -387,7 +390,7 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable) 


	if (ASIC_IS_AVIVO(rdev)) {

		memset(&args, 0, sizeof(args));

		args.usSpreadSpectrumPercentage = percentage;

		args.usSpreadSpectrumPercentage = cpu_to_le16(percentage);

		args.ucSpreadSpectrumType = type;

		args.ucSpreadSpectrumStep = step;

		args.ucSpreadSpectrumDelay = delay;
@@ -397,7 +400,7 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable) 
		atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);

	} else {

		memset(&legacy_args, 0, sizeof(legacy_args));

		legacy_args.usSpreadSpectrumPercentage = percentage;

		legacy_args.usSpreadSpectrumPercentage = cpu_to_le16(percentage);

		legacy_args.ucSpreadSpectrumType = type;

		legacy_args.ucSpreadSpectrumStepSize_Delay = (step & 3) << 2;

		legacy_args.ucSpreadSpectrumStepSize_Delay |= (delay & 7) << 4;