lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 390/542] drm/amd/display: fixup DML dependencies
    Date
    From: Jun Lei <Jun.Lei@amd.com>

    [ Upstream commit 34ad0230062c39cdcba564d16d122c0fb467a7d6 ]

    [why]
    Need to fix DML portability issues to enable SW unit testing around DML

    [how]
    Move calcs into dc include folder since multiple components reference it
    Remove relative paths to external dependencies

    Signed-off-by: Jun Lei <Jun.Lei@amd.com>
    Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
    Acked-by: Harry Wentland <harry.wentland@amd.com>
    Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c | 2 +-
    drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 2 +-
    drivers/gpu/drm/amd/display/dc/{calcs => inc}/dcn_calc_math.h | 0
    3 files changed, 2 insertions(+), 2 deletions(-)
    rename drivers/gpu/drm/amd/display/dc/{calcs => inc}/dcn_calc_math.h (100%)

    diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
    index b953b02a15121..723af0b2dda04 100644
    --- a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
    +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
    @@ -24,7 +24,7 @@
    */

    #include "dml_common_defs.h"
    -#include "../calcs/dcn_calc_math.h"
    +#include "dcn_calc_math.h"

    #include "dml_inline_defs.h"

    diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
    index eca140da13d82..ded71ea82413d 100644
    --- a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
    +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
    @@ -27,7 +27,7 @@
    #define __DML_INLINE_DEFS_H__

    #include "dml_common_defs.h"
    -#include "../calcs/dcn_calc_math.h"
    +#include "dcn_calc_math.h"
    #include "dml_logger.h"

    static inline double dml_min(double a, double b)
    diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calc_math.h b/drivers/gpu/drm/amd/display/dc/inc/dcn_calc_math.h
    similarity index 100%
    rename from drivers/gpu/drm/amd/display/dc/calcs/dcn_calc_math.h
    rename to drivers/gpu/drm/amd/display/dc/inc/dcn_calc_math.h
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:58    [W:3.295 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site