lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Alex Deucher
2009-10-28 00:51:20 -04:00
committed by Dave Airlie
parent a2d49ae7df
commit d11aa88b33
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/drm/radeon/atombios_crtc.c
View File

@@ -368,14 +368,17 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable)
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
if (encoder->crtc == crtc) { if (encoder->crtc == crtc) {
radeon_encoder = to_radeon_encoder(encoder); radeon_encoder = to_radeon_encoder(encoder);
dig = radeon_encoder->enc_priv;
/* only enable spread spectrum on LVDS */ /* only enable spread spectrum on LVDS */
if (dig && dig->ss) { if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
percentage = dig->ss->percentage; dig = radeon_encoder->enc_priv;
type = dig->ss->type; if (dig && dig->ss) {
step = dig->ss->step; percentage = dig->ss->percentage;
delay = dig->ss->delay; type = dig->ss->type;
range = dig->ss->range; step = dig->ss->step;
delay = dig->ss->delay;
range = dig->ss->range;
} else if (enable)
return;
} else if (enable) } else if (enable)
return; return;
break; break;
@@ -387,7 +390,7 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable)
if (ASIC_IS_AVIVO(rdev)) { if (ASIC_IS_AVIVO(rdev)) {
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.usSpreadSpectrumPercentage = percentage; args.usSpreadSpectrumPercentage = cpu_to_le16(percentage);
args.ucSpreadSpectrumType = type; args.ucSpreadSpectrumType = type;
args.ucSpreadSpectrumStep = step; args.ucSpreadSpectrumStep = step;
args.ucSpreadSpectrumDelay = delay; 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); atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
} else { } else {
memset(&legacy_args, 0, sizeof(legacy_args)); memset(&legacy_args, 0, sizeof(legacy_args));
legacy_args.usSpreadSpectrumPercentage = percentage; legacy_args.usSpreadSpectrumPercentage = cpu_to_le16(percentage);
legacy_args.ucSpreadSpectrumType = type; legacy_args.ucSpreadSpectrumType = type;
legacy_args.ucSpreadSpectrumStepSize_Delay = (step & 3) << 2; legacy_args.ucSpreadSpectrumStepSize_Delay = (step & 3) << 2;
legacy_args.ucSpreadSpectrumStepSize_Delay |= (delay & 7) << 4; legacy_args.ucSpreadSpectrumStepSize_Delay |= (delay & 7) << 4;