Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drivers/gpu/drm/i915/display/intel_bios.c
Original file line number Diff line number Diff line change
Expand Up @@ -2747,8 +2747,10 @@ static int child_device_expected_size(u16 version)
{
BUILD_BUG_ON(sizeof(struct child_device_config) < 40);

if (version > 256)
if (version > 263)
return -ENOENT;
else if (version >= 263)
return 44;
else if (version >= 256)
return 40;
else if (version >= 216)
Expand Down
18 changes: 18 additions & 0 deletions drivers/gpu/drm/i915/display/intel_vbt_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,22 @@ enum vbt_gmbus_ddi {
#define BDB_230_VBT_DP_MAX_LINK_RATE_UHBR13P5 6
#define BDB_230_VBT_DP_MAX_LINK_RATE_UHBR20 7

/* EDP link rate 263+ */
#define BDB_263_VBT_EDP_LINK_RATE_1_62 BIT_U32(0)
#define BDB_263_VBT_EDP_LINK_RATE_2_16 BIT_U32(1)
#define BDB_263_VBT_EDP_LINK_RATE_2_43 BIT_U32(2)
#define BDB_263_VBT_EDP_LINK_RATE_2_7 BIT_U32(3)
#define BDB_263_VBT_EDP_LINK_RATE_3_24 BIT_U32(4)
#define BDB_263_VBT_EDP_LINK_RATE_4_32 BIT_U32(5)
#define BDB_263_VBT_EDP_LINK_RATE_5_4 BIT_U32(6)
#define BDB_263_VBT_EDP_LINK_RATE_6_75 BIT_U32(7)
#define BDB_263_VBT_EDP_LINK_RATE_8_1 BIT_U32(8)
#define BDB_263_VBT_EDP_LINK_RATE_10 BIT_U32(9)
#define BDB_263_VBT_EDP_LINK_RATE_13_5 BIT_U32(10)
#define BDB_263_VBT_EDP_LINK_RATE_20 BIT_U32(11)
#define BDB_263_VBT_EDP_NUM_RATES 12
#define BDB_263_VBT_EDP_RATES_MASK GENMASK(BDB_263_VBT_EDP_NUM_RATES - 1, 0)

/*
* The child device config, aka the display device data structure, provides a
* description of a port and its configuration on the platform.
Expand Down Expand Up @@ -547,6 +563,8 @@ struct child_device_config {
u8 dp_max_link_rate:3; /* 216+ */
u8 dp_max_link_rate_reserved:5; /* 216+ */
u8 efp_index; /* 256+ */
u32 edp_data_rate_override:12; /* 263+ */
u32 edp_data_rate_override_reserved:20; /* 263+ */
} __packed;

struct bdb_general_definitions {
Expand Down
Loading