From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue, 8 Mar 2016 10:55:19 +0000 (+0000)
Subject: gallium/radeon: use explicit drm_major, drm_minor check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3dc2630e457155a4e8c8613911fe178bc4adf743;p=mesa.git

gallium/radeon: use explicit drm_major, drm_minor check

Just like everywhere else in the radeon codebase.

v2: Don't forget about drm_major == 3 (Alex)

Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
index 41603b32403..087d9422c04 100644
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -404,7 +404,8 @@ struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context,
 
 	if (rscreen->info.drm_major == 3)
 		enc->use_vm = true;
-	if ((rscreen->info.drm_major > 2) || (rscreen->info.drm_minor >= 42))
+	if ((rscreen->info.drm_major == 2 && rscreen->info.drm_minor >= 42) ||
+            rscreen->info.drm_major == 3)
 		enc->use_vui = true;
 	if (rscreen->info.family >= CHIP_TONGA &&
              rscreen->info.family != CHIP_STONEY)