lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 118/138] drm: Apply range restriction after color adjustment when allocation
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chris Wilson <chris@chris-wilson.co.uk>


    [ Upstream commit 3db93756b501e5f0a3951c79cfa9ed43c26d3455 ]

    mm->color_adjust() compares the hole with its neighbouring nodes. They
    only abutt before we restrict the hole, so we have to apply color_adjust
    before we apply the range restriction.

    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Link: http://patchwork.freedesktop.org/patch/msgid/20161222083641.2691-36-chris@chris-wilson.co.uk
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/drm_mm.c | 16 ++++++----------
    1 file changed, 6 insertions(+), 10 deletions(-)

    --- a/drivers/gpu/drm/drm_mm.c
    +++ b/drivers/gpu/drm/drm_mm.c
    @@ -348,14 +348,12 @@ static void drm_mm_insert_helper_range(s

    BUG_ON(!hole_node->hole_follows || node->allocated);

    - if (adj_start < start)
    - adj_start = start;
    - if (adj_end > end)
    - adj_end = end;
    -
    if (mm->color_adjust)
    mm->color_adjust(hole_node, color, &adj_start, &adj_end);

    + adj_start = max(adj_start, start);
    + adj_end = min(adj_end, end);
    +
    if (flags & DRM_MM_CREATE_TOP)
    adj_start = adj_end - size;

    @@ -566,17 +564,15 @@ static struct drm_mm_node *drm_mm_search
    flags & DRM_MM_SEARCH_BELOW) {
    u64 hole_size = adj_end - adj_start;

    - if (adj_start < start)
    - adj_start = start;
    - if (adj_end > end)
    - adj_end = end;
    -
    if (mm->color_adjust) {
    mm->color_adjust(entry, color, &adj_start, &adj_end);
    if (adj_end <= adj_start)
    continue;
    }

    + adj_start = max(adj_start, start);
    + adj_end = min(adj_end, end);
    +
    if (!check_free_hole(adj_start, adj_end, size, alignment))
    continue;


    \
     
     \ /
      Last update: 2017-11-28 12:47    [W:6.101 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site