tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amd/display: move location of dmub_srv.h file

[Why]
Make a separation of what belongs in the differen dmub
headers

dmub_srv.h is for exposing dmub srv interface to rest of
driver.

other headers inside dmub/inc exposes cmds and definitions
that are owned by the firmware

[How]
keep firmware owned definitions in dmub/inc

move stuff that is purely driver interface headers to dmub/
since those are interface calls that are defined for rest of
driver to use

Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Anthony Koo and committed by
Alex Deucher cdca3f21 b5decb5c

+25 -25
+1 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 30 30 #include "dc.h" 31 31 #include "dc/inc/core_types.h" 32 32 #include "dal_asic_id.h" 33 - #include "dmub/inc/dmub_srv.h" 33 + #include "dmub/dmub_srv.h" 34 34 #include "dc/inc/hw/dmcu.h" 35 35 #include "dc/inc/hw/abm.h" 36 36 #include "dc/dc_dmub_srv.h"
+1 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
··· 32 32 #include "amdgpu_dm.h" 33 33 #include "amdgpu_dm_debugfs.h" 34 34 #include "dm_helpers.h" 35 - #include "dmub/inc/dmub_srv.h" 35 + #include "dmub/dmub_srv.h" 36 36 37 37 struct dmub_debugfs_trace_header { 38 38 uint32_t entry_count;
+1 -1
drivers/gpu/drm/amd/display/dc/core/dc.c
··· 66 66 67 67 #include "dce/dce_i2c.h" 68 68 69 - #include "dmub/inc/dmub_cmd_dal.h" 69 + #include "dmub/dmub_srv.h" 70 70 71 71 #define CTX \ 72 72 dc->ctx
+2 -2
drivers/gpu/drm/amd/display/dc/core/dc_link.c
··· 26 26 #include <linux/slab.h> 27 27 28 28 #include "dm_services.h" 29 - #include "atom.h" 29 + #include "atomfirmware.h" 30 30 #include "dm_helpers.h" 31 31 #include "dc.h" 32 32 #include "grph_object_id.h" ··· 46 46 #include "dmcu.h" 47 47 #include "hw/clk_mgr.h" 48 48 #include "dce/dmub_psr.h" 49 - #include "dmub/inc/dmub_cmd_dal.h" 49 + #include "dmub/dmub_srv.h" 50 50 #include "inc/hw/panel_cntl.h" 51 51 52 52 #define DC_LOGGER_INIT(logger)
+1 -1
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
··· 25 25 26 26 #include "dc.h" 27 27 #include "dc_dmub_srv.h" 28 - #include "../dmub/inc/dmub_srv.h" 28 + #include "../dmub/dmub_srv.h" 29 29 30 30 static void dc_dmub_srv_construct(struct dc_dmub_srv *dc_srv, struct dc *dc, 31 31 struct dmub_srv *dmub)
+1 -1
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h
··· 27 27 #define _DMUB_DC_SRV_H_ 28 28 29 29 #include "os_types.h" 30 - #include "dmub/inc/dmub_cmd.h" 30 + #include "dmub/dmub_srv.h" 31 31 32 32 struct dmub_srv; 33 33
-1
drivers/gpu/drm/amd/display/dc/dc_link.h
··· 29 29 #include "dc.h" 30 30 #include "dc_types.h" 31 31 #include "grph_object_defs.h" 32 - #include "dmub/inc/dmub_cmd_dal.h" 33 32 34 33 enum dc_link_fec_state { 35 34 dc_link_fec_not_ready,
+1 -1
drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c
··· 27 27 #include "dce_abm.h" 28 28 #include "dc.h" 29 29 #include "dc_dmub_srv.h" 30 - #include "dmub/inc/dmub_srv.h" 30 + #include "dmub/dmub_srv.h" 31 31 #include "core_types.h" 32 32 #include "dm_services.h" 33 33 #include "reg_helper.h"
+1 -2
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
··· 26 26 #include "dmub_psr.h" 27 27 #include "dc.h" 28 28 #include "dc_dmub_srv.h" 29 - #include "dmub/inc/dmub_srv.h" 30 - #include "dmub/inc/dmub_gpint_cmd.h" 29 + #include "dmub/dmub_srv.h" 31 30 #include "core_types.h" 32 31 33 32 #define MAX_PIPES 6
+5 -4
drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h drivers/gpu/drm/amd/display/dmub/dmub_srv.h
··· 64 64 * other component within DAL. 65 65 */ 66 66 67 - #include "dmub_types.h" 68 - #include "dmub_cmd.h" 69 - #include "dmub_gpint_cmd.h" 70 - #include "dmub_rb.h" 67 + #include "inc/dmub_types.h" 68 + #include "inc/dmub_cmd.h" 69 + #include "inc/dmub_gpint_cmd.h" 70 + #include "inc/dmub_cmd_dal.h" 71 + #include "inc/dmub_rb.h" 71 72 72 73 #if defined(__cplusplus) 73 74 extern "C" {
+1 -1
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c
··· 23 23 * 24 24 */ 25 25 26 - #include "../inc/dmub_srv.h" 26 + #include "../dmub_srv.h" 27 27 #include "dmub_reg.h" 28 28 #include "dmub_dcn20.h" 29 29
+1 -1
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c
··· 23 23 * 24 24 */ 25 25 26 - #include "../inc/dmub_srv.h" 26 + #include "../dmub_srv.h" 27 27 #include "dmub_reg.h" 28 28 #include "dmub_dcn21.h" 29 29
+1 -1
drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c
··· 24 24 */ 25 25 26 26 #include "dmub_reg.h" 27 - #include "../inc/dmub_srv.h" 27 + #include "../dmub_srv.h" 28 28 29 29 struct dmub_reg_value_masks { 30 30 uint32_t value;
+1 -1
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
··· 23 23 * 24 24 */ 25 25 26 - #include "../inc/dmub_srv.h" 26 + #include "../dmub_srv.h" 27 27 #include "dmub_dcn20.h" 28 28 #include "dmub_dcn21.h" 29 29 #include "dmub_fw_meta.h"
-1
drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
··· 29 29 #include "mod_shared.h" 30 30 #include "mod_freesync.h" 31 31 #include "dc.h" 32 - #include "dmub/inc/dmub_cmd_dal.h" 33 32 34 33 enum vsc_packet_revision { 35 34 vsc_packet_undefined = 0,
+7 -5
drivers/gpu/drm/amd/include/atomfirmware.h
··· 972 972 }; 973 973 974 974 //usCaps 975 - enum ext_display_path_cap_def 976 - { 977 - EXT_DISPLAY_PATH_CAPS__HBR2_DISABLE =0x0001, 978 - EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN =0x0002, 979 - EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK =0x007C, 975 + enum ext_display_path_cap_def { 976 + EXT_DISPLAY_PATH_CAPS__HBR2_DISABLE = 0x0001, 977 + EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN = 0x0002, 978 + EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK = 0x007C, 979 + EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204 = (0x01 << 2), //PI redriver chip 980 + EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT = (0x02 << 2), //TI retimer chip 981 + EXT_DISPLAY_PATH_CAPS__HDMI20_PARADE_PS175 = (0x03 << 2) //Parade DP->HDMI recoverter chip 980 982 }; 981 983 982 984 struct atom_external_display_connection_info