diff options
| author |   jsg <jsg@openbsd.org> | 2020-06-26 05:56:39 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-06-26 05:56:39 +0000 |
| commit | f79729095468ef5d2ec2d3b2ba056d39f21dab63 (patch) | |
| tree | ab9de1c9d714bc8e744136cb46093cfa004db70d | |
| parent | drm/i915/gt: Move gen4 GT workarounds from init_clock_gating to workarounds (diff) | |
| download | wireguard-openbsd-f79729095468ef5d2ec2d3b2ba056d39f21dab63.tar.xz wireguard-openbsd-f79729095468ef5d2ec2d3b2ba056d39f21dab63.zip | |
Revert "drm/amd/display: disable dcn20 abm feature for bring up"
From Harry Wentland
6674508ba1a2ea6caca5de2bcb25bc00a050fd0a in linux 5.7.y/5.7.6
14ed1c908a7a623cc0cbf0203f8201d1b7d31d16 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 35d9eb671f8..5689fcc8bc8 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1336,7 +1336,7 @@ static int dm_late_init(void *handle) unsigned int linear_lut[16]; int i; struct dmcu *dmcu = adev->dm.dc->res_pool->dmcu; - bool ret = false; + bool ret; for (i = 0; i < 16; i++) linear_lut[i] = 0xFFFF * i / 15; @@ -1352,13 +1352,10 @@ static int dm_late_init(void *handle) */ params.min_abm_backlight = 0x28F; - /* todo will enable for navi10 */ - if (adev->asic_type <= CHIP_RAVEN) { - ret = dmcu_load_iram(dmcu, params); + ret = dmcu_load_iram(dmcu, params); - if (!ret) - return -EINVAL; - } + if (!ret) + return -EINVAL; return detect_mst_link_for_all_connectors(adev->ddev); } |