drm: Branch 'master'

[email protected] (Marek Ol????k)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]>
 include/drm/amdgpu_drm.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c7b5aaeb1f77a53a46c091b1ba999a76baa6c3fb
Author: Leo Liu <[email protected]>
Date:   Thu Mar 23 10:43:40 2017 -0400

    amdgpu_drm: add AMDGPU_HW_IP_UVD_ENC
    
    Signed-off-by: Leo Liu <[email protected]>
    Reviewed-by: Alex Deucher <[email protected]>
    Signed-off-by: Marek Olšák <[email protected]>

diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
index 1e25a87d..fa56499f 100644
--- a/include/drm/amdgpu_drm.h
+++ b/include/drm/amdgpu_drm.h
@@ -388,7 +388,8 @@ struct drm_amdgpu_gem_va {
 #define AMDGPU_HW_IP_DMA          2
 #define AMDGPU_HW_IP_UVD          3
 #define AMDGPU_HW_IP_VCE          4
-#define AMDGPU_HW_IP_NUM          5
+#define AMDGPU_HW_IP_UVD_ENC      5
+#define AMDGPU_HW_IP_NUM          6
 
 #define AMDGPU_HW_IP_INSTANCE_MAX_COUNT 1

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.