summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2017-08-28 15:13:40 +0300
committerJani Nikula <jani.nikula@intel.com>2017-08-29 17:27:34 +0300
commit2cbcc0b4a06166243e0d4c177882d93077938331 (patch)
tree0ce05b6026b46d8f70e9097162fceddfc4845574
parent3b163c4809519c8e5baa02bcf01bd3d3efadc8eb (diff)
tools/intel_vbt_decode: migrate backlight dumping to kernel struct
Drop obsolete field dumping. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r--tools/intel_bios.h16
-rw-r--r--tools/intel_vbt_decode.c20
2 files changed, 8 insertions, 28 deletions
diff --git a/tools/intel_bios.h b/tools/intel_bios.h
index 85aa38e0..4e06ef74 100644
--- a/tools/intel_bios.h
+++ b/tools/intel_bios.h
@@ -83,22 +83,6 @@ struct bdb_child_devices {
struct legacy_child_device_config children[DEVICE_CHILD_SIZE];
} __attribute__ ((packed));
-struct blc_struct {
- uint8_t inverter_type:2;
- uint8_t inverter_polarity:1; /* 1 means inverted (0 = max brightness) */
- uint8_t gpio_pins:3;
- uint8_t gmbus_speed:2;
- uint16_t pwm_freq; /* in Hz */
- uint8_t min_brightness; /* (0-255) */
- uint8_t i2c_slave_addr;
- uint8_t i2c_cmd;
-} __attribute__ ((packed));
-
-struct bdb_lvds_backlight {
- uint8_t blcstruct_size;
- struct blc_struct panels[16];
-} __attribute__ ((packed));
-
#define BDB_DRIVER_NO_LVDS 0
#define BDB_DRIVER_INT_LVDS 1
#define BDB_DRIVER_SDVO_LVDS 2
diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
index a3c4e3fc..948dc29d 100644
--- a/tools/intel_vbt_decode.c
+++ b/tools/intel_vbt_decode.c
@@ -225,25 +225,21 @@ static void dump_general_features(struct context *context,
static void dump_backlight_info(struct context *context,
const struct bdb_block *block)
{
- const struct bdb_lvds_backlight *backlight = block->data;
- const struct blc_struct *blc;
+ const struct bdb_lfp_backlight_data *backlight = block->data;
+ const struct bdb_lfp_backlight_data_entry *blc;
- if (sizeof(struct blc_struct) != backlight->blcstruct_size) {
+ if (sizeof(*blc) != backlight->entry_size) {
printf("\tBacklight struct sizes don't match (expected %zu, got %u), skipping\n",
- sizeof(struct blc_struct), backlight->blcstruct_size);
+ sizeof(*blc), backlight->entry_size);
return;
}
- blc = &backlight->panels[context->panel_type];
+ blc = &backlight->data[context->panel_type];
- printf("\tInverter type: %d\n", blc->inverter_type);
- printf("\t polarity: %d\n", blc->inverter_polarity);
- printf("\t GPIO pins: %d\n", blc->gpio_pins);
- printf("\t GMBUS speed: %d\n", blc->gmbus_speed);
- printf("\t PWM freq: %d\n", blc->pwm_freq);
+ printf("\tInverter type: %d\n", blc->type);
+ printf("\t polarity: %d\n", blc->active_low_pwm);
+ printf("\t PWM freq: %d\n", blc->pwm_freq_hz);
printf("\tMinimum brightness: %d\n", blc->min_brightness);
- printf("\tI2C slave addr: 0x%02x\n", blc->i2c_slave_addr);
- printf("\tI2C command: 0x%02x\n", blc->i2c_cmd);
}
static const struct {