[RFC 0/7] UVD support for SI in amdgpu

Piotr Redlewski predlewski at gmail.com
Wed Nov 8 22:38:32 UTC 2017


Following series implements UVD support for SI in amdgpu driver. Code is based
on CIK's UVD support in amdgpu and SI's UVD support in radeon drivers. To work,
it requires tahiti uvd firmware with added header - I've created simple script
to produce exactly this, so if anyone is interested it can be found here:

Code is based on amd-staging-drm-next branch in Alex's tree. After applying
these patches, uvd boots up and seems to work ok. I've tested it with vdpauinfo
and mpv.

Some comments/issues for the patches:
1. To make uvd work, I had to bring back fb location programming. Using location
programmed by vbios, vram location is not available for uvd mc (at least on my
machine) due to too wide address. Starting address is 40-bit long for fb, but
uvd mc supports only 32-bits (judging by comments in amdgpu code and actual code
in radeon driver)
2. I don't know why, but I couldn't get the uvd to boot without setting uvd mc
offsets before starting other engines. Because of that I set it in .sw_init
function. In my opinion this should be fixed as it generally doesn't follow
amdgpu driver architecture (hardware setup during software setup stage) and
probably will break suspending and resume (I didn't test it). As I mentioned,
I couldn't figure out why this is happening, so I count on help with finding fix
for this.
3. I found some redefinitions in include/asic_reg/uvd/uvd_4_0_sh_mask.h. I guess
this file is generated, so fix should be made wherever it is generated from. For
now I removed offending lines just to silence the compiler warnings.
4. I'm not sure whether I choose the right version for the uvd. Existing code in
si.c suggested that it should be 3.1, however I went with the 4.0, because for
this version there are available new style headers.


Piotr Redlewski (7):
  drm/amdgpu: remove duplicated definitions of some of the SI registers
  drm/amdgpu/uvd4: fix some register's mask and shift definitions
  drm/amdgpu/gmc6: don't use vram location programmed by the vbios
  drm/amdgpu/uvd4: add early init stage functions for uvd 4.0
  drm/amdgpu/uvd4: add sw init and fini stages' functions for uvd 4.0
  drm/amdgpu/uvd4: add hardware specific functions for uvd 4.0
  drm/amdgpu: enable UVD for SI

 drivers/gpu/drm/amd/amdgpu/Makefile                |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |   6 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |  14 +
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              | 114 ++-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.h              |   5 +
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c              |   7 -
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c              |  40 +-
 drivers/gpu/drm/amd/amdgpu/si.c                    | 256 ++++++-
 drivers/gpu/drm/amd/amdgpu/si_ih.c                 |   3 +
 drivers/gpu/drm/amd/amdgpu/sid.h                   |  52 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v4_0.c              | 810 +++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/uvd_v4_0.h              |  29 +
 .../drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h |   2 -
 13 files changed, 1273 insertions(+), 68 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v4_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v4_0.h


More information about the amd-gfx mailing list