Commit 1811a51f authored by Krunoslav Kovac's avatar Krunoslav Kovac Committed by Alex Deucher

drm/amd/display: Implement cursor multiplier

DCN allows cursor multiplier when blending FP16 surface.
Signed-off-by: default avatarKrunoslav Kovac <Krunoslav.Kovac@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0a145446
...@@ -490,6 +490,7 @@ struct dc_cursor_attributes { ...@@ -490,6 +490,7 @@ struct dc_cursor_attributes {
uint32_t height; uint32_t height;
enum dc_cursor_color_format color_format; enum dc_cursor_color_format color_format;
uint32_t sdr_white_level; // for boosting (SDR) cursor in HDR mode
/* In case we support HW Cursor rotation in the future */ /* In case we support HW Cursor rotation in the future */
enum dc_rotation_angle rotation_angle; enum dc_rotation_angle rotation_angle;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "reg_helper.h" #include "reg_helper.h"
#include "basics/conversion.h" #include "basics/conversion.h"
#include "dcn10_hubp.h" #include "dcn10_hubp.h"
#include "custom_float.h"
#define REG(reg)\ #define REG(reg)\
hubp1->hubp_regs->reg hubp1->hubp_regs->reg
...@@ -1038,6 +1039,18 @@ void hubp1_cursor_set_attributes( ...@@ -1038,6 +1039,18 @@ void hubp1_cursor_set_attributes(
enum cursor_pitch hw_pitch = hubp1_get_cursor_pitch(attr->pitch); enum cursor_pitch hw_pitch = hubp1_get_cursor_pitch(attr->pitch);
enum cursor_lines_per_chunk lpc = hubp1_get_lines_per_chunk( enum cursor_lines_per_chunk lpc = hubp1_get_lines_per_chunk(
attr->width, attr->color_format); attr->width, attr->color_format);
struct fixed31_32 multiplier;
uint32_t hw_mult = 0x3c00; // 1.0 default multiplier
struct custom_float_format fmt;
fmt.exponenta_bits = 5;
fmt.mantissa_bits = 10;
fmt.sign = true;
if (attr->sdr_white_level > 80) {
multiplier = dc_fixpt_from_fraction(attr->sdr_white_level, 80);
convert_to_custom_float_format(multiplier, &fmt, &hw_mult);
}
hubp->curs_attr = *attr; hubp->curs_attr = *attr;
...@@ -1060,6 +1073,8 @@ void hubp1_cursor_set_attributes( ...@@ -1060,6 +1073,8 @@ void hubp1_cursor_set_attributes(
CURSOR0_DST_Y_OFFSET, 0, CURSOR0_DST_Y_OFFSET, 0,
/* used to shift the cursor chunk request deadline */ /* used to shift the cursor chunk request deadline */
CURSOR0_CHUNK_HDL_ADJUST, 3); CURSOR0_CHUNK_HDL_ADJUST, 3);
REG_UPDATE(CURSOR0_FP_SCALE_BIAS, CUR0_FP_SCALE, hw_mult);
} }
void hubp1_cursor_set_position( void hubp1_cursor_set_position(
......
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
SRI(CURSOR_CONTROL, CURSOR, id), \ SRI(CURSOR_CONTROL, CURSOR, id), \
SRI(CURSOR_POSITION, CURSOR, id), \ SRI(CURSOR_POSITION, CURSOR, id), \
SRI(CURSOR_HOT_SPOT, CURSOR, id), \ SRI(CURSOR_HOT_SPOT, CURSOR, id), \
SRI(CURSOR_DST_OFFSET, CURSOR, id) SRI(CURSOR_DST_OFFSET, CURSOR, id), \
SRI(CURSOR0_FP_SCALE_BIAS, CNVC_CUR, id)
#define HUBP_COMMON_REG_VARIABLE_LIST \ #define HUBP_COMMON_REG_VARIABLE_LIST \
uint32_t DCHUBP_CNTL; \ uint32_t DCHUBP_CNTL; \
...@@ -241,7 +242,8 @@ ...@@ -241,7 +242,8 @@
uint32_t CURSOR_POSITION; \ uint32_t CURSOR_POSITION; \
uint32_t CURSOR_HOT_SPOT; \ uint32_t CURSOR_HOT_SPOT; \
uint32_t CURSOR_DST_OFFSET; \ uint32_t CURSOR_DST_OFFSET; \
uint32_t HUBP_CLK_CNTL uint32_t HUBP_CLK_CNTL; \
uint32_t CURSOR0_FP_SCALE_BIAS
#define HUBP_SF(reg_name, field_name, post_fix)\ #define HUBP_SF(reg_name, field_name, post_fix)\
.field_name = reg_name ## __ ## field_name ## post_fix .field_name = reg_name ## __ ## field_name ## post_fix
...@@ -424,7 +426,8 @@ ...@@ -424,7 +426,8 @@
HUBP_SF(CURSOR0_CURSOR_POSITION, CURSOR_Y_POSITION, mask_sh), \ HUBP_SF(CURSOR0_CURSOR_POSITION, CURSOR_Y_POSITION, mask_sh), \
HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_X, mask_sh), \ HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_X, mask_sh), \
HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \ HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \
HUBP_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh) HUBP_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh), \
HUBP_SF(CNVC_CUR0_CURSOR0_FP_SCALE_BIAS, CUR0_FP_SCALE, mask_sh)
#define DCN_HUBP_REG_FIELD_LIST(type) \ #define DCN_HUBP_REG_FIELD_LIST(type) \
type HUBP_BLANK_EN;\ type HUBP_BLANK_EN;\
...@@ -615,7 +618,8 @@ ...@@ -615,7 +618,8 @@
type CURSOR_HOT_SPOT_X; \ type CURSOR_HOT_SPOT_X; \
type CURSOR_HOT_SPOT_Y; \ type CURSOR_HOT_SPOT_Y; \
type CURSOR_DST_X_OFFSET; \ type CURSOR_DST_X_OFFSET; \
type OUTPUT_FP type OUTPUT_FP; \
type CUR0_FP_SCALE
struct dcn_mi_registers { struct dcn_mi_registers {
HUBP_COMMON_REG_VARIABLE_LIST; HUBP_COMMON_REG_VARIABLE_LIST;
......
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