diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-21 12:19:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-21 12:19:19 +1000 |
| commit | a0fc608178a9b38a5f782331909fcc208b742a7b (patch) | |
| tree | 1ad7ebdd09ebf9ca8be6edcca2e6541c6a744d1c | |
| parent | 92ff59a696f9917265efa8d369b92e6c9a9a1904 (diff) | |
| parent | 28731d5818ae25b92d1fb82fe0ac196e97102c1b (diff) | |
| download | linux-a0fc608178a9b38a5f782331909fcc208b742a7b.tar.bz2 | |
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)
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_dpm.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c index f6309bd23e01..b5c73df8e202 100644 --- a/drivers/gpu/drm/radeon/r600_dpm.c +++ b/drivers/gpu/drm/radeon/r600_dpm.c @@ -1256,7 +1256,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) (mode_info->atom_context->bios + data_offset + le16_to_cpu(ext_hdr->usPowerTuneTableOffset)); rdev->pm.dpm.dyn_state.cac_tdp_table->maximum_power_delivery_limit = - ppt->usMaximumPowerDeliveryLimit; + le16_to_cpu(ppt->usMaximumPowerDeliveryLimit); pt = &ppt->power_tune_table; } else { ATOM_PPLIB_POWERTUNE_Table *ppt = (ATOM_PPLIB_POWERTUNE_Table *) diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 9a19e52cc655..6b670b0bc47b 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -179,6 +179,9 @@ static void radeon_encoder_add_backlight(struct radeon_encoder *radeon_encoder, (rdev->pdev->subsystem_vendor == 0x1734) && (rdev->pdev->subsystem_device == 0x1107)) use_bl = false; + /* disable native backlight control on older asics */ + else if (rdev->family < CHIP_R600) + use_bl = false; else use_bl = true; } |