DC Patches Apr 3, 2017
Subsystems (3)
cover DC Patches Apr 3, 2017
* First phase of getting multi-plane support
* Using DRM for all aux/i2c & edid read
* Fix screen flicker on Tonga & Bonaire
* Bunch of Raven bandwidth fixes
* Bunch of other fixes
Amy Zhang (1):
drm/amd/display: PSR Aux Channel and Static Screen Support Fix
Andrey Grodzovsky (5):
drm/amd/display: Remove get_connector_for_link.
drm/amd/display: Remove get_connector_for_sink.
drm/amd/display: Fix i2c write flag.
drm/amd/display: Refactor edid read.
drm/amd/display: Fix s3 hang on resume.
Dmytro Laktyushkin (1):
drm/amd/display: fix dce_calc surface pitch setting for non underlay
pipes
Harry Wentland (1):
drm/amd/display: Fix cleanup in amdgpu_dm_initialize_drm_device
Jordan Lazare (2):
drm/amd/display: Fill in vrefresh and min_vblank_time for dce8/dce10 drm/amd/display: Log clock source in error condition
Reza Amini (2):
drm/amd/display: remove surface validation against stream rect drm/amd/display: refactor member referencing to improve readability
Shirish S (2):
drm/amd/display: decouple per-crtc-plane model
drm/amd/display: update plane functionalities
Yongqiang Sun (1):
drm/amd/display: Ignore visible flag when check surface update type.
Zeyu Fan (1):
drm/amd/display: Temporary disable PSR for HBR2 & HBR3
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 21 ++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 76 ++-- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 112 +++--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 16 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 2 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 54 ++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 139 ++++++-- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.h | 5 +- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 80 ++++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 55 +-- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 337 +----------------- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 33 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 107 +++--- drivers/gpu/drm/amd/display/dc/dc.h | 25 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 6 + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 3 +- .../amd/display/dc/dce100/dce100_hw_sequencer.c | 21 ++ .../amd/display/dc/dce100/dce100_hw_sequencer.h | 5 + .../drm/amd/display/dc/dce100/dce100_resource.c | 7 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 8 +- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 8 + .../drm/amd/display/dc/dce110/dce110_resource.c | 7 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 7 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 2 + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 2 + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 7 +- drivers/gpu/drm/amd/display/dc/dm_helpers.h | 10 + drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 9 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 38 +- .../drm/amd/display/include/ddc_service_types.h | 28 -- .../gpu/drm/amd/display/include/i2caux_interface.h | 3 + .../amd/display/modules/ddc_service/ddc_service.c | 381 +++++++++++++++++++++ .../drm/amd/display/modules/inc/mod_ddc_service.h | 64 ++++ 35 files changed, 1009 insertions(+), 675 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/modules/ddc_service/ddc_service.c create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_ddc_service.h
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20170403230730.9884-1-harry.wentland-5C7GfCeVMHo@public.gmane.org
PATCH 1/16 drm/amd/display: decouple per-crtc-plane model
From: Shirish S <[email protected]>
Current design has per-crtc-plane model.
As a result, for asic's that support underlay, are unable to expose it to user space for modesetting.
To enable this, the drm driver intialisation now runs for number of surfaces instead of stream/crtc.
This patch plumbs surface capabilities to drm framework so that it can be effectively used by user space.
Tests: (On Chromium OS for Stoney Only)
* 'modetest -p' now shows additional plane
with YUV capabilities in case of CZ and ST.
* 'plane_test' fails with below error:
[drm:amdgpu_dm_connector_atomic_set_property [amdgpu]] *ERROR* Unsupported screen depth 0 as ther is no support for YUYV
* Checked multimonitor display works fine
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 8 +++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 67 ++++++++++++++----- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 75 +++++++++++++++------- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.h | 5 +- drivers/gpu/drm/amd/display/dc/dc.h | 1 + .../drm/amd/display/dc/dce100/dce100_resource.c | 2 + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 + .../drm/amd/display/dc/dce120/dce120_resource.c | 2 + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 + 10 files changed, 127 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +8 -0
@@ -59,6 +59,7 @@ struct amdgpu_hpd;#define AMDGPU_MAX_HPD_PINS 6#define AMDGPU_MAX_CRTCS 6 +#define AMDGPU_MAX_PLANES 6#define AMDGPU_MAX_AFMT_BLOCKS 9enum amdgpu_rmx_type {
@@ -338,6 +339,7 @@ struct amdgpu_mode_info {struct card_info *atom_card_info;bool mode_config_initialized;struct amdgpu_crtc *crtcs[AMDGPU_MAX_CRTCS ]; +struct amdgpu_plane *planes[AMDGPU_MAX_PLANES ];struct amdgpu_afmt *afmt[AMDGPU_MAX_AFMT_BLOCKS ];/* DVI-I properties */ struct drm_property *coherent_mode_property;
@@ -371,6 +373,7 @@ struct amdgpu_mode_info {int num_dig;/* number of dig blocks */ int disp_priority;const struct amdgpu_display_funcs *funcs; +enum drm_plane_type *plane_type; };#define AMDGPU_MAX_BL_LEVEL 0xFF
@@ -452,6 +455,11 @@ struct amdgpu_crtc {struct drm_pending_vblank_event *event; }; +struct amdgpu_plane { +struct drm_plane base; +enum drm_plane_type plane_type; +}; +struct amdgpu_encoder_atom_dig {bool linkb;/* atom dig */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +51 -16
141 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +53 -22
104 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h +4 -1
@@ -34,8 +34,11 @@ struct dc_validation_set;struct dc_surface ;/*TODO Jodan Hersen use the one in amdgpu_dm*/ +int amdgpu_dm_plane_init (struct amdgpu_display_manager *dm, +struct amdgpu_plane *aplane, +unsigned long possible_crtcs);int amdgpu_dm_crtc_init (struct amdgpu_display_manager *dm, -struct amdgpu_crtc *amdgpu_crtc, +struct drm_plane *plane,uint32_t link_index); int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, struct amdgpu_connector *amdgpu_connector,
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -45,6 +45,7 @@ struct dc_caps {uint32_t max_links;uint32_t max_audios;uint32_t max_slave_planes; +uint32_t max_surfaces;uint32_t max_downscale_ratio;uint32_t i2c_speed_in_khz;
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +2 -0
@@ -1035,6 +1035,8 @@ static bool construct( } } + dc->public.caps.max_surfaces = pool->base.pipe_count; +if (!resource_construct (num_virtual_links, dc, &pool->base, &res_create_funcs)) goto res_create_fail;
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +2 -0
@@ -1455,6 +1455,8 @@ static bool construct(if (!dce110_hw_sequencer_construct (dc)) goto res_create_fail; + dc->public.caps.max_surfaces = pool->base.pipe_count; +bw_calcs_init (&dc->bw_dceip, &dc->bw_vbios, dc->ctx->asic_id);bw_calcs_data_update_from_pplib (dc);
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +2 -0
@@ -1409,6 +1409,8 @@ static bool construct( &res_create_funcs)) goto res_create_fail; + dc->public.caps.max_surfaces = pool->base.pipe_count; +/* Create hardware sequencer */ if (!dce112_hw_sequencer_construct (dc)) goto res_create_fail;
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +2 -0
@@ -1060,6 +1060,8 @@ static bool construct(if (!dce120_hw_sequencer_create (dc)) goto controller_create_fail; + dc->public.caps.max_surfaces = pool->base.pipe_count; +bw_calcs_init (&dc->bw_dceip, &dc->bw_vbios, dc->ctx->asic_id);bw_calcs_data_update_from_pplib (dc);
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +2 -0
@@ -1043,6 +1043,8 @@ static bool construct( } } + dc->public.caps.max_surfaces = pool->base.pipe_count; +if (!resource_construct (num_virtual_links, dc, &pool->base, &res_create_funcs)) goto res_create_fail;
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/16 drm/amd/display: Fix cleanup in amdgpu_dm_initialize_drm_device
In reply to a message not in the archive--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -6
@@ -1077,15 +1077,15 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) {struct amdgpu_display_manager *dm = &adev->dm;uint32_t i; -struct amdgpu_connector *aconnector; -struct amdgpu_encoder *aencoder; +struct amdgpu_connector *aconnector =NULL ; +struct amdgpu_encoder *aencoder =NULL ;struct amdgpu_mode_info *mode_info = &adev->mode_info;uint32_t link_cnt; link_cnt = dm->dc->caps.max_links;if (amdgpu_dm_mode_config_init (dm->adev)) {DRM_ERROR ("DM: Failed to initialize mode config\n" ); - goto fail; +return -1 ; }for (i =0 ; i < dm->dc->caps.max_surfaces; i++) {
@@ -1122,7 +1122,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) aconnector =kzalloc (sizeof (*aconnector),GFP_KERNEL );if (!aconnector) - goto fail; + goto fail_free_planes; aencoder =kzalloc (sizeof (*aencoder),GFP_KERNEL );if (!aencoder) {
@@ -1136,7 +1136,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)if (amdgpu_dm_connector_init (dm, aconnector, i, aencoder)) {DRM_ERROR ("KMS: Failed to initialize connector\n" ); - goto fail_free_connector; + goto fail_free_encoder; }if (dc_link_detect (dc_get_link_at_index (dm->dc, i), true))
@@ -1175,7 +1175,6 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) fail_free_planes:for (i =0 ; i < dm->dc->caps.max_surfaces; i++)kfree (mode_info->planes[i]); -fail:return -1 ; }
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/16 drm/amd/display: update plane functionalities
In reply to a message not in the archiveFrom: Shirish S <[email protected]>
This patch introduces amdgpu_drm_plane_state
structure, which subclasses drm_plane_state and
holds data suitable for configuring hardware.
It switches reset(), atomic_duplicate_state() & atomic_destroy_state() functions to new internal implementation, earlier they were pointing to drm core functions.
TESTS(On Chromium OS on Stoney Only)
* Builds without compilation errors.
* 'plane_test' passes for XR24 format
based Overlay plane.
* Chromium OS ui comes up.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 13 +++++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 55 ++++++++++++++++++++-- 2 files changed, 63 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +13 -0
@@ -56,6 +56,7 @@ struct amdgpu_hpd;#define to_amdgpu_connector (x) container_of(x, struct amdgpu_connector, base)#define to_amdgpu_encoder (x) container_of(x, struct amdgpu_encoder, base)#define to_amdgpu_framebuffer (x) container_of(x, struct amdgpu_framebuffer, base) +#define to_amdgpu_plane (x) container_of(x, struct amdgpu_plane, base)#define AMDGPU_MAX_HPD_PINS 6#define AMDGPU_MAX_CRTCS 6
@@ -455,6 +456,18 @@ struct amdgpu_crtc {struct drm_pending_vblank_event *event; }; +struct amdgpu_drm_plane_state { +struct drm_plane_state base; +unsigned int h_ratio; +unsigned int v_ratio; +}; + +static inline struct amdgpu_drm_plane_state * +to_amdgpu_plane_state (struct drm_plane_state *state) +{ + return container_of(state, struct amdgpu_drm_plane_state, base); +} +struct amdgpu_plane {struct drm_plane base;enum drm_plane_type plane_type;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +50 -5
62 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/16 drm/amd/display: remove surface validation against stream rect
In reply to a message not in the archiveFrom: Reza Amini <[email protected]>
Surface information is by default copied from old context in dc_commit_stream. Thus unchange streams will not be affected. For new streams, we shouldn't validate the new mode against the surface configuration of old_context.
--- drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 5 ----- drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 5 ----- drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 5 ----- drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 5 ----- 4 files changed, 20 deletions(-)
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +0 -5
@@ -788,11 +788,6 @@ static bool dce100_validate_surface_sets(if (set[i].surface_count >1 )return false; -if (set[i].surfaces[0 ]->clip_rect.width - < set[i].stream->src.width - || set[i].surfaces[0 ]->clip_rect.height - < set[i].stream->src.height) -return false;if (set[i].surfaces[0 ]->format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN )return false;
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +0 -5
@@ -1007,11 +1007,6 @@ static bool dce110_validate_surface_sets(if (set[i].surface_count >2 )return false; -if (set[i].surfaces[0 ]->clip_rect.width - > set[i].stream->src.width - || set[i].surfaces[0 ]->clip_rect.height - > set[i].stream->src.height) -return false;if (set[i].surfaces[0 ]->format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN )return false;
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +0 -5
@@ -972,11 +972,6 @@ static bool dce112_validate_surface_sets(if (set[i].surface_count >1 )return false; -if (set[i].surfaces[0 ]->clip_rect.width - > set[i].stream->src.width - || set[i].surfaces[0 ]->clip_rect.height - > set[i].stream->src.height) -return false;if (set[i].surfaces[0 ]->format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN )return false;
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +0 -5
@@ -804,11 +804,6 @@ static bool dce80_validate_surface_sets(if (set[i].surface_count >1 )return false; -if (set[i].surfaces[0 ]->clip_rect.width - > set[i].stream->src.width - || set[i].surfaces[0 ]->clip_rect.height - > set[i].stream->src.height) -return false;if (set[i].surfaces[0 ]->format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN )return false;
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/16 drm/amd/display: refactor member referencing to improve readability
In reply to a message not in the archiveFrom: Reza Amini <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 107 ++++++++-------------- 1 file changed, 39 insertions(+), 68 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +39 -68
@@ -1519,17 +1519,16 @@ static void set_avi_info_frame(uint8_t cn0_cn1 =0 ;uint8_t *check_sum =NULL ;uint8_t byte_index =0 ; +union hdmi_info_packet *hdmi_info = &info_frame.avi_info_packet.info_packet_hdmi; color_space = pipe_ctx->stream->public.output_color_space;/* Initialize header */ - info_frame.avi_info_packet.info_packet_hdmi.bits.header. - info_frame_type =HDMI_INFOFRAME_TYPE_AVI ; + hdmi_info->bits.header.info_frame_type =HDMI_INFOFRAME_TYPE_AVI ;/* InfoFrameVersion_3 is defined by CEA861F (Section 6.4), but shall * not be used in HDMI 2.0 (Section 10.1) */ - info_frame.avi_info_packet.info_packet_hdmi.bits.header.version =2 ; - info_frame.avi_info_packet.info_packet_hdmi.bits.header.length = -HDMI_AVI_INFOFRAME_SIZE ; + hdmi_info->bits.header.version =2 ; + hdmi_info->bits.header.length =HDMI_AVI_INFOFRAME_SIZE ;/* * IDO-defined (Y2,Y1,Y0 = 1,1,1) shall not be used by devices built
@@ -1555,52 +1554,41 @@ static void set_avi_info_frame(/* Y0_Y1_Y2 : The pixel encoding */ /* H14b AVI InfoFrame has extension on Y-field from 2 bits to 3 bits */ - info_frame.avi_info_packet.info_packet_hdmi.bits.Y0_Y1_Y2 = - pixel_encoding; + hdmi_info->bits.Y0_Y1_Y2 = pixel_encoding;/* A0 = 1 Active Format Information valid */ - info_frame.avi_info_packet.info_packet_hdmi.bits.A0 = -ACTIVE_FORMAT_VALID ; + hdmi_info->bits.A0 =ACTIVE_FORMAT_VALID ;/* B0, B1 = 3; Bar info data is valid */ - info_frame.avi_info_packet.info_packet_hdmi.bits.B0_B1 = -BAR_INFO_BOTH_VALID ; + hdmi_info->bits.B0_B1 =BAR_INFO_BOTH_VALID ; - info_frame.avi_info_packet.info_packet_hdmi.bits.SC0_SC1 = -PICTURE_SCALING_UNIFORM ; + hdmi_info->bits.SC0_SC1 =PICTURE_SCALING_UNIFORM ;/* S0, S1 : Underscan / Overscan */ /* TODO: un-hardcode scan type */ scan_type =SCANNING_TYPE_UNDERSCAN ; - info_frame.avi_info_packet.info_packet_hdmi.bits.S0_S1 = scan_type; + hdmi_info->bits.S0_S1 = scan_type;/* C0, C1 : Colorimetry */ if (color_space ==COLOR_SPACE_YCBCR709 || color_space ==COLOR_SPACE_YCBCR709_LIMITED ) - info_frame.avi_info_packet.info_packet_hdmi.bits.C0_C1 = -COLORIMETRY_ITU709 ; + hdmi_info->bits.C0_C1 =COLORIMETRY_ITU709 ;else if (color_space ==COLOR_SPACE_YCBCR601 || color_space ==COLOR_SPACE_YCBCR601_LIMITED ) - info_frame.avi_info_packet.info_packet_hdmi.bits.C0_C1 = -COLORIMETRY_ITU601 ; + hdmi_info->bits.C0_C1 =COLORIMETRY_ITU601 ;else {if (stream->public.timing.pixel_encoding !=PIXEL_ENCODING_RGB )BREAK_TO_DEBUGGER (); - info_frame.avi_info_packet.info_packet_hdmi.bits.C0_C1 = -COLORIMETRY_NO_DATA ; + hdmi_info->bits.C0_C1 =COLORIMETRY_NO_DATA ; }if (color_space ==COLOR_SPACE_2020_RGB_FULLRANGE || color_space ==COLOR_SPACE_2020_RGB_LIMITEDRANGE || color_space ==COLOR_SPACE_2020_YCBCR ) { - info_frame.avi_info_packet.info_packet_hdmi.bits.EC0_EC2 = -COLORIMETRYEX_BT2020RGBYCBCR ; - info_frame.avi_info_packet.info_packet_hdmi.bits.C0_C1 = -COLORIMETRY_EXTENDED ; + hdmi_info->bits.EC0_EC2 =COLORIMETRYEX_BT2020RGBYCBCR ; + hdmi_info->bits.C0_C1 =COLORIMETRY_EXTENDED ; }else if (color_space ==COLOR_SPACE_ADOBERGB ) { - info_frame.avi_info_packet.info_packet_hdmi.bits.EC0_EC2 = -COLORIMETRYEX_ADOBERGB ; - info_frame.avi_info_packet.info_packet_hdmi.bits.C0_C1 = -COLORIMETRY_EXTENDED ; + hdmi_info->bits.EC0_EC2 =COLORIMETRYEX_ADOBERGB ; + hdmi_info->bits.C0_C1 =COLORIMETRY_EXTENDED ; }/* TODO: un-hardcode aspect ratio */
@@ -1609,93 +1597,76 @@ static void set_avi_info_frame(switch (aspect) {case ASPECT_RATIO_4_3 :case ASPECT_RATIO_16_9 : - info_frame.avi_info_packet.info_packet_hdmi.bits.M0_M1 = aspect; + hdmi_info->bits.M0_M1 = aspect;break ;case ASPECT_RATIO_NO_DATA :case ASPECT_RATIO_64_27 :case ASPECT_RATIO_256_135 :default : - info_frame.avi_info_packet.info_packet_hdmi.bits.M0_M1 =0 ; + hdmi_info->bits.M0_M1 =0 ; }/* Active Format Aspect ratio - same as Picture Aspect Ratio. */ - info_frame.avi_info_packet.info_packet_hdmi.bits.R0_R3 = -ACTIVE_FORMAT_ASPECT_RATIO_SAME_AS_PICTURE ; + hdmi_info->bits.R0_R3 =ACTIVE_FORMAT_ASPECT_RATIO_SAME_AS_PICTURE ;/* TODO: un-hardcode cn0_cn1 and itc */ cn0_cn1 =0 ; itc = false;if (itc) { - info_frame.avi_info_packet.info_packet_hdmi.bits.ITC =1 ; - info_frame.avi_info_packet.info_packet_hdmi.bits.CN0_CN1 = - cn0_cn1; + hdmi_info->bits.ITC =1 ; + hdmi_info->bits.CN0_CN1 = cn0_cn1; }/* TODO : We should handle YCC quantization */ /* but we do not have matrix calculation */ if (color_space ==COLOR_SPACE_SRGB ) { - info_frame.avi_info_packet.info_packet_hdmi.bits.Q0_Q1 = -RGB_QUANTIZATION_FULL_RANGE ; - info_frame.avi_info_packet.info_packet_hdmi.bits.YQ0_YQ1 = -YYC_QUANTIZATION_FULL_RANGE ; + hdmi_info->bits.Q0_Q1 =RGB_QUANTIZATION_FULL_RANGE ; + hdmi_info->bits.YQ0_YQ1 =YYC_QUANTIZATION_FULL_RANGE ; }else if (color_space ==COLOR_SPACE_SRGB_LIMITED ) { - info_frame.avi_info_packet.info_packet_hdmi.bits.Q0_Q1 = -RGB_QUANTIZATION_LIMITED_RANGE ; - info_frame.avi_info_packet.info_packet_hdmi.bits.YQ0_YQ1 = -YYC_QUANTIZATION_LIMITED_RANGE ; + hdmi_info->bits.Q0_Q1 =RGB_QUANTIZATION_LIMITED_RANGE ; + hdmi_info->bits.YQ0_YQ1 =YYC_QUANTIZATION_LIMITED_RANGE ; }else { - info_frame.avi_info_packet.info_packet_hdmi.bits.Q0_Q1 = -RGB_QUANTIZATION_DEFAULT_RANGE ; - info_frame.avi_info_packet.info_packet_hdmi.bits.YQ0_YQ1 = -YYC_QUANTIZATION_LIMITED_RANGE ; + hdmi_info->bits.Q0_Q1 =RGB_QUANTIZATION_DEFAULT_RANGE ; + hdmi_info->bits.YQ0_YQ1 =YYC_QUANTIZATION_LIMITED_RANGE ; } - info_frame.avi_info_packet.info_packet_hdmi.bits.VIC0_VIC7 = + hdmi_info->bits.VIC0_VIC7 = stream->public.timing.vic;/* pixel repetition * PR0 - PR3 start from 0 whereas pHwPathMode->mode.timing.flags.pixel * repetition start from 1 */ - info_frame.avi_info_packet.info_packet_hdmi.bits.PR0_PR3 =0 ; + hdmi_info->bits.PR0_PR3 =0 ;/* Bar Info * barTop: Line Number of End of Top Bar. * barBottom: Line Number of Start of Bottom Bar. * barLeft: Pixel Number of End of Left Bar. * barRight: Pixel Number of Start of Right Bar. */ - info_frame.avi_info_packet.info_packet_hdmi.bits.bar_top = - stream->public.timing.v_border_top; - info_frame.avi_info_packet.info_packet_hdmi.bits.bar_bottom = - (stream->public.timing.v_border_top + hdmi_info->bits.bar_top = stream->public.timing.v_border_top; + hdmi_info->bits.bar_bottom = (stream->public.timing.v_border_top - stream->public.timing.v_border_bottom +1 ); - info_frame.avi_info_packet.info_packet_hdmi.bits.bar_left = - stream->public.timing.h_border_left; - info_frame.avi_info_packet.info_packet_hdmi.bits.bar_right = - (stream->public.timing.h_total + hdmi_info->bits.bar_left = stream->public.timing.h_border_left; + hdmi_info->bits.bar_right = (stream->public.timing.h_total - stream->public.timing.h_border_right +1 );/* check_sum - Calculate AFMT_AVI_INFO0 ~ AFMT_AVI_INFO3 */ - check_sum = - &info_frame. - avi_info_packet.info_packet_hdmi.packet_raw_data.sb[0 ]; + check_sum = &info_frame.avi_info_packet.info_packet_hdmi.packet_raw_data.sb[0 ]; + *check_sum =HDMI_INFOFRAME_TYPE_AVI +HDMI_AVI_INFOFRAME_SIZE +2 ;for (byte_index =1 ; byte_index <=HDMI_AVI_INFOFRAME_SIZE ; byte_index++) - *check_sum += info_frame.avi_info_packet.info_packet_hdmi. - packet_raw_data.sb[byte_index]; + *check_sum += hdmi_info->packet_raw_data.sb[byte_index];/* one byte complement */ *check_sum = (uint8_t ) (0x100 - *check_sum);/* Store in hw_path_mode */ - info_packet->hb0 = - info_frame.avi_info_packet.info_packet_hdmi.packet_raw_data.hb0; - info_packet->hb1 = - info_frame.avi_info_packet.info_packet_hdmi.packet_raw_data.hb1; - info_packet->hb2 = - info_frame.avi_info_packet.info_packet_hdmi.packet_raw_data.hb2; + info_packet->hb0 = hdmi_info->packet_raw_data.hb0; + info_packet->hb1 = hdmi_info->packet_raw_data.hb1; + info_packet->hb2 = hdmi_info->packet_raw_data.hb2;for (byte_index =0 ; byte_index <sizeof (info_frame.avi_info_packet. info_packet_hdmi.packet_raw_data.sb); byte_index++)
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/16 drm/amd/display: Temporary disable PSR for HBR2 & HBR3
In reply to a message not in the archiveFrom: Zeyu Fan <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +2 -1
@@ -2165,7 +2165,8 @@ static void retrieve_link_cap(struct core_link *link)CONN_DATA_DETECT (link, dpcd_data,sizeof (dpcd_data),"Rx Caps: " );/* TODO: Confirm if need retrieve_psr_link_cap */ -retrieve_psr_link_cap (link, link->edp_revision); +if (link->public.reported_link_cap.link_rate <LINK_RATE_HIGH2 ) +retrieve_psr_link_cap (link, link->edp_revision); }void detect_dp_sink_caps (struct core_link *link)
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/16 drm/amd/display: fix dce_calc surface pitch setting for non underlay pipes
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
--- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +2 -2
@@ -2614,7 +2614,7 @@ static void populate_initial_data( data->v_total[num_displays +4 ] =bw_int_to_fixed (pipe[i].stream->public.timing.v_total); data->pixel_rate[num_displays +4 ] =bw_frc_to_fixed (pipe[i].stream->public.timing.pix_clk_khz,1000 ); data->src_width[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.viewport.width); - data->pitch_in_pixels[num_displays +4 ] =bw_int_to_fixed (pipe[i].surface->public.plane_size.grph.surface_pitch); + data->pitch_in_pixels[num_displays +4 ] = data->src_width[num_displays +4 ]; data->src_height[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.viewport.height); data->h_taps[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.taps.h_taps); data->v_taps[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.taps.v_taps);
@@ -2712,7 +2712,7 @@ static void populate_initial_data( data->pixel_rate[num_displays +4 ] =bw_frc_to_fixed (pipe[i].stream->public.timing.pix_clk_khz,1000 );if (pipe[i].surface) { data->src_width[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.viewport.width); - data->pitch_in_pixels[num_displays +4 ] =bw_int_to_fixed (pipe[i].surface->public.plane_size.grph.surface_pitch); + data->pitch_in_pixels[num_displays +4 ] = data->src_width[num_displays +4 ]; data->src_height[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.viewport.height); data->h_taps[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.taps.h_taps); data->v_taps[num_displays +4 ] =bw_int_to_fixed (pipe[i].scl_data.taps.v_taps);
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/16 drm/amd/display: Remove get_connector_for_link.
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
We can keep a 1:1 relation between a link and a physical connector and hence skip the iteration. This function is used in context of only physical connetors.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 36 +++------------------- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 1 + drivers/gpu/drm/amd/display/dc/dc.h | 2 ++ 3 files changed, 8 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +5 -31
@@ -148,21 +148,6 @@ static struct amdgpu_connector *get_connector_for_sink(return NULL ; } -static struct amdgpu_connector *get_connector_for_link ( -struct drm_device *dev, -const struct dc_link *link) -{ -struct drm_connector *connector; - -list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -struct amdgpu_connector *aconnector =to_amdgpu_connector (connector); -if (aconnector->dc_link == link) -return aconnector; - } - -return NULL ; -} -static void get_payload_table (struct amdgpu_connector *aconnector,struct dp_mst_stream_allocation_table *proposed_table)
@@ -362,9 +347,7 @@ bool dm_helpers_dp_mst_start_top_mgr( const struct dc_link *link, bool boot) { -struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev; -struct amdgpu_connector *aconnector =get_connector_for_link (dev, link); +struct amdgpu_connector *aconnector = link->priv;if (!aconnector) {DRM_ERROR ("Failed to found connector for link!" );
@@ -387,9 +370,7 @@ void dm_helpers_dp_mst_stop_top_mgr(struct dc_context *ctx, const struct dc_link *link) { - struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev; -struct amdgpu_connector *aconnector =get_connector_for_link (dev, link); + struct amdgpu_connector *aconnector = link->priv;if (!aconnector) {DRM_ERROR ("Failed to found connector for link!" );
@@ -411,9 +392,7 @@ bool dm_helpers_dp_read_dpcd( uint32_t size) { -struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev; -struct amdgpu_connector *aconnector =get_connector_for_link (dev, link); +struct amdgpu_connector *aconnector = link->priv;if (!aconnector) {DRM_ERROR ("Failed to found connector for link!" );
@@ -431,10 +410,7 @@ bool dm_helpers_dp_write_dpcd( const uint8_t *data, uint32_t size) { - -struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev; -struct amdgpu_connector *aconnector =get_connector_for_link (dev, link); +struct amdgpu_connector *aconnector = link->priv;if (!aconnector) {DRM_ERROR ("Failed to found connector for link!" );
@@ -450,9 +426,7 @@ bool dm_helpers_submit_i2c(const struct dc_link *link, struct i2c_command *cmd) { - struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev; -struct amdgpu_connector *aconnector =get_connector_for_link (dev, link); + struct amdgpu_connector *aconnector = link->priv;struct i2c_msg *msgs;int i =0 ;int num = cmd->number_of_payloads;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +1 -0
@@ -2175,6 +2175,7 @@ int amdgpu_dm_connector_init(struct dc *dc = dm->dc;const struct dc_link *link =dc_get_link_at_index (dc, link_index);struct amdgpu_i2c_adapter *i2c; + ((struct dc_link *)link)->priv = aconnector;DRM_DEBUG_KMS ("%s()\n" , __func__);
drivers/gpu/drm/amd/display/dc/dc.h +2 -0
@@ -592,6 +592,8 @@ struct dc_link {struct psr_caps psr_caps;bool test_pattern_enabled;union compliance_test_state compliance_test_state; + +void *priv; };struct dpcd_caps {
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/16 drm/amd/display: Remove get_connector_for_sink.
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
Keep 1:1 relation between MST sink and it's MST connector.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 27 +++------------------- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 +++++- drivers/gpu/drm/amd/display/dc/dc.h | 1 + 3 files changed, 10 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3 -24
@@ -133,21 +133,6 @@ enum dc_edid_status dm_helpers_parse_edid_caps(return result; } -static struct amdgpu_connector *get_connector_for_sink ( -struct drm_device *dev, -const struct dc_sink *sink) -{ -struct drm_connector *connector; - -list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -struct amdgpu_connector *aconnector =to_amdgpu_connector (connector); -if (aconnector->dc_sink == sink) -return aconnector; - } - -return NULL ; -} -static void get_payload_table (struct amdgpu_connector *aconnector,struct dp_mst_stream_allocation_table *proposed_table)
@@ -194,8 +179,6 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( struct dp_mst_stream_allocation_table *proposed_table, bool enable) { -struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev;struct amdgpu_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;struct drm_dp_mst_port *mst_port;
@@ -205,7 +188,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(int bpp =0 ;int pbn =0 ; - aconnector =get_connector_for_sink (dev, stream->sink); + aconnector = stream->sink->priv;if (!aconnector || !aconnector->mst_port)return false;
@@ -283,13 +266,11 @@ bool dm_helpers_dp_mst_poll_for_allocation_change_trigger(struct dc_context *ctx, const struct dc_stream *stream) { - struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev; struct amdgpu_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;int ret; - aconnector =get_connector_for_sink (dev, stream->sink); + aconnector = stream->sink->priv;if (!aconnector || !aconnector->mst_port)return false;
@@ -312,14 +293,12 @@ bool dm_helpers_dp_mst_send_payload_allocation( const struct dc_stream *stream, bool enable) { -struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev;struct amdgpu_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;struct drm_dp_mst_port *mst_port;int ret; - aconnector =get_connector_for_sink (dev, stream->sink); + aconnector = stream->sink->priv;if (!aconnector || !aconnector->mst_port)return false;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +6 -1
@@ -327,6 +327,7 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr)struct drm_connector *connector;struct amdgpu_connector *aconnector;struct edid *edid; +struct dc_sink *dc_sink;drm_modeset_lock_all (dev);list_for_each_entry (connector, &dev->mode_config.connector_list, head) {
@@ -354,11 +355,15 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr) aconnector->edid = edid; - aconnector->dc_sink =dc_link_add_remote_sink ( + dc_sink =dc_link_add_remote_sink ( aconnector->dc_link, (uint8_t *)edid, (edid->extensions +1 ) *EDID_LENGTH , &init_params); + + dc_sink->priv = aconnector; + aconnector->dc_sink = dc_sink; +if (aconnector->dc_sink) amdgpu_dm_add_sink_to_freesync_module( connector,
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -719,6 +719,7 @@ struct dc_sink {struct dc_container_id *dc_container_id;uint32_t dongle_max_pix_clk;bool converter_disable_audio; +void *priv; };void dc_sink_retain (const struct dc_sink *sink);
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/16 drm/amd/display: Fix i2c write flag.
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
I2C_M_RD was translated to write instead of read.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -422,7 +422,7 @@ bool dm_helpers_submit_i2c(return false;for (i =0 ; i < num; i++) { - msgs[i].flags = cmd->payloads[i].write ?I2C_M_RD :0 ; + msgs[i].flags = cmd->payloads[i].write ?0 :I2C_M_RD ; msgs[i].addr = cmd->payloads[i].address; msgs[i].len = cmd->payloads[i].length; msgs[i].buf = cmd->payloads[i].data;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +1 -1
@@ -2121,7 +2121,7 @@ int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap, cmd.speed =100 ;for (i =0 ; i < num; i++) { - cmd.payloads[i].write = (msgs[i].flags &I2C_M_RD ); + cmd.payloads[i].write = !(msgs[i].flags &I2C_M_RD ); cmd.payloads[i].address = msgs[i].addr; cmd.payloads[i].length = msgs[i].len; cmd.payloads[i].data = msgs[i].buf;
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/16 drm/amd/display: Refactor edid read.
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
Allow Linux to use DRM provided EDID read functioality by moving DAL edid implementation to module hence removing this code from DC by this cleaning up DC code for upstream.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 47 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 47 ++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 10 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 78 ++++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 53 +-- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 337 +----------------- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 30 +- drivers/gpu/drm/amd/display/dc/dc.h | 21 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 6 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 10 + drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 9 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 38 +- .../drm/amd/display/include/ddc_service_types.h | 28 -- .../gpu/drm/amd/display/include/i2caux_interface.h | 3 + .../amd/display/modules/ddc_service/ddc_service.c | 381 +++++++++++++++++++++ .../drm/amd/display/modules/inc/mod_ddc_service.h | 64 ++++ 17 files changed, 699 insertions(+), 465 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/modules/ddc_service/ddc_service.c create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_ddc_service.h
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +47 -0
@@ -434,3 +434,50 @@ bool dm_helpers_submit_i2c(return result; } + +enum dc_edid_status dm_helpers_read_local_edid ( +struct dc_context *ctx, +struct dc_link *link, +struct dc_sink *sink) +{ +struct amdgpu_connector *aconnector = link->priv; +struct i2c_adapter *ddc; +int retry =3 ; +enum dc_edid_status edid_status; +struct edid *edid; + +if (link->aux_mode) + ddc = &aconnector->dm_dp_aux.aux.ddc; +else + ddc = &aconnector->i2c->base; + +/* some dongles read edid incorrectly the first time, +* do check sum and retry to make sure read correct edid. +*/ +do { + + edid =drm_get_edid (&aconnector->base, ddc); + +if (!edid) +return EDID_NO_RESPONSE ; + + sink->dc_edid.length =EDID_LENGTH * (edid->extensions +1 ); +memmove (sink->dc_edid.raw_edid, (uint8_t *)edid, sink->dc_edid.length); + +/* We don't need the original edid anymore */ +kfree (edid); + + edid_status =dm_helpers_parse_edid_caps ( + ctx, + &sink->dc_edid, + &sink->edid_caps); + + }while (edid_status ==EDID_BAD_CHECKSUM && --retry >0 ); + +if (edid_status !=EDID_OK ) +DRM_ERROR ("EDID err: %d, on connector: %s" , + edid_status, + aconnector->base.name); + +return edid_status; +}
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +33 -14
64 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +1 -1
@@ -29,7 +29,7 @@struct amdgpu_display_manager ;struct amdgpu_connector ; -void amdgpu_dm_initialize_mst_connector ( +void amdgpu_dm_initialize_dp_connector (struct amdgpu_display_manager *dm,struct amdgpu_connector *aconnector);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +6 -4
@@ -2220,7 +2220,7 @@ int amdgpu_dm_connector_init(if (connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector_type == DRM_MODE_CONNECTOR_eDP) -amdgpu_dm_initialize_mst_connector (dm, aconnector); +amdgpu_dm_initialize_dp_connector (dm, aconnector);#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE ) ||\ defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE )
@@ -3211,9 +3211,11 @@ static bool is_dp_capable_without_timing_msa(uint8_t dpcd_data;bool capable = false;if (amdgpu_connector->dc_link && -dc_read_dpcd (dc, amdgpu_connector->dc_link->link_index, -DP_DOWN_STREAM_PORT_COUNT , - &dpcd_data,sizeof (dpcd_data)) ) +dc_read_aux_dpcd ( + dc, + amdgpu_connector->dc_link->link_index, +DP_DOWN_STREAM_PORT_COUNT , + &dpcd_data,sizeof (dpcd_data))) capable = (dpcd_data &DP_MSA_TIMING_PAR_IGNORED ) ? true:false;return capable;
drivers/gpu/drm/amd/display/dc/core/dc.c +61 -17
124 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link.c +14 -39
77 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +9 -328
389 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +17 -13
@@ -1481,22 +1481,25 @@ static bool handle_hpd_irq_psr_sink(const struct core_link *link)if (link->public.psr_caps.psr_version ==0 )return false; -dal_ddc_service_read_dpcd_data ( - link->ddc, -368 /*DpcdAddress_PSR_Enable_Cfg*/ , - &psr_configuration.raw, -sizeof (psr_configuration.raw)); +dm_helpers_dp_read_dpcd ( + link->ctx, + &link->public, +368 ,/*DpcdAddress_PSR_Enable_Cfg*/ + &psr_configuration.raw, +sizeof (psr_configuration.raw)); +if (psr_configuration.bits.ENABLE) {unsigned char dpcdbuf[3 ] = {0 };union psr_error_status psr_error_status;union psr_sink_psr_status psr_sink_psr_status; -dal_ddc_service_read_dpcd_data ( - link->ddc, -0x2006 /*DpcdAddress_PSR_Error_Status*/ , - (unsigned char *) dpcdbuf, -sizeof (dpcdbuf)); +dm_helpers_dp_read_dpcd ( + link->ctx, + &link->public, +0x2006 ,/*DpcdAddress_PSR_Error_Status*/ + (unsigned char *) dpcdbuf, +sizeof (dpcdbuf));/*DPCD 2006h ERROR STATUS*/ psr_error_status.raw = dpcdbuf[0 ];
@@ -1506,9 +1509,10 @@ static bool handle_hpd_irq_psr_sink(const struct core_link *link)if (psr_error_status.bits.LINK_CRC_ERROR || psr_error_status.bits.RFB_STORAGE_ERROR) {/* Acknowledge and clear error bits */ -dal_ddc_service_write_dpcd_data ( - link->ddc, -8198 /*DpcdAddress_PSR_Error_Status*/ , +dm_helpers_dp_write_dpcd ( + link->ctx, + &link->public, +8198 ,/*DpcdAddress_PSR_Error_Status*/ &psr_error_status.raw,sizeof (psr_error_status.raw));
drivers/gpu/drm/amd/display/dc/dc.h +19 -2
@@ -594,6 +594,7 @@ struct dc_link {union compliance_test_state compliance_test_state;void *priv; +bool aux_mode; };struct dpcd_caps {
@@ -788,20 +789,36 @@ const struct ddc_service *dc_get_ddc_at_index(* DPCD access interfaces */ -bool dc_read_dpcd ( +bool dc_read_aux_dpcd (struct dc *dc,uint32_t link_index,uint32_t address,uint8_t *data,uint32_t size); -bool dc_write_dpcd ( +bool dc_write_aux_dpcd (struct dc *dc,uint32_t link_index,uint32_t address,const uint8_t *data,uint32_t size); +bool dc_read_aux_i2c ( +struct dc *dc, +uint32_t link_index, +enum i2c_mot_mode mot, +uint32_t address, +uint8_t *data, +uint32_t size); + +bool dc_write_aux_i2c ( +struct dc *dc, +uint32_t link_index, +enum i2c_mot_mode mot, +uint32_t address, +const uint8_t *data, +uint32_t size); + bool dc_query_ddc_data( struct dc *dc, uint32_t link_index,
drivers/gpu/drm/amd/display/dc/dc_types.h +6 -0
@@ -489,4 +489,10 @@ struct psr_caps { unsigned int psr_sdp_transmit_line_num_deadline; }; +enum i2c_mot_mode { +I2C_MOT_UNDEF , +I2C_MOT_TRUE , +I2C_MOT_FALSE +}; +#endif /* DC_TYPES_H_ */
drivers/gpu/drm/amd/display/dc/dm_helpers.h +10 -0
@@ -98,4 +98,14 @@ bool dm_helpers_submit_i2c( struct i2c_command *cmd); + + + + +enum dc_edid_status dm_helpers_read_local_edid ( +struct dc_context *ctx, +struct dc_link *link, +struct dc_sink *sink); + +#endif /* __DM_HELPERS__ */
drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c +6 -3
@@ -185,6 +185,7 @@ bool dal_i2caux_submit_aux_command(struct aux_engine *engine;uint8_t index_of_payload =0 ;bool result; +bool mot;if (!ddc) {BREAK_TO_DEBUGGER ();
@@ -207,12 +208,14 @@ bool dal_i2caux_submit_aux_command( result = true;while (index_of_payload < cmd->number_of_payloads) { -bool mot = (index_of_payload != cmd->number_of_payloads -1 ); -struct aux_payload *payload = cmd->payloads + index_of_payload; -struct i2caux_transaction_request request = {0 }; +if (cmd->mot ==I2C_MOT_UNDEF ) + mot = (index_of_payload != cmd->number_of_payloads -1 ); +else + mot = (cmd->mot ==I2C_MOT_TRUE ); + request.operation = payload->write ?I2CAUX_TRANSACTION_WRITE :I2CAUX_TRANSACTION_READ ;
drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h +22 -16
@@ -31,6 +31,23 @@#define EDID_SEGMENT_SIZE 256 +/* Address range from 0x00 to 0x1F.*/ +#define DP_ADAPTOR_TYPE2_SIZE 0x20 +#define DP_ADAPTOR_TYPE2_REG_ID 0x10 +#define DP_ADAPTOR_TYPE2_REG_MAX_TMDS_CLK 0x1D +/* Identifies adaptor as Dual-mode adaptor */ +#define DP_ADAPTOR_TYPE2_ID 0xA0 +/* MHz*/ +#define DP_ADAPTOR_TYPE2_MAX_TMDS_CLK 600 +/* MHz*/ +#define DP_ADAPTOR_TYPE2_MIN_TMDS_CLK 25 +/* kHZ*/ +#define DP_ADAPTOR_DVI_MAX_TMDS_CLK 165000 +/* kHZ*/ +#define DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK 165000 + +#define DDC_I2C_COMMAND_ENGINE I2C_COMMAND_ENGINE_SW +struct ddc_service ;struct graphics_object_id ;enum ddc_result ;
@@ -83,12 +100,6 @@ void dal_ddc_service_set_transaction_type(bool dal_ddc_service_is_in_aux_transaction_mode (struct ddc_service *ddc); -uint32_t dal_ddc_service_edid_query (struct ddc_service *ddc); - -uint32_t dal_ddc_service_get_edid_buf_len (struct ddc_service *ddc); - -void dal_ddc_service_get_edid_buf (struct ddc_service *ddc,uint8_t *edid_buf); -void dal_ddc_service_i2c_query_dp_dual_mode_adaptor (struct ddc_service *ddc,struct display_sink_capability *sink_cap);
@@ -103,12 +114,16 @@ bool dal_ddc_service_query_ddc_data(enum ddc_result dal_ddc_service_read_dpcd_data (struct ddc_service *ddc, +bool i2c, +enum i2c_mot_mode mot,uint32_t address,uint8_t *data,uint32_t len);enum ddc_result dal_ddc_service_write_dpcd_data (struct ddc_service *ddc, +bool i2c, +enum i2c_mot_mode mot,uint32_t address,const uint8_t *data,uint32_t len);
@@ -130,16 +145,7 @@ void dal_ddc_service_set_ddc_pin(struct ddc *dal_ddc_service_get_ddc_pin (struct ddc_service *ddc_service); -enum ddc_result dal_ddc_service_read_dpcd_data ( -struct ddc_service *ddc, -uint32_t address, -uint8_t *data, -uint32_t len); -enum ddc_result dal_ddc_service_write_dpcd_data ( -struct ddc_service *ddc, -uint32_t address, -const uint8_t *data, -uint32_t len); +uint32_t get_defer_delay (struct ddc_service *ddc);#endif /* __DAL_DDC_SERVICE_H__ */
drivers/gpu/drm/amd/display/include/ddc_service_types.h +0 -28
@@ -115,34 +115,6 @@ struct av_sync_data {uint8_t aud_del_ins3;/* DPCD 0002Dh */ }; -/** EDID retrieval related constants, also used by MstMgr **/ - -#define DDC_EDID_SEGMENT_SIZE 256 -#define DDC_EDID_BLOCK_SIZE 128 -#define DDC_EDID_BLOCKS_PER_SEGMENT \ - (DDC_EDID_SEGMENT_SIZE / DDC_EDID_BLOCK_SIZE) - -#define DDC_EDID_EXT_COUNT_OFFSET 0x7E - -#define DDC_EDID_ADDRESS_START 0x50 -#define DDC_EDID_ADDRESS_END 0x52 -#define DDC_EDID_SEGMENT_ADDRESS 0x30 - -/* signatures for Edid 1x */ -#define DDC_EDID1X_VENDORID_SIGNATURE_OFFSET 8 -#define DDC_EDID1X_VENDORID_SIGNATURE_LEN 4 -#define DDC_EDID1X_EXT_CNT_AND_CHECKSUM_OFFSET 126 -#define DDC_EDID1X_EXT_CNT_AND_CHECKSUM_LEN 2 -#define DDC_EDID1X_CHECKSUM_OFFSET 127 -/* signatures for Edid 20*/ -#define DDC_EDID_20_SIGNATURE_OFFSET 0 -#define DDC_EDID_20_SIGNATURE 0x20 - -#define DDC_EDID20_VENDORID_SIGNATURE_OFFSET 1 -#define DDC_EDID20_VENDORID_SIGNATURE_LEN 4 -#define DDC_EDID20_CHECKSUM_OFFSET 255 -#define DDC_EDID20_CHECKSUM_LEN 1 -/*DP to VGA converter*/ static const uint8_t DP_VGA_CONVERTER_ID_1 [] ="mVGAa" ;/*DP to Dual link DVI converter*/
drivers/gpu/drm/amd/display/include/i2caux_interface.h +3 -0
@@ -26,6 +26,7 @@#ifndef __DAL_I2CAUX_INTERFACE_H__#define __DAL_I2CAUX_INTERFACE_H__ +#include "dc_types.h" #include "gpio_service_interface.h"
@@ -54,6 +55,8 @@ struct aux_command {/* zero means "use default value" */ uint32_t max_defer_write_retry; + +enum i2c_mot_mode mot; };union aux_config {
drivers/gpu/drm/amd/display/modules/ddc_service/ddc_service.c new file +381 -0
381 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/inc/mod_ddc_service.h new file +64 -0
64 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/16 drm/amd/display: PSR Aux Channel and Static Screen Support Fix
In reply to a message not in the archiveFrom: Amy Zhang <[email protected]>
- Correct the aux channel selection according to DAL3
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +0 -2
@@ -1482,8 +1482,6 @@ bool dc_link_setup_psr(const struct dc_link *dc_link, sizeof(psr_configuration.raw)); psr_context.channel = link->ddc->ddc_pin->hw_info.ddc_channel; -if (psr_context.channel ==0 ) - psr_context.channel =1 ; psr_context.transmitterId = link->link_enc->transmitter; psr_context.engineId = link->link_enc->preferred_engine;
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/16 drm/amd/display: Fill in vrefresh and min_vblank_time for dce8/dce10
In reply to a message not in the archiveFrom: Jordan Lazare <[email protected]>
PPLib is now calling into DC to get vrefresh and min_vblank_time, but since full bandwidth calcs are missing for those generations, the pplib structures were never being filled. This change fills the currently required fields to prevent screen corruption.
--- .../drm/amd/display/dc/dce100/dce100_hw_sequencer.c | 21 +++++++++++++++++++++ .../drm/amd/display/dc/dce100/dce100_hw_sequencer.h | 5 +++++ .../drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 8 ++++---- .../drm/amd/display/dc/dce110/dce110_hw_sequencer.h | 8 ++++++++ .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 2 ++ 5 files changed, 40 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.c +21 -0
@@ -104,6 +104,26 @@ static bool dce100_enable_display_power_gating(return false; } +void dce100_pplib_apply_display_requirements ( +struct core_dc *dc, +struct validate_context *context) +{ +struct dm_pp_display_configuration *pp_display_cfg = &context->pp_display_cfg; + + pp_display_cfg->avail_mclk_switch_time_us = +dce110_get_min_vblank_time_us (context); + +dce110_fill_display_configs (context, pp_display_cfg); + +if (memcmp (&dc->prev_display_config, pp_display_cfg,sizeof ( +struct dm_pp_display_configuration )) !=0 ) +dm_pp_apply_display_requirements (dc->ctx, pp_display_cfg); + + dc->prev_display_config = *pp_display_cfg; +} + + +static void set_displaymarks (const struct core_dc *dc,struct validate_context *context) {
@@ -116,6 +136,7 @@ static void set_bandwidth( bool decrease_allowed) { dc->hwss.set_displaymarks (dc, context); +dce100_pplib_apply_display_requirements (dc, context); }
drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h +5 -0
@@ -29,8 +29,13 @@#include "core_types.h" struct core_dc ; +struct validate_context ;bool dce100_hw_sequencer_construct (struct core_dc *dc); +void dce100_pplib_apply_display_requirements ( +struct core_dc *dc, +struct validate_context *context); +#endif /* __DC_HWSS_DCE100_H__ */
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +4 -4
@@ -2097,7 +2097,7 @@ static void init_hw(struct core_dc *dc) } } -static void fill_display_configs ( +void dce110_fill_display_configs (const struct validate_context *context,struct dm_pp_display_configuration *pp_display_cfg) {
@@ -2146,7 +2146,7 @@ static void fill_display_configs( pp_display_cfg->display_count = num_cfgs; } -static uint32_t get_min_vblank_time_us (const struct validate_context *context) +uint32_t dce110_get_min_vblank_time_us (const struct validate_context *context) {uint8_t j;uint32_t min_vertical_blank_time =-1 ;
@@ -2224,13 +2224,13 @@ static void pplib_apply_display_requirements( = context->bw_results.required_sclk_deep_sleep; pp_display_cfg->avail_mclk_switch_time_us = -get_min_vblank_time_us (context); +dce110_get_min_vblank_time_us (context);/* TODO: dce11.2*/ pp_display_cfg->avail_mclk_switch_time_in_disp_active_us =0 ; pp_display_cfg->disp_clk_khz = context->dispclk_khz; -fill_display_configs (context, pp_display_cfg); +dce110_fill_display_configs (context, pp_display_cfg);/* TODO: is this still applicable?*/ if (pp_display_cfg->display_count ==1 ) {
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.h +8 -0
@@ -30,6 +30,8 @@#define GAMMA_HW_POINTS_NUM 256struct core_dc ; +struct validate_context ; +struct dm_pp_display_configuration ;bool dce110_hw_sequencer_construct (struct core_dc *dc);
@@ -58,5 +60,11 @@ void dce110_power_down(struct core_dc *dc);void dce110_update_pending_status (struct pipe_ctx *pipe_ctx); +void dce110_fill_display_configs ( +const struct validate_context *context, +struct dm_pp_display_configuration *pp_display_cfg); + +uint32_t dce110_get_min_vblank_time_us (const struct validate_context *context); +#endif /* __DC_HWSS_DCE110_H__ */
drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c +2 -0
@@ -31,6 +31,7 @@#include "dce/dce_hwseq.h" #include "dce110/dce110_hw_sequencer.h" +#include "dce100/dce100_hw_sequencer.h" /* include DCE8 register header files */ #include "dce/dce_8_0_d.h"
@@ -118,6 +119,7 @@ static void set_bandwidth( bool decrease_allowed) { dc->hwss.set_displaymarks (dc, context); +dce100_pplib_apply_display_requirements (dc, context); }
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/16 drm/amd/display: Ignore visible flag when check surface update type.
In reply to a message not in the archiveFrom: Yongqiang Sun <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -1
@@ -1046,10 +1046,10 @@ static enum surface_update_type get_plane_info_update_type( temp_plane_info.rotation = u->surface->rotation; temp_plane_info.stereo_format = u->surface->stereo_format; temp_plane_info.tiling_info = u->surface->tiling_info; - temp_plane_info.visible = u->surface->visible;/* Special Validation parameters */ temp_plane_info.format = u->plane_info->format; + temp_plane_info.visible = u->plane_info->visible;if (memcmp (u->plane_info, &temp_plane_info,sizeof (struct dc_plane_info )) !=0 )
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/16 drm/amd/display: Log clock source in error condition
In reply to a message not in the archiveFrom: Jordan Lazare <[email protected]>
--- drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c +2 -1
@@ -187,6 +187,7 @@ void dce_crtc_switch_to_clk_src(struct dce_hwseq *hws,REG_UPDATE (PHYPLL_PIXEL_RATE_CNTL [tg_inst],PIXEL_RATE_PLL_SOURCE ,1 ); }else { -DC_ERR ("unknown clock source" ); +DC_ERR ("Unknown clock source. clk_src id: %d, TG_inst: %d" , + clk_src->id, tg_inst); } }
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/16 drm/amd/display: Fix s3 hang on resume.
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
Avoid enabling CRTC_VERTICAL_INTERRUPT0 twice on resume. It's enabled once from within manage_dm_interrupts in mode set and another explicitly from amdgpu_dm_irq_resume_late. Seems it lead to CRTC hang.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 16 +++++++++++----- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -581,7 +581,7 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev ) ret =drm_atomic_helper_resume (ddev, adev->dm.cached_state); -amdgpu_dm_irq_resume (adev); +amdgpu_dm_irq_resume_late (adev);return ret; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +11 -5
@@ -504,8 +504,11 @@ int amdgpu_dm_irq_suspend(DRM_DEBUG_KMS ("DM_IRQ: suspend\n" ); -/* disable HW interrupt */ -for (src =DC_IRQ_SOURCE_HPD1 ; src <DAL_IRQ_SOURCES_NUMBER ; src++) { +/** +* Disable HW interrupt for HPD and HPDRX only since FLIP and VBLANK +* will be disabled from manage_dm_interrupts on disable CRTC. +*/ +for (src =DC_IRQ_SOURCE_HPD1 ; src <DC_IRQ_SOURCE_HPD6RX ; src++) { hnd_list_l = &adev->dm.irq_handler_list_low_tab[src].head; hnd_list_h = &adev->dm.irq_handler_list_high_tab[src];if (!list_empty (hnd_list_l) || !list_empty (hnd_list_h))
@@ -544,7 +547,7 @@ int amdgpu_dm_irq_resume_early(struct amdgpu_device *adev)return 0 ; } -int amdgpu_dm_irq_resume (struct amdgpu_device *adev) +int amdgpu_dm_irq_resume_late (struct amdgpu_device *adev) {int src;struct list_head *hnd_list_h, *hnd_list_l;
@@ -554,8 +557,11 @@ int amdgpu_dm_irq_resume(struct amdgpu_device *adev)DRM_DEBUG_KMS ("DM_IRQ: resume\n" ); -/* re-enable HW interrupt */ -for (src =DC_IRQ_SOURCE_HPD1 ; src <DAL_IRQ_SOURCES_NUMBER ; src++) { +/** +* Renable HW interrupt for HPD and only since FLIP and VBLANK +* will be enabled from manage_dm_interrupts on enable CRTC. +*/ +for (src =DC_IRQ_SOURCE_HPD1 ; src <DC_IRQ_SOURCE_HPD6 ; src++) { hnd_list_l = &adev->dm.irq_handler_list_low_tab[src].head; hnd_list_h = &adev->dm.irq_handler_list_high_tab[src];if (!list_empty (hnd_list_l) || !list_empty (hnd_list_h))
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h +1 -1
@@ -117,6 +117,6 @@ int amdgpu_dm_irq_suspend(struct amdgpu_device *adev);* */ int amdgpu_dm_irq_resume_early (struct amdgpu_device *adev); -int amdgpu_dm_irq_resume (struct amdgpu_device *adev); +int amdgpu_dm_irq_resume_late (struct amdgpu_device *adev);#endif /* __AMDGPU_DM_IRQ_H__ */
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx