UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: refactor Device ID for external chips 

IEEE OUI will now be used while referring to certain vendors.
instead of normal index

Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Qingqing Zhuo 2019-07-31 18:11:16 -04:00 committed by Alex Deucher
parent 7f6e7186f9
commit df3b7e32ed
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
View File

@ -294,7 +294,7 @@ static uint32_t defer_delay_converter_wa(
{ {
struct dc_link *link = ddc->link; struct dc_link *link = ddc->link;
if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_4 && if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_0080E1 &&
!memcmp(link->dpcd_caps.branch_dev_name, !memcmp(link->dpcd_caps.branch_dev_name,
DP_DVI_CONVERTER_ID_4, DP_DVI_CONVERTER_ID_4,
sizeof(link->dpcd_caps.branch_dev_name))) sizeof(link->dpcd_caps.branch_dev_name)))

21
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
View File

@ -2684,13 +2684,13 @@ static void dp_wa_power_up_0010FA(struct dc_link *link, uint8_t *dpcd_data,
if (link->dpcd_caps.dongle_type == DISPLAY_DONGLE_DP_VGA_CONVERTER) { if (link->dpcd_caps.dongle_type == DISPLAY_DONGLE_DP_VGA_CONVERTER) {
switch (link->dpcd_caps.branch_dev_id) { switch (link->dpcd_caps.branch_dev_id) {
/* Some active dongles (DP-VGA, DP-DLDVI converters) power down /* 0010FA active dongles (DP-VGA, DP-DLDVI converters) power down
* all internal circuits including AUX communication preventing * all internal circuits including AUX communication preventing
* reading DPCD table and EDID (spec violation). * reading DPCD table and EDID (spec violation).
* Encoder will skip DP RX power down on disable_output to * Encoder will skip DP RX power down on disable_output to
* keep receiver powered all the time.*/ * keep receiver powered all the time.*/
case DP_BRANCH_DEVICE_ID_1: case DP_BRANCH_DEVICE_ID_0010FA:
case DP_BRANCH_DEVICE_ID_4: case DP_BRANCH_DEVICE_ID_0080E1:
link->wa_flags.dp_keep_receiver_powered = true; link->wa_flags.dp_keep_receiver_powered = true;
break; break;
@ -3394,7 +3394,13 @@ enum dp_panel_mode dp_get_panel_mode(struct dc_link *link)
if (link->connector_signal != SIGNAL_TYPE_DISPLAY_PORT) { if (link->connector_signal != SIGNAL_TYPE_DISPLAY_PORT) {
switch (link->dpcd_caps.branch_dev_id) { switch (link->dpcd_caps.branch_dev_id) {
case DP_BRANCH_DEVICE_ID_2: case DP_BRANCH_DEVICE_ID_0022B9:
/* alternate scrambler reset is required for Travis
* for the case when external chip does not
* provide sink device id, alternate scrambler
* scheme will be overriden later by querying
* Encoder features
*/
if (strncmp( if (strncmp(
link->dpcd_caps.branch_dev_name, link->dpcd_caps.branch_dev_name,
DP_VGA_LVDS_CONVERTER_ID_2, DP_VGA_LVDS_CONVERTER_ID_2,
@ -3404,7 +3410,12 @@ enum dp_panel_mode dp_get_panel_mode(struct dc_link *link)
return DP_PANEL_MODE_SPECIAL; return DP_PANEL_MODE_SPECIAL;
} }
break; break;
case DP_BRANCH_DEVICE_ID_3: case DP_BRANCH_DEVICE_ID_00001A:
/* alternate scrambler reset is required for Travis
* for the case when external chip does not provide
* sink device id, alternate scrambler scheme will
* be overriden later by querying Encoder feature
*/
if (strncmp(link->dpcd_caps.branch_dev_name, if (strncmp(link->dpcd_caps.branch_dev_name,
DP_VGA_LVDS_CONVERTER_ID_3, DP_VGA_LVDS_CONVERTER_ID_3,
sizeof( sizeof(

10
drivers/gpu/drm/amd/display/include/ddc_service_types.h
View File

@ -25,10 +25,12 @@
#ifndef __DAL_DDC_SERVICE_TYPES_H__ #ifndef __DAL_DDC_SERVICE_TYPES_H__
#define __DAL_DDC_SERVICE_TYPES_H__ #define __DAL_DDC_SERVICE_TYPES_H__
#define DP_BRANCH_DEVICE_ID_1 0x0010FA /* 0010FA dongles (ST Micro) external converter chip id */
#define DP_BRANCH_DEVICE_ID_2 0x0022B9 #define DP_BRANCH_DEVICE_ID_0010FA 0x0010FA
#define DP_BRANCH_DEVICE_ID_3 0x00001A /* 0022B9 external converter chip id */
#define DP_BRANCH_DEVICE_ID_4 0x0080e1 #define DP_BRANCH_DEVICE_ID_0022B9 0x0022B9
#define DP_BRANCH_DEVICE_ID_00001A 0x00001A
#define DP_BRANCH_DEVICE_ID_0080E1 0x0080e1
enum ddc_result { enum ddc_result {
DDC_RESULT_UNKNOWN = 0, DDC_RESULT_UNKNOWN = 0,