Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b93eb47 authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher
Browse files

drm/amd/display: move clk_mgr files to right place 



[Why]
Better organization

[How]
Move clk_mgr files under dc/clk_mgr

Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarYongqiang Sun <yongqiang.sun@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 70d9e8cb

drivers/gpu/drm/amd/display/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ AMDDALPATH = $(RELATIVE_AMD_DISPLAY_PATH) 


subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/inc/

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/inc/hw

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/clk_mgr

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/inc

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/freesync

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/color

drivers/gpu/drm/amd/display/dc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# Makefile for Display Core (dc) component.

#



DC_LIBS = basics bios calcs dce gpio irq virtual

DC_LIBS = basics bios calcs clk_mgr dce gpio irq virtual



ifdef CONFIG_DRM_AMD_DC_DCN1_0

DC_LIBS += dcn10 dml

drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile

0 → 100644
+75 −0
Original line number Diff line number Diff line 
#

# Copyright 2017 Advanced Micro Devices, Inc.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice shall be included in

# all copies or substantial portions of the Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

# OTHER DEALINGS IN THE SOFTWARE.

#

#

# Makefile for the 'clk_mgr' sub-component of DAL.

# It provides the control and status of HW CLK_MGR pins.



CLK_MGR = clk_mgr.o



AMD_DAL_CLK_MGR = $(addprefix $(AMDDALPATH)/dc/clk_mgr/,$(CLK_MGR))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR)





###############################################################################

# DCE 100 and DCE8x

###############################################################################

CLK_MGR_DCE100 = dce_clk_mgr.o



AMD_DAL_CLK_MGR_DCE100 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dce100/,$(CLK_MGR_DCE100))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCE100)



###############################################################################

# DCE 100 and DCE8x

###############################################################################

CLK_MGR_DCE110 = dce110_clk_mgr.o



AMD_DAL_CLK_MGR_DCE110 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dce110/,$(CLK_MGR_DCE110))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCE110)

###############################################################################

# DCE 112

###############################################################################

CLK_MGR_DCE112 = dce112_clk_mgr.o



AMD_DAL_CLK_MGR_DCE112 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dce112/,$(CLK_MGR_DCE112))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCE112)

###############################################################################

# DCE 120

###############################################################################

CLK_MGR_DCE120 = dce120_clk_mgr.o



AMD_DAL_CLK_MGR_DCE120 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dce120/,$(CLK_MGR_DCE120))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCE120)

ifdef CONFIG_DRM_AMD_DC_DCN1_0

###############################################################################

# DCN10

###############################################################################

CLK_MGR_DCN10 = rv1_clk_mgr.o rv1_clk_mgr_vbios_smu.o rv2_clk_mgr.o



AMD_DAL_CLK_MGR_DCN10 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn10/,$(CLK_MGR_DCN10))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN10)

endif

drivers/gpu/drm/amd/display/dc/dcn10/clk_mgr.c→drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c

+7 −6
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ 
#include "dccg.h"

#include "clk_mgr_internal.h"



#include "dce/dce_clk_mgr.h"

#include "dce/dce110_clk_mgr.h"

#include "dce/dce112_clk_mgr.h"

#include "dce/dce120_clk_mgr.h"

#include "rv1_clk_mgr.h"

#include "rv2_clk_mgr.h"

#include "dce100/dce_clk_mgr.h"

#include "dce110/dce110_clk_mgr.h"

#include "dce112/dce112_clk_mgr.h"

#include "dce120/dce120_clk_mgr.h"

#include "dcn10/rv1_clk_mgr.h"

#include "dcn10/rv2_clk_mgr.h"



struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *pp_smu, struct dccg *dccg)

{
@@ -110,3 +110,4 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base) 


	kfree(clk_mgr);

}

drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c→drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c

+11 −2
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ 
 * Authors: AMD

 *

 */





#include "dccg.h"

#include "clk_mgr_internal.h"

#include "dce_clk_mgr.h"

#include "dce110_clk_mgr.h"

#include "dce112_clk_mgr.h"

#include "dce110/dce110_clk_mgr.h"

#include "dce112/dce112_clk_mgr.h"

#include "reg_helper.h"

#include "dmcu.h"

#include "core_types.h"
@@ -423,6 +425,12 @@ static void dce_update_clocks(struct clk_mgr *clk_mgr_base, 
}

















static struct clk_mgr_funcs dce_funcs = {

	.get_dp_ref_clk_frequency = dce_get_dp_ref_freq_khz,

	.update_clocks = dce_update_clocks
@@ -460,3 +468,4 @@ void dce_clk_mgr_construct( 
	dce_clock_read_integrated_info(clk_mgr);

	dce_clock_read_ss_info(clk_mgr);

}