linux-stable.git/drivers/gpu/drm/amd/amdgpu, branch v4.2.3 Linux kernel stable tree drm/amdgpu: fix typo in dce10 watermark setup 2015-09-21T17:10:42+00:00 Alex Deucher alexander.deucher@amd.com 2015-09-03T14:19:03+00:00 b17595564244237fdc08965b7e2dc2c7e31710a9 commit be9fd2e978939ab3e59ee4164fa0893e70359557 upstream. Using the wrong watermwark value for the secondary watermark. Copy paste typo. Noticed by Mykola. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
commit be9fd2e978939ab3e59ee4164fa0893e70359557 upstream.

Using the wrong watermwark value for the secondary
watermark.  Copy paste typo.  Noticed by Mykola.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drm/amdgpu: fix typo in dce11 watermark setup 2015-09-21T17:10:42+00:00 Alex Deucher alexander.deucher@amd.com 2015-09-03T14:16:23+00:00 5ee5204400b16c30151928b3d6e845717e11d888 commit 99a092383794e07d60644b449a01656da112eb1f upstream. Using the wrong watermwark value for the secondary watermark. Copy paste typo. Noticed by Mykola. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
commit 99a092383794e07d60644b449a01656da112eb1f upstream.

Using the wrong watermwark value for the secondary
watermark.  Copy paste typo.  Noticed by Mykola.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drm/amdgpu: fix IH ring allocation for bus addresses (v2) 2015-09-21T17:10:41+00:00 Alex Deucher alexander.deucher@amd.com 2015-08-25T02:46:13+00:00 0abcb8a6c1ede6322d64f6a46333b38282a00fc4 commit 52293c67f1e7542a6dc61037d83c266e216bef27 upstream. Use pci_alloc_consistent rather than kzalloc since we need 256 byte aligned memory for the ring buffer. v2: fix copy paste typo in free function noticed by Jammy. bug: https://bugs.freedesktop.org/show_bug.cgi?id=91749 Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
commit 52293c67f1e7542a6dc61037d83c266e216bef27 upstream.

Use pci_alloc_consistent rather than kzalloc since we
need 256 byte aligned memory for the ring buffer.

v2: fix copy paste typo in free function noticed
by Jammy.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=91749

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drm/amdgpu: Don't link train DisplayPort on HPD until we get the dpcd 2015-09-21T17:10:41+00:00 Alex Deucher alexander.deucher@amd.com 2015-08-21T22:07:38+00:00 a93dd14f3cefffc46e49e55fc907b7323053cf09 commit a887adadb7b9ef9eb4ee48e4ad575aefcfd1db14 upstream. This is a port of: DRM - radeon: Don't link train DisplayPort on HPD until we get the dpcd to amdgpu. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
commit a887adadb7b9ef9eb4ee48e4ad575aefcfd1db14 upstream.

This is a port of:
DRM - radeon: Don't link train DisplayPort on HPD until we get the dpcd
to amdgpu.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drm/amdgpu: fix one warning message 2015-09-21T17:10:40+00:00 Jammy Zhou Jammy.Zhou@amd.com 2015-08-07T07:30:44+00:00 b2a109867f4d17ceb9e77cf1ffeb7aaa7a26fa4d commit 21df89a5667de5fcd061753d3833e7dfcf5509d3 upstream. In function 'amdgpu_uvd_cs_pass2': warning: 'min_ctx_size' may be used uninitialized in this function buf_sizes[0x4] = min_ctx_size; ^ note: 'min_ctx_size' was declared here unsigned image_size, tmp, min_dpb_size, num_dpb_buffer, min_ctx_size; ^ Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
commit 21df89a5667de5fcd061753d3833e7dfcf5509d3 upstream.

In function 'amdgpu_uvd_cs_pass2':
warning: 'min_ctx_size' may be used uninitialized in this function
  buf_sizes[0x4] = min_ctx_size;
                 ^
note: 'min_ctx_size' was declared here
  unsigned image_size, tmp, min_dpb_size, num_dpb_buffer, min_ctx_size;
                                                          ^
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drm/amdgpu/atom: Send out the full AUX address 2015-09-21T17:10:40+00:00 Alex Deucher alexander.deucher@amd.com 2015-08-31T15:08:44+00:00 b11b8de427d0fa915f8f0421fa91bd75402775bd commit e39daf2c63518a8ce92e3ad5caa04097524b3585 upstream. AUX addresses are 20 bits long. Send out the entire address instead of just the low 16 bits. Port of: drm/radeon/atom: Send out the full AUX address to amdgpu Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
commit e39daf2c63518a8ce92e3ad5caa04097524b3585 upstream.

AUX addresses are 20 bits long. Send out the entire address instead of
just the low 16 bits.

Port of:
drm/radeon/atom: Send out the full AUX address
to amdgpu

Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "drm/amdgpu: Configure doorbell to maximum slots" 2015-08-12T16:24:04+00:00 Alex Deucher alexander.deucher@amd.com 2015-08-10T15:08:31+00:00 b8826b0cbf47ecfc9fdefdbf8c7bbb308e117005 This reverts commit 78ad5cdd21f0d614983fc397338944e797ec70b9. This commit breaks dpm and suspend/resume on CZ. 
This reverts commit 78ad5cdd21f0d614983fc397338944e797ec70b9.
This commit breaks dpm and suspend/resume on CZ.
drm/amdgpu: add context buffer size check for HEVC 2015-08-12T16:24:03+00:00 Boyuan Zhang boyuan.zhang@amd.com 2015-08-05T18:03:48+00:00 8c8bac59dda0c41c7dd289d443ac42b7b72d31b0 Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> 
Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
drm/amdgpu: set fw_version and feature_version for smu fw loading 2015-08-05T18:26:50+00:00 Jammy Zhou Jammy.Zhou@amd.com 2015-08-04T03:44:19+00:00 595fd013f795daeed0c7ddda02d8e0c51d8ce76c The fw_version and feature_verion should be set correctly when the firmwares are loaded by SMU on Tonga/Carrzio/Iceland Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> 
The fw_version and feature_verion should be set correctly when the
firmwares are loaded by SMU on Tonga/Carrzio/Iceland

Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
drm/amdgpu: add feature version for SDMA ucode 2015-08-05T18:26:50+00:00 Jammy Zhou Jammy.Zhou@amd.com 2015-08-04T02:50:47+00:00 cfa2104fbcb87ab0abbdaba608087df1e24fe195 Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> 
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>