[PATCH] drm/ttm: Don't skip fpfn check if lpfn is 0 in ttm_bo_mem_compat

[Alex Deucher]

On Thu, Oct 9, 2014 at 5:56 AM, Christian K?nig  
wrote:
> Am 09.10.2014 um 08:03 schrieb Michel D?nzer:
>>
>> From: Michel D?nzer 
>>
>> Signed-off-by: Michel D?nzer 
>
>
> Reviewed-by: Christian K?nig 
>
>

Thomas, do you want to pull this through the ttm tree or can I take it
through radeon?

Alex

>> ---
>>   drivers/gpu/drm/ttm/ttm_bo.c | 8 
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>> index 407fa2d..d395b0b 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -1008,9 +1008,9 @@ static bool ttm_bo_mem_compat(struct ttm_placement
>> *placement,
>> for (i = 0; i < placement->num_placement; i++) {
>> const struct ttm_place *heap = >placement[i];
>> -   if (mem->mm_node && heap->lpfn != 0 &&
>> +   if (mem->mm_node &&
>> (mem->start < heap->fpfn ||
>> -mem->start + mem->num_pages > heap->lpfn))
>> +(heap->lpfn != 0 && (mem->start + mem->num_pages) >
>> heap->lpfn)))
>> continue;
>> *new_flags = heap->flags;
>> @@ -1021,9 +1021,9 @@ static bool ttm_bo_mem_compat(struct ttm_placement
>> *placement,
>> for (i = 0; i < placement->num_busy_placement; i++) {
>> const struct ttm_place *heap =
>> >busy_placement[i];
>> -   if (mem->mm_node && heap->lpfn != 0 &&
>> +   if (mem->mm_node &&
>> (mem->start < heap->fpfn ||
>> -mem->start + mem->num_pages > heap->lpfn))
>> +(heap->lpfn != 0 && (mem->start + mem->num_pages) >
>> heap->lpfn)))
>> continue;
>> *new_flags = heap->flags;
>
>
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm/ttm: Don't skip fpfn check if lpfn is 0 in ttm_bo_mem_compat

[Michel Dänzer]

From: Michel D?nzer 

Signed-off-by: Michel D?nzer 
---
 drivers/gpu/drm/ttm/ttm_bo.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 407fa2d..d395b0b 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1008,9 +1008,9 @@ static bool ttm_bo_mem_compat(struct ttm_placement 
*placement,

for (i = 0; i < placement->num_placement; i++) {
const struct ttm_place *heap = >placement[i];
-   if (mem->mm_node && heap->lpfn != 0 &&
+   if (mem->mm_node &&
(mem->start < heap->fpfn ||
-mem->start + mem->num_pages > heap->lpfn))
+(heap->lpfn != 0 && (mem->start + mem->num_pages) > 
heap->lpfn)))
continue;

*new_flags = heap->flags;
@@ -1021,9 +1021,9 @@ static bool ttm_bo_mem_compat(struct ttm_placement 
*placement,

for (i = 0; i < placement->num_busy_placement; i++) {
const struct ttm_place *heap = >busy_placement[i];
-   if (mem->mm_node && heap->lpfn != 0 &&
+   if (mem->mm_node &&
(mem->start < heap->fpfn ||
-mem->start + mem->num_pages > heap->lpfn))
+(heap->lpfn != 0 && (mem->start + mem->num_pages) > 
heap->lpfn)))
continue;

*new_flags = heap->flags;
-- 
2.1.1

[PATCH] drm/ttm: Don't skip fpfn check if lpfn is 0 in ttm_bo_mem_compat

[Christian König]

Am 09.10.2014 um 08:03 schrieb Michel D?nzer:
> From: Michel D?nzer 
>
> Signed-off-by: Michel D?nzer 

Reviewed-by: Christian K?nig 

> ---
>   drivers/gpu/drm/ttm/ttm_bo.c | 8 
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 407fa2d..d395b0b 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1008,9 +1008,9 @@ static bool ttm_bo_mem_compat(struct ttm_placement 
> *placement,
>   
>   for (i = 0; i < placement->num_placement; i++) {
>   const struct ttm_place *heap = >placement[i];
> - if (mem->mm_node && heap->lpfn != 0 &&
> + if (mem->mm_node &&
>   (mem->start < heap->fpfn ||
> -  mem->start + mem->num_pages > heap->lpfn))
> +  (heap->lpfn != 0 && (mem->start + mem->num_pages) > 
> heap->lpfn)))
>   continue;
>   
>   *new_flags = heap->flags;
> @@ -1021,9 +1021,9 @@ static bool ttm_bo_mem_compat(struct ttm_placement 
> *placement,
>   
>   for (i = 0; i < placement->num_busy_placement; i++) {
>   const struct ttm_place *heap = >busy_placement[i];
> - if (mem->mm_node && heap->lpfn != 0 &&
> + if (mem->mm_node &&
>   (mem->start < heap->fpfn ||
> -  mem->start + mem->num_pages > heap->lpfn))
> +  (heap->lpfn != 0 && (mem->start + mem->num_pages) > 
> heap->lpfn)))
>   continue;
>   
>   *new_flags = heap->flags;