[PATCH 01/11] drm/radeon: UVD doesn't needs VM on SI v2
v2: update error message and comment
Signed-off-by: Christian K?nig
---
drivers/gpu/drm/radeon/radeon_cs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
b/drivers/gpu/drm/radeon/radeon_cs.c
index 70d3824..a3dd04d 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -241,15 +241,15 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p,
void *data)
return -EINVAL;
}
- /* we only support VM on SI+ */
- if ((p->rdev->family >= CHIP_TAHITI) &&
- ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
- DRM_ERROR("VM required on SI+!\n");
+ if (radeon_cs_get_ring(p, ring, priority))
return -EINVAL;
- }
- if (radeon_cs_get_ring(p, ring, priority))
+ /* we only support VM on some SI+ rings */
+ if ((p->rdev->asic->ring[p->ring].cs_parse == NULL) &&
+ ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
+ DRM_ERROR("Ring %d requires VM!\n", p->ring);
return -EINVAL;
+ }
}
/* deal with non-vm */
--
1.7.9.5
[PATCH 01/11] drm/radeon: UVD doesn't needs VM on SI v2
v2: update error message and comment
Signed-off-by: Christian K?nig
---
drivers/gpu/drm/radeon/radeon_cs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
b/drivers/gpu/drm/radeon/radeon_cs.c
index 70d3824..a3dd04d 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -241,15 +241,15 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p,
void *data)
return -EINVAL;
}
- /* we only support VM on SI+ */
- if ((p->rdev->family >= CHIP_TAHITI) &&
- ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
- DRM_ERROR("VM required on SI+!\n");
+ if (radeon_cs_get_ring(p, ring, priority))
return -EINVAL;
- }
- if (radeon_cs_get_ring(p, ring, priority))
+ /* we only support VM on some SI+ rings */
+ if ((p->rdev->asic->ring[p->ring].cs_parse == NULL) &&
+ ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
+ DRM_ERROR("Ring %d requires VM!\n", p->ring);
return -EINVAL;
+ }
}
/* deal with non-vm */
--
1.7.9.5
[PATCH 01/11] drm/radeon: UVD doesn't needs VM on SI v2
v2: update error message and comment
Signed-off-by: Christian König christian.koe...@amd.com
---
drivers/gpu/drm/radeon/radeon_cs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
b/drivers/gpu/drm/radeon/radeon_cs.c
index 70d3824..a3dd04d 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -241,15 +241,15 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p,
void *data)
return -EINVAL;
}
- /* we only support VM on SI+ */
- if ((p-rdev-family = CHIP_TAHITI)
- ((p-cs_flags RADEON_CS_USE_VM) == 0)) {
- DRM_ERROR(VM required on SI+!\n);
+ if (radeon_cs_get_ring(p, ring, priority))
return -EINVAL;
- }
- if (radeon_cs_get_ring(p, ring, priority))
+ /* we only support VM on some SI+ rings */
+ if ((p-rdev-asic-ring[p-ring].cs_parse == NULL)
+ ((p-cs_flags RADEON_CS_USE_VM) == 0)) {
+ DRM_ERROR(Ring %d requires VM!\n, p-ring);
return -EINVAL;
+ }
}
/* deal with non-vm */
--
1.7.9.5
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH 01/11] drm/radeon: UVD doesn't needs VM on SI v2
v2: update error message and comment
Signed-off-by: Christian König christian.koe...@amd.com
---
drivers/gpu/drm/radeon/radeon_cs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
b/drivers/gpu/drm/radeon/radeon_cs.c
index 70d3824..a3dd04d 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -241,15 +241,15 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p,
void *data)
return -EINVAL;
}
- /* we only support VM on SI+ */
- if ((p-rdev-family = CHIP_TAHITI)
- ((p-cs_flags RADEON_CS_USE_VM) == 0)) {
- DRM_ERROR(VM required on SI+!\n);
+ if (radeon_cs_get_ring(p, ring, priority))
return -EINVAL;
- }
- if (radeon_cs_get_ring(p, ring, priority))
+ /* we only support VM on some SI+ rings */
+ if ((p-rdev-asic-ring[p-ring].cs_parse == NULL)
+ ((p-cs_flags RADEON_CS_USE_VM) == 0)) {
+ DRM_ERROR(Ring %d requires VM!\n, p-ring);
return -EINVAL;
+ }
}
/* deal with non-vm */
--
1.7.9.5
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH 01/11] drm/radeon: UVD doesn't needs VM on SI v2
v2: update error message and comment
Signed-off-by: Christian K?nig
---
drivers/gpu/drm/radeon/radeon_cs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
b/drivers/gpu/drm/radeon/radeon_cs.c
index 70d3824..a3dd04d 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -241,15 +241,15 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p,
void *data)
return -EINVAL;
}
- /* we only support VM on SI+ */
- if ((p->rdev->family >= CHIP_TAHITI) &&
- ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
- DRM_ERROR("VM required on SI+!\n");
+ if (radeon_cs_get_ring(p, ring, priority))
return -EINVAL;
- }
- if (radeon_cs_get_ring(p, ring, priority))
+ /* we only support VM on some SI+ rings */
+ if ((p->rdev->asic->ring[p->ring].cs_parse == NULL) &&
+ ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
+ DRM_ERROR("Ring %d requires VM!\n", p->ring);
return -EINVAL;
+ }
}
/* deal with non-vm */
--
1.7.9.5
[PATCH 01/11] drm/radeon: UVD doesn't needs VM on SI v2
v2: update error message and comment
Signed-off-by: Christian König christian.koe...@amd.com
---
drivers/gpu/drm/radeon/radeon_cs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
b/drivers/gpu/drm/radeon/radeon_cs.c
index 70d3824..a3dd04d 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -241,15 +241,15 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p,
void *data)
return -EINVAL;
}
- /* we only support VM on SI+ */
- if ((p-rdev-family = CHIP_TAHITI)
- ((p-cs_flags RADEON_CS_USE_VM) == 0)) {
- DRM_ERROR(VM required on SI+!\n);
+ if (radeon_cs_get_ring(p, ring, priority))
return -EINVAL;
- }
- if (radeon_cs_get_ring(p, ring, priority))
+ /* we only support VM on some SI+ rings */
+ if ((p-rdev-asic-ring[p-ring].cs_parse == NULL)
+ ((p-cs_flags RADEON_CS_USE_VM) == 0)) {
+ DRM_ERROR(Ring %d requires VM!\n, p-ring);
return -EINVAL;
+ }
}
/* deal with non-vm */
--
1.7.9.5
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
