Эх сурвалжийг харах

drm/amd/display: Add 2X Cursor Magnification Code

Signed-off-by: Pandey, Arun <Arun.Pandey@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
pana 8 жил өмнө
parent
commit
e9475143fb

+ 0 - 2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c

@@ -154,12 +154,10 @@ static void ippn10_cursor_set_attributes(
 	REG_UPDATE_2(CURSOR_SIZE,
 	REG_UPDATE_2(CURSOR_SIZE,
 			CURSOR_WIDTH, attr->width,
 			CURSOR_WIDTH, attr->width,
 			CURSOR_HEIGHT, attr->height);
 			CURSOR_HEIGHT, attr->height);
-
 	REG_UPDATE_3(CURSOR_CONTROL,
 	REG_UPDATE_3(CURSOR_CONTROL,
 			CURSOR_MODE, attr->color_format,
 			CURSOR_MODE, attr->color_format,
 			CURSOR_PITCH, hw_pitch,
 			CURSOR_PITCH, hw_pitch,
 			CURSOR_LINES_PER_CHUNK, lpc);
 			CURSOR_LINES_PER_CHUNK, lpc);
-
 	ippn10_cursor_program_control(ippn10,
 	ippn10_cursor_program_control(ippn10,
 			attr->attribute_flags.bits.INVERT_PIXEL_DATA,
 			attr->attribute_flags.bits.INVERT_PIXEL_DATA,
 			attr->color_format);
 			attr->color_format);

+ 11 - 0
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h

@@ -50,6 +50,15 @@
 	SRI(CURSOR_HOT_SPOT, CURSOR, id), \
 	SRI(CURSOR_HOT_SPOT, CURSOR, id), \
 	SRI(CURSOR_DST_OFFSET, CURSOR, id)
 	SRI(CURSOR_DST_OFFSET, CURSOR, id)
 
 
+#define CURSOR0_CURSOR_CONTROL__CURSOR_2X_MAGNIFY__SHIFT	0x4
+#define CURSOR0_CURSOR_CONTROL__CURSOR_2X_MAGNIFY_MASK		0x00000010L
+#define CURSOR1_CURSOR_CONTROL__CURSOR_2X_MAGNIFY__SHIFT	0x4
+#define CURSOR1_CURSOR_CONTROL__CURSOR_2X_MAGNIFY_MASK		0x00000010L
+#define CURSOR2_CURSOR_CONTROL__CURSOR_2X_MAGNIFY__SHIFT	0x4
+#define CURSOR2_CURSOR_CONTROL__CURSOR_2X_MAGNIFY_MASK		0x00000010L
+#define CURSOR3_CURSOR_CONTROL__CURSOR_2X_MAGNIFY__SHIFT	0x4
+#define CURSOR3_CURSOR_CONTROL__CURSOR_2X_MAGNIFY_MASK		0x00000010L
+
 #define IPP_SF(reg_name, field_name, post_fix)\
 #define IPP_SF(reg_name, field_name, post_fix)\
 	.field_name = reg_name ## __ ## field_name ## post_fix
 	.field_name = reg_name ## __ ## field_name ## post_fix
 
 
@@ -73,6 +82,7 @@
 	IPP_SF(CURSOR0_CURSOR_SIZE, CURSOR_WIDTH, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_SIZE, CURSOR_WIDTH, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_SIZE, CURSOR_HEIGHT, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_SIZE, CURSOR_HEIGHT, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_MODE, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_MODE, mask_sh), \
+	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_2X_MAGNIFY, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_PITCH, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_PITCH, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_LINES_PER_CHUNK, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_LINES_PER_CHUNK, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_ENABLE, mask_sh), \
 	IPP_SF(CURSOR0_CURSOR_CONTROL, CURSOR_ENABLE, mask_sh), \
@@ -99,6 +109,7 @@
 	type CURSOR_WIDTH; \
 	type CURSOR_WIDTH; \
 	type CURSOR_HEIGHT; \
 	type CURSOR_HEIGHT; \
 	type CURSOR_MODE; \
 	type CURSOR_MODE; \
+	type CURSOR_2X_MAGNIFY; \
 	type CURSOR_PITCH; \
 	type CURSOR_PITCH; \
 	type CURSOR_LINES_PER_CHUNK; \
 	type CURSOR_LINES_PER_CHUNK; \
 	type CURSOR_ENABLE; \
 	type CURSOR_ENABLE; \