Commit a0fc608178a9b38a5f782331909fcc208b742a7b
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
fix one regression and one endian issue. * 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: fix endian swapping in vbios fetch for tdp table drm/radeon: disable native backlight control on pre-r6xx asics (v2)
Showing 2 changed files Side-by-side Diff
drivers/gpu/drm/radeon/r600_dpm.c
| ... | ... | @@ -1256,7 +1256,7 @@ |
| 1256 | 1256 | (mode_info->atom_context->bios + data_offset + |
| 1257 | 1257 | le16_to_cpu(ext_hdr->usPowerTuneTableOffset)); |
| 1258 | 1258 | rdev->pm.dpm.dyn_state.cac_tdp_table->maximum_power_delivery_limit = |
| 1259 | - ppt->usMaximumPowerDeliveryLimit; | |
| 1259 | + le16_to_cpu(ppt->usMaximumPowerDeliveryLimit); | |
| 1260 | 1260 | pt = &ppt->power_tune_table; |
| 1261 | 1261 | } else { |
| 1262 | 1262 | ATOM_PPLIB_POWERTUNE_Table *ppt = (ATOM_PPLIB_POWERTUNE_Table *) |
drivers/gpu/drm/radeon/radeon_encoders.c
| ... | ... | @@ -179,6 +179,9 @@ |
| 179 | 179 | (rdev->pdev->subsystem_vendor == 0x1734) && |
| 180 | 180 | (rdev->pdev->subsystem_device == 0x1107)) |
| 181 | 181 | use_bl = false; |
| 182 | + /* disable native backlight control on older asics */ | |
| 183 | + else if (rdev->family < CHIP_R600) | |
| 184 | + use_bl = false; | |
| 182 | 185 | else |
| 183 | 186 | use_bl = true; |
| 184 | 187 | } |