Commit ded99dac authored by Parandhaman K's avatar Parandhaman K Committed by Alex Deucher

drm/amd/display: refactor vpg.h

why and how:
as part of cleanup, need to refactor vpg. It was improperly referenced
as a dcn specfic part of link. the dcn agnostic code needed was ripped out
and put into vpg.h, now in dc/inc/hw.
Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Acked-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarParandhaman K <parandhaman.k@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 66ef7b91
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#ifndef __DAL_DCN30_VPG_H__ #ifndef __DAL_DCN30_VPG_H__
#define __DAL_DCN30_VPG_H__ #define __DAL_DCN30_VPG_H__
#include "vpg.h"
#define DCN30_VPG_FROM_VPG(vpg)\ #define DCN30_VPG_FROM_VPG(vpg)\
container_of(vpg, struct dcn30_vpg, base) container_of(vpg, struct dcn30_vpg, base)
...@@ -132,28 +133,6 @@ struct dcn30_vpg_mask { ...@@ -132,28 +133,6 @@ struct dcn30_vpg_mask {
VPG_DCN3_REG_FIELD_LIST(uint32_t); VPG_DCN3_REG_FIELD_LIST(uint32_t);
}; };
struct vpg;
struct vpg_funcs {
void (*update_generic_info_packet)(
struct vpg *vpg,
uint32_t packet_index,
const struct dc_info_packet *info_packet,
bool immediate_update);
void (*vpg_poweron)(
struct vpg *vpg);
void (*vpg_powerdown)(
struct vpg *vpg);
};
struct vpg {
const struct vpg_funcs *funcs;
struct dc_context *ctx;
int inst;
};
struct dcn30_vpg { struct dcn30_vpg {
struct vpg base; struct vpg base;
const struct dcn30_vpg_registers *regs; const struct dcn30_vpg_registers *regs;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#ifndef __DAL_DCN31_VPG_H__ #ifndef __DAL_DCN31_VPG_H__
#define __DAL_DCN31_VPG_H__ #define __DAL_DCN31_VPG_H__
#include "vpg.h"
#define DCN31_VPG_FROM_VPG(vpg)\ #define DCN31_VPG_FROM_VPG(vpg)\
container_of(vpg, struct dcn31_vpg, base) container_of(vpg, struct dcn31_vpg, base)
......
/*
* Copyright 2024 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.
*
* Authors: AMD
*/
#ifndef __DC_VPG_H__
#define __DC_VPG_H__
struct dc_context;
struct dc_info_packet;
struct vpg;
struct vpg_funcs {
void (*update_generic_info_packet)(
struct vpg *vpg,
uint32_t packet_index,
const struct dc_info_packet *info_packet,
bool immediate_update);
void (*vpg_poweron)(
struct vpg *vpg);
void (*vpg_powerdown)(
struct vpg *vpg);
};
struct vpg {
const struct vpg_funcs *funcs;
struct dc_context *ctx;
int inst;
};
#endif /* DC_INC_VPG_H_ */
\ No newline at end of file
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
#include "dccg.h" #include "dccg.h"
#include "clk_mgr.h" #include "clk_mgr.h"
#include "atomfirmware.h" #include "atomfirmware.h"
#include "vpg.h"
#define DC_LOGGER \ #define DC_LOGGER \
dc_logger dc_logger
#define DC_LOGGER_INIT(logger) \ #define DC_LOGGER_INIT(logger) \
...@@ -67,7 +69,6 @@ ...@@ -67,7 +69,6 @@
#define RETIMER_REDRIVER_INFO(...) \ #define RETIMER_REDRIVER_INFO(...) \
DC_LOG_RETIMER_REDRIVER( \ DC_LOG_RETIMER_REDRIVER( \
__VA_ARGS__) __VA_ARGS__)
#include "dc/dcn30/dcn30_vpg.h"
#define MAX_MTP_SLOT_COUNT 64 #define MAX_MTP_SLOT_COUNT 64
#define LINK_TRAINING_ATTEMPTS 4 #define LINK_TRAINING_ATTEMPTS 4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment