Commit 843444ed authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/bios: sort BDB block definitions using block ID 



Make it easier to find the right blocks. No functional changes.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/56e1989940d83a670d087d531b7b6aa5dc4c0228.1559308269.git.jani.nikula@intel.com
parent 231dcffc

drivers/gpu/drm/i915/intel_vbt_defs.h

+186 −186
Original line number Diff line number Diff line
@@ -456,182 +456,30 @@ struct bdb_general_definitions { 
} __packed;



/*

 * Block 40 - LFP Data Block

 */



/* Mask for DRRS / Panel Channel / SSC / BLT control bits extraction */

#define MODE_MASK		0x3



struct bdb_lvds_options {

	u8 panel_type;

	u8 rsvd1;

	/* LVDS capabilities, stored in a dword */

	u8 pfit_mode:2;

	u8 pfit_text_mode_enhanced:1;

	u8 pfit_gfx_mode_enhanced:1;

	u8 pfit_ratio_auto:1;

	u8 pixel_dither:1;

	u8 lvds_edid:1;

	u8 rsvd2:1;

	u8 rsvd4;

	/* LVDS Panel channel bits stored here */

	u32 lvds_panel_channel_bits;

	/* LVDS SSC (Spread Spectrum Clock) bits stored here. */

	u16 ssc_bits;

	u16 ssc_freq;

	u16 ssc_ddt;

	/* Panel color depth defined here */

	u16 panel_color_depth;

	/* LVDS panel type bits stored here */

	u32 dps_panel_type_bits;

	/* LVDS backlight control type bits stored here */

	u32 blt_control_type_bits;

} __packed;



/*

 * Block 41 - LFP Data Table Pointers

 */



/* LFP pointer table contains entries to the struct below */

struct lvds_lfp_data_ptr {

	u16 fp_timing_offset; /* offsets are from start of bdb */

	u8 fp_table_size;

	u16 dvo_timing_offset;

	u8 dvo_table_size;

	u16 panel_pnp_id_offset;

	u8 pnp_table_size;

} __packed;



struct bdb_lvds_lfp_data_ptrs {

	u8 lvds_entries; /* followed by one or more lvds_data_ptr structs */

	struct lvds_lfp_data_ptr ptr[16];

} __packed;



/*

 * Block 42 - LFP Data Tables

 */



/* LFP data has 3 blocks per entry */

struct lvds_fp_timing {

	u16 x_res;

	u16 y_res;

	u32 lvds_reg;

	u32 lvds_reg_val;

	u32 pp_on_reg;

	u32 pp_on_reg_val;

	u32 pp_off_reg;

	u32 pp_off_reg_val;

	u32 pp_cycle_reg;

	u32 pp_cycle_reg_val;

	u32 pfit_reg;

	u32 pfit_reg_val;

	u16 terminator;

} __packed;



struct lvds_dvo_timing {

	u16 clock;		/**< In 10khz */

	u8 hactive_lo;

	u8 hblank_lo;

	u8 hblank_hi:4;

	u8 hactive_hi:4;

	u8 vactive_lo;

	u8 vblank_lo;

	u8 vblank_hi:4;

	u8 vactive_hi:4;

	u8 hsync_off_lo;

	u8 hsync_pulse_width_lo;

	u8 vsync_pulse_width_lo:4;

	u8 vsync_off_lo:4;

	u8 vsync_pulse_width_hi:2;

	u8 vsync_off_hi:2;

	u8 hsync_pulse_width_hi:2;

	u8 hsync_off_hi:2;

	u8 himage_lo;

	u8 vimage_lo;

	u8 vimage_hi:4;

	u8 himage_hi:4;

	u8 h_border;

	u8 v_border;

	u8 rsvd1:3;

	u8 digital:2;

	u8 vsync_positive:1;

	u8 hsync_positive:1;

	u8 non_interlaced:1;

} __packed;



struct lvds_pnp_id {

	u16 mfg_name;

	u16 product_code;

	u32 serial;

	u8 mfg_week;

	u8 mfg_year;

} __packed;



struct lvds_lfp_data_entry {

	struct lvds_fp_timing fp_timing;

	struct lvds_dvo_timing dvo_timing;

	struct lvds_pnp_id pnp_id;

} __packed;



struct bdb_lvds_lfp_data {

	struct lvds_lfp_data_entry data[16];

} __packed;



/*

 * Block 23 - SDVO LVDS Panel DTDs

 */



struct bdb_sdvo_panel_dtds {

	struct lvds_dvo_timing dtds[4];

} __packed;



/*

 * Block 43 - LFP Backlight Control Data Block

 * Block 9 - SRD Feature Block

 */



#define BDB_BACKLIGHT_TYPE_NONE	0

#define BDB_BACKLIGHT_TYPE_PWM	2

struct psr_table {

	/* Feature bits */

	u8 full_link:1;

	u8 require_aux_to_wakeup:1;

	u8 feature_bits_rsvd:6;



struct lfp_backlight_data_entry {

	u8 type:2;

	u8 active_low_pwm:1;

	u8 obsolete1:5;

	u16 pwm_freq_hz;

	u8 min_brightness;

	u8 obsolete2;

	u8 obsolete3;

} __packed;

	/* Wait times */

	u8 idle_frames:4;

	u8 lines_to_wait:3;

	u8 wait_times_rsvd:1;



struct lfp_backlight_control_method {

	u8 type:4;

	u8 controller:4;

} __packed;

	/* TP wake up time in multiple of 100 */

	u16 tp1_wakeup_time;

	u16 tp2_tp3_wakeup_time;



struct bdb_lfp_backlight_data {

	u8 entry_size;

	struct lfp_backlight_data_entry data[16];

	u8 level[16];

	struct lfp_backlight_control_method backlight_control[16];

	/* PSR2 TP2/TP3 wakeup time for 16 panels */

	u32 psr2_tp2_tp3_wakeup_time;

} __packed;



/*

 * Block 22 - SDVO LVDS General Options

 */



struct bdb_sdvo_lvds_options {

	u8 panel_backlight;

	u8 h40_set_panel_type;

	u8 panel_type;

	u8 ssc_clk_freq;

	u16 als_low_trip;

	u16 als_high_trip;

	u8 sclalarcoeff_tab_row_num;

	u8 sclalarcoeff_tab_row_size;

	u8 coefficient[8];

	u8 panel_misc_bits_1;

	u8 panel_misc_bits_2;

	u8 panel_misc_bits_3;

	u8 panel_misc_bits_4;

struct bdb_psr {

	struct psr_table psr_table[16];

} __packed;



/*
@@ -697,6 +545,65 @@ struct bdb_driver_features { 
	u16 pc_feature_valid:1;

} __packed;



/*

 * Block 22 - SDVO LVDS General Options

 */



struct bdb_sdvo_lvds_options {

	u8 panel_backlight;

	u8 h40_set_panel_type;

	u8 panel_type;

	u8 ssc_clk_freq;

	u16 als_low_trip;

	u16 als_high_trip;

	u8 sclalarcoeff_tab_row_num;

	u8 sclalarcoeff_tab_row_size;

	u8 coefficient[8];

	u8 panel_misc_bits_1;

	u8 panel_misc_bits_2;

	u8 panel_misc_bits_3;

	u8 panel_misc_bits_4;

} __packed;



/*

 * Block 23 - SDVO LVDS Panel DTDs

 */



struct lvds_dvo_timing {

	u16 clock;		/**< In 10khz */

	u8 hactive_lo;

	u8 hblank_lo;

	u8 hblank_hi:4;

	u8 hactive_hi:4;

	u8 vactive_lo;

	u8 vblank_lo;

	u8 vblank_hi:4;

	u8 vactive_hi:4;

	u8 hsync_off_lo;

	u8 hsync_pulse_width_lo;

	u8 vsync_pulse_width_lo:4;

	u8 vsync_off_lo:4;

	u8 vsync_pulse_width_hi:2;

	u8 vsync_off_hi:2;

	u8 hsync_pulse_width_hi:2;

	u8 hsync_off_hi:2;

	u8 himage_lo;

	u8 vimage_lo;

	u8 vimage_hi:4;

	u8 himage_hi:4;

	u8 h_border;

	u8 v_border;

	u8 rsvd1:3;

	u8 digital:2;

	u8 vsync_positive:1;

	u8 hsync_positive:1;

	u8 non_interlaced:1;

} __packed;



struct bdb_sdvo_panel_dtds {

	struct lvds_dvo_timing dtds[4];

} __packed;



/*

 * Block 27 - eDP VBT Block

 */
@@ -754,30 +661,123 @@ struct bdb_edp { 
} __packed;



/*

 * Block 9 - SRD Feature Block

 * Block 40 - LFP Data Block

 */



struct psr_table {

	/* Feature bits */

	u8 full_link:1;

	u8 require_aux_to_wakeup:1;

	u8 feature_bits_rsvd:6;

/* Mask for DRRS / Panel Channel / SSC / BLT control bits extraction */

#define MODE_MASK		0x3



	/* Wait times */

	u8 idle_frames:4;

	u8 lines_to_wait:3;

	u8 wait_times_rsvd:1;

struct bdb_lvds_options {

	u8 panel_type;

	u8 rsvd1;

	/* LVDS capabilities, stored in a dword */

	u8 pfit_mode:2;

	u8 pfit_text_mode_enhanced:1;

	u8 pfit_gfx_mode_enhanced:1;

	u8 pfit_ratio_auto:1;

	u8 pixel_dither:1;

	u8 lvds_edid:1;

	u8 rsvd2:1;

	u8 rsvd4;

	/* LVDS Panel channel bits stored here */

	u32 lvds_panel_channel_bits;

	/* LVDS SSC (Spread Spectrum Clock) bits stored here. */

	u16 ssc_bits;

	u16 ssc_freq;

	u16 ssc_ddt;

	/* Panel color depth defined here */

	u16 panel_color_depth;

	/* LVDS panel type bits stored here */

	u32 dps_panel_type_bits;

	/* LVDS backlight control type bits stored here */

	u32 blt_control_type_bits;

} __packed;



	/* TP wake up time in multiple of 100 */

	u16 tp1_wakeup_time;

	u16 tp2_tp3_wakeup_time;

/*

 * Block 41 - LFP Data Table Pointers

 */



	/* PSR2 TP2/TP3 wakeup time for 16 panels */

	u32 psr2_tp2_tp3_wakeup_time;

/* LFP pointer table contains entries to the struct below */

struct lvds_lfp_data_ptr {

	u16 fp_timing_offset; /* offsets are from start of bdb */

	u8 fp_table_size;

	u16 dvo_timing_offset;

	u8 dvo_table_size;

	u16 panel_pnp_id_offset;

	u8 pnp_table_size;

} __packed;



struct bdb_psr {

	struct psr_table psr_table[16];

struct bdb_lvds_lfp_data_ptrs {

	u8 lvds_entries; /* followed by one or more lvds_data_ptr structs */

	struct lvds_lfp_data_ptr ptr[16];

} __packed;



/*

 * Block 42 - LFP Data Tables

 */



/* LFP data has 3 blocks per entry */

struct lvds_fp_timing {

	u16 x_res;

	u16 y_res;

	u32 lvds_reg;

	u32 lvds_reg_val;

	u32 pp_on_reg;

	u32 pp_on_reg_val;

	u32 pp_off_reg;

	u32 pp_off_reg_val;

	u32 pp_cycle_reg;

	u32 pp_cycle_reg_val;

	u32 pfit_reg;

	u32 pfit_reg_val;

	u16 terminator;

} __packed;



struct lvds_pnp_id {

	u16 mfg_name;

	u16 product_code;

	u32 serial;

	u8 mfg_week;

	u8 mfg_year;

} __packed;



struct lvds_lfp_data_entry {

	struct lvds_fp_timing fp_timing;

	struct lvds_dvo_timing dvo_timing;

	struct lvds_pnp_id pnp_id;

} __packed;



struct bdb_lvds_lfp_data {

	struct lvds_lfp_data_entry data[16];

} __packed;



/*

 * Block 43 - LFP Backlight Control Data Block

 */



#define BDB_BACKLIGHT_TYPE_NONE	0

#define BDB_BACKLIGHT_TYPE_PWM	2



struct lfp_backlight_data_entry {

	u8 type:2;

	u8 active_low_pwm:1;

	u8 obsolete1:5;

	u16 pwm_freq_hz;

	u8 min_brightness;

	u8 obsolete2;

	u8 obsolete3;

} __packed;



struct lfp_backlight_control_method {

	u8 type:4;

	u8 controller:4;

} __packed;



struct bdb_lfp_backlight_data {

	u8 entry_size;

	struct lfp_backlight_data_entry data[16];

	u8 level[16];

	struct lfp_backlight_control_method backlight_control[16];

} __packed;



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE