| Message ID | 1412834583-24757-1-git-send-email-michel@daenzer.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 09.10.2014 um 08:03 schrieb Michel Dänzer: > From: Michel Dänzer <michel.daenzer@amd.com> > > Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > 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->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 = &placement->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;
On Thu, Oct 9, 2014 at 5:56 AM, Christian König <deathsimple@vodafone.de> wrote: > Am 09.10.2014 um 08:03 schrieb Michel Dänzer: >> >> From: Michel Dänzer <michel.daenzer@amd.com> >> >> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> > > > Reviewed-by: Christian König <christian.koenig@amd.com> > > 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->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 = >> &placement->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@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
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->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 = &placement->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;