diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 06:52:14 +0200 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 06:52:14 +0200 |
commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
tree | 89b840115ccd753216ba0b26e587e52699b99310 /drivers/gpu/drm/radeon/radeon_asic.c | |
parent | intel powerclamp: support Knights Landing (diff) | |
parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
download | linux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz linux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.zip |
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index fafd8ce4d58f..8dbf5083c4ff 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -1202,7 +1202,7 @@ static struct radeon_asic rs780_asic = { static struct radeon_asic_ring rv770_uvd_ring = { .ib_execute = &uvd_v1_0_ib_execute, .emit_fence = &uvd_v2_2_fence_emit, - .emit_semaphore = &uvd_v1_0_semaphore_emit, + .emit_semaphore = &uvd_v2_2_semaphore_emit, .cs_parse = &radeon_uvd_cs_parse, .ring_test = &uvd_v1_0_ring_test, .ib_test = &uvd_v1_0_ib_test, |