Commit 792671d7 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher

drm/amd/display: Add per surface validation hook.

For now just validate pixel format in the hook.
Signed-off-by: default avatarAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 49baf957
...@@ -2535,3 +2535,14 @@ bool dc_validate_stream(const struct dc *dc, struct dc_stream *stream) ...@@ -2535,3 +2535,14 @@ bool dc_validate_stream(const struct dc *dc, struct dc_stream *stream)
return res == DC_OK; return res == DC_OK;
} }
bool dc_validate_surface(const struct dc *dc, const struct dc_surface *surface)
{
struct core_dc *core_dc = DC_TO_CORE(dc);
/* TODO For now validates pixel format only */
if (core_dc->res_pool->funcs->validate_surface)
return core_dc->res_pool->funcs->validate_surface(surface) == DC_OK;
return true;
}
...@@ -589,6 +589,7 @@ struct dc_validation_set { ...@@ -589,6 +589,7 @@ struct dc_validation_set {
bool dc_validate_stream(const struct dc *dc, struct dc_stream *stream); bool dc_validate_stream(const struct dc *dc, struct dc_stream *stream);
bool dc_validate_surface(const struct dc *dc, const struct dc_surface *surface);
/* /*
* This function takes a set of resources and checks that they are cofunctional. * This function takes a set of resources and checks that they are cofunctional.
* *
......
...@@ -804,12 +804,22 @@ static void dce100_destroy_resource_pool(struct resource_pool **pool) ...@@ -804,12 +804,22 @@ static void dce100_destroy_resource_pool(struct resource_pool **pool)
*pool = NULL; *pool = NULL;
} }
enum dc_status dce100_validate_surface(const struct dc_surface *surface)
{
if (surface->format < SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
return DC_OK;
return DC_FAIL_SURFACE_VALIDATE;
}
static const struct resource_funcs dce100_res_pool_funcs = { static const struct resource_funcs dce100_res_pool_funcs = {
.destroy = dce100_destroy_resource_pool, .destroy = dce100_destroy_resource_pool,
.link_enc_create = dce100_link_encoder_create, .link_enc_create = dce100_link_encoder_create,
.validate_with_context = dce100_validate_with_context, .validate_with_context = dce100_validate_with_context,
.validate_guaranteed = dce100_validate_guaranteed, .validate_guaranteed = dce100_validate_guaranteed,
.validate_bandwidth = dce100_validate_bandwidth .validate_bandwidth = dce100_validate_bandwidth,
.validate_surface = dce100_validate_surface,
}; };
static bool construct( static bool construct(
......
...@@ -16,4 +16,6 @@ struct resource_pool *dce100_create_resource_pool( ...@@ -16,4 +16,6 @@ struct resource_pool *dce100_create_resource_pool(
uint8_t num_virtual_links, uint8_t num_virtual_links,
struct core_dc *dc); struct core_dc *dc);
enum dc_status dce100_validate_surface(const struct dc_surface *surface);
#endif /* DCE100_RESOURCE_H_ */ #endif /* DCE100_RESOURCE_H_ */
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
#include "dce/dce_11_2_d.h" #include "dce/dce_11_2_d.h"
#include "dce/dce_11_2_sh_mask.h" #include "dce/dce_11_2_sh_mask.h"
#include "dce100/dce100_resource.h"
#ifndef mmDP_DPHY_INTERNAL_CTRL #ifndef mmDP_DPHY_INTERNAL_CTRL
#define mmDP_DPHY_INTERNAL_CTRL 0x4aa7 #define mmDP_DPHY_INTERNAL_CTRL 0x4aa7
#define mmDP0_DP_DPHY_INTERNAL_CTRL 0x4aa7 #define mmDP0_DP_DPHY_INTERNAL_CTRL 0x4aa7
...@@ -992,6 +994,7 @@ static const struct resource_funcs dce112_res_pool_funcs = { ...@@ -992,6 +994,7 @@ static const struct resource_funcs dce112_res_pool_funcs = {
.validate_with_context = dce112_validate_with_context, .validate_with_context = dce112_validate_with_context,
.validate_guaranteed = dce112_validate_guaranteed, .validate_guaranteed = dce112_validate_guaranteed,
.validate_bandwidth = dce112_validate_bandwidth, .validate_bandwidth = dce112_validate_bandwidth,
.validate_surface = dce100_validate_surface
}; };
static void bw_calcs_data_update_from_pplib(struct core_dc *dc) static void bw_calcs_data_update_from_pplib(struct core_dc *dc)
......
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
#include "vega10/NBIO/nbio_6_1_offset.h" #include "vega10/NBIO/nbio_6_1_offset.h"
#include "reg_helper.h" #include "reg_helper.h"
#include "dce100/dce100_resource.h"
#ifndef mmDP0_DP_DPHY_INTERNAL_CTRL #ifndef mmDP0_DP_DPHY_INTERNAL_CTRL
#define mmDP0_DP_DPHY_INTERNAL_CTRL 0x210f #define mmDP0_DP_DPHY_INTERNAL_CTRL 0x210f
#define mmDP0_DP_DPHY_INTERNAL_CTRL_BASE_IDX 2 #define mmDP0_DP_DPHY_INTERNAL_CTRL_BASE_IDX 2
...@@ -698,7 +700,8 @@ static const struct resource_funcs dce120_res_pool_funcs = { ...@@ -698,7 +700,8 @@ static const struct resource_funcs dce120_res_pool_funcs = {
.link_enc_create = dce120_link_encoder_create, .link_enc_create = dce120_link_encoder_create,
.validate_with_context = dce112_validate_with_context, .validate_with_context = dce112_validate_with_context,
.validate_guaranteed = dce112_validate_guaranteed, .validate_guaranteed = dce112_validate_guaranteed,
.validate_bandwidth = dce112_validate_bandwidth .validate_bandwidth = dce112_validate_bandwidth,
.validate_surface = dce100_validate_surface
}; };
static void bw_calcs_data_update_from_pplib(struct core_dc *dc) static void bw_calcs_data_update_from_pplib(struct core_dc *dc)
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "dce/dce_audio.h" #include "dce/dce_audio.h"
#include "dce/dce_hwseq.h" #include "dce/dce_hwseq.h"
#include "dce80/dce80_hw_sequencer.h" #include "dce80/dce80_hw_sequencer.h"
#include "dce100/dce100_resource.h"
#include "reg_helper.h" #include "reg_helper.h"
...@@ -823,7 +824,8 @@ static const struct resource_funcs dce80_res_pool_funcs = { ...@@ -823,7 +824,8 @@ static const struct resource_funcs dce80_res_pool_funcs = {
.link_enc_create = dce80_link_encoder_create, .link_enc_create = dce80_link_encoder_create,
.validate_with_context = dce80_validate_with_context, .validate_with_context = dce80_validate_with_context,
.validate_guaranteed = dce80_validate_guaranteed, .validate_guaranteed = dce80_validate_guaranteed,
.validate_bandwidth = dce80_validate_bandwidth .validate_bandwidth = dce80_validate_bandwidth,
.validate_surface = dce100_validate_surface
}; };
static bool construct( static bool construct(
......
...@@ -105,6 +105,8 @@ struct resource_funcs { ...@@ -105,6 +105,8 @@ struct resource_funcs {
struct validate_context *context, struct validate_context *context,
const struct resource_pool *pool, const struct resource_pool *pool,
struct dc_stream *stream); struct dc_stream *stream);
enum dc_status (*validate_surface)(const struct dc_surface *surface);
}; };
struct audio_support{ struct audio_support{
......
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