openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Anthony Koo 2020-04-21 22:01:58 -04:00 committed by Alex Deucher
parent b5decb5c66
commit cdca3f218d
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -30,7 +30,7 @@
#include "dc.h"
#include "dc/inc/core_types.h"
#include "dal_asic_id.h"
#include "dmub/inc/dmub_srv.h"
#include "dmub/dmub_srv.h"
#include "dc/inc/hw/dmcu.h"
#include "dc/inc/hw/abm.h"
#include "dc/dc_dmub_srv.h"

2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
View File

@ -32,7 +32,7 @@
#include "amdgpu_dm.h"
#include "amdgpu_dm_debugfs.h"
#include "dm_helpers.h"
#include "dmub/inc/dmub_srv.h"
#include "dmub/dmub_srv.h"
struct dmub_debugfs_trace_header {
uint32_t entry_count;

2
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -66,7 +66,7 @@
#include "dce/dce_i2c.h"
#include "dmub/inc/dmub_cmd_dal.h"
#include "dmub/dmub_srv.h"
#define CTX \
dc->ctx

4
drivers/gpu/drm/amd/display/dc/core/dc_link.c
View File

@ -26,7 +26,7 @@
#include <linux/slab.h>
#include "dm_services.h"
#include "atom.h"
#include "atomfirmware.h"
#include "dm_helpers.h"
#include "dc.h"
#include "grph_object_id.h"
@ -46,7 +46,7 @@
#include "dmcu.h"
#include "hw/clk_mgr.h"
#include "dce/dmub_psr.h"
#include "dmub/inc/dmub_cmd_dal.h"
#include "dmub/dmub_srv.h"
#include "inc/hw/panel_cntl.h"
#define DC_LOGGER_INIT(logger)

2
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
View File

@ -25,7 +25,7 @@
#include "dc.h"
#include "dc_dmub_srv.h"
#include "../dmub/inc/dmub_srv.h"
#include "../dmub/dmub_srv.h"
static void dc_dmub_srv_construct(struct dc_dmub_srv *dc_srv, struct dc *dc,
struct dmub_srv *dmub)

2
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h
View File

@ -27,7 +27,7 @@
#define _DMUB_DC_SRV_H_
#include "os_types.h"
#include "dmub/inc/dmub_cmd.h"
#include "dmub/dmub_srv.h"
struct dmub_srv;

1
drivers/gpu/drm/amd/display/dc/dc_link.h
View File

@ -29,7 +29,6 @@
#include "dc.h"
#include "dc_types.h"
#include "grph_object_defs.h"
#include "dmub/inc/dmub_cmd_dal.h"
enum dc_link_fec_state {
dc_link_fec_not_ready,

2
drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c
View File

@ -27,7 +27,7 @@
#include "dce_abm.h"
#include "dc.h"
#include "dc_dmub_srv.h"
#include "dmub/inc/dmub_srv.h"
#include "dmub/dmub_srv.h"
#include "core_types.h"
#include "dm_services.h"
#include "reg_helper.h"

3
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
View File

@ -26,8 +26,7 @@
#include "dmub_psr.h"
#include "dc.h"
#include "dc_dmub_srv.h"
#include "dmub/inc/dmub_srv.h"
#include "dmub/inc/dmub_gpint_cmd.h"
#include "dmub/dmub_srv.h"
#include "core_types.h"
#define MAX_PIPES 6

9
drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h → drivers/gpu/drm/amd/display/dmub/dmub_srv.h
View File

@ -64,10 +64,11 @@
* other component within DAL.
*/
#include "dmub_types.h"
#include "dmub_cmd.h"
#include "dmub_gpint_cmd.h"
#include "dmub_rb.h"
#include "inc/dmub_types.h"
#include "inc/dmub_cmd.h"
#include "inc/dmub_gpint_cmd.h"
#include "inc/dmub_cmd_dal.h"
#include "inc/dmub_rb.h"
#if defined(__cplusplus)
extern "C" {

2
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c
View File

@ -23,7 +23,7 @@
*
*/
#include "../inc/dmub_srv.h"
#include "../dmub_srv.h"
#include "dmub_reg.h"
#include "dmub_dcn20.h"

2
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c
View File

@ -23,7 +23,7 @@
*
*/
#include "../inc/dmub_srv.h"
#include "../dmub_srv.h"
#include "dmub_reg.h"
#include "dmub_dcn21.h"

2
drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c
View File

@ -24,7 +24,7 @@
*/
#include "dmub_reg.h"
#include "../inc/dmub_srv.h"
#include "../dmub_srv.h"
struct dmub_reg_value_masks {
uint32_t value;

2
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
View File

@ -23,7 +23,7 @@
*
*/
#include "../inc/dmub_srv.h"
#include "../dmub_srv.h"
#include "dmub_dcn20.h"
#include "dmub_dcn21.h"
#include "dmub_fw_meta.h"

1
drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
View File

@ -29,7 +29,6 @@
#include "mod_shared.h"
#include "mod_freesync.h"
#include "dc.h"
#include "dmub/inc/dmub_cmd_dal.h"
enum vsc_packet_revision {
vsc_packet_undefined = 0,

12
drivers/gpu/drm/amd/include/atomfirmware.h
View File

@ -972,11 +972,13 @@ struct atom_ext_display_path
};
//usCaps
enum ext_display_path_cap_def
{
EXT_DISPLAY_PATH_CAPS__HBR2_DISABLE =0x0001,
EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN =0x0002,
EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK =0x007C,
enum ext_display_path_cap_def {
EXT_DISPLAY_PATH_CAPS__HBR2_DISABLE = 0x0001,
EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN = 0x0002,
EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK = 0x007C,
EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204 = (0x01 << 2), //PI redriver chip
EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT = (0x02 << 2), //TI retimer chip
EXT_DISPLAY_PATH_CAPS__HDMI20_PARADE_PS175 = (0x03 << 2) //Parade DP->HDMI recoverter chip
};
struct atom_external_display_connection_info