diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.h | 12 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h index 8405b5a367d7..7e3545f65257 100644 --- a/drivers/gpu/drm/i915/intel_bios.h +++ b/drivers/gpu/drm/i915/intel_bios.h | |||
| @@ -46,14 +46,20 @@ struct edp_power_seq { | |||
| 46 | u16 t11_t12; | 46 | u16 t11_t12; |
| 47 | } __packed; | 47 | } __packed; |
| 48 | 48 | ||
| 49 | /* MIPI Sequence Block definitions */ | 49 | /* |
| 50 | * MIPI Sequence Block definitions | ||
| 51 | * | ||
| 52 | * Note the VBT spec has AssertReset / DeassertReset swapped from their | ||
| 53 | * usual naming, we use the proper names here to avoid confusion when | ||
| 54 | * reading the code. | ||
| 55 | */ | ||
| 50 | enum mipi_seq { | 56 | enum mipi_seq { |
| 51 | MIPI_SEQ_END = 0, | 57 | MIPI_SEQ_END = 0, |
| 52 | MIPI_SEQ_ASSERT_RESET, | 58 | MIPI_SEQ_DEASSERT_RESET, /* Spec says MipiAssertResetPin */ |
| 53 | MIPI_SEQ_INIT_OTP, | 59 | MIPI_SEQ_INIT_OTP, |
| 54 | MIPI_SEQ_DISPLAY_ON, | 60 | MIPI_SEQ_DISPLAY_ON, |
| 55 | MIPI_SEQ_DISPLAY_OFF, | 61 | MIPI_SEQ_DISPLAY_OFF, |
| 56 | MIPI_SEQ_DEASSERT_RESET, | 62 | MIPI_SEQ_ASSERT_RESET, /* Spec says MipiDeassertResetPin */ |
| 57 | MIPI_SEQ_BACKLIGHT_ON, /* sequence block v2+ */ | 63 | MIPI_SEQ_BACKLIGHT_ON, /* sequence block v2+ */ |
| 58 | MIPI_SEQ_BACKLIGHT_OFF, /* sequence block v2+ */ | 64 | MIPI_SEQ_BACKLIGHT_OFF, /* sequence block v2+ */ |
| 59 | MIPI_SEQ_TEAR_ON, /* sequence block v2+ */ | 65 | MIPI_SEQ_TEAR_ON, /* sequence block v2+ */ |
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c index 0d8ff0034b88..579d2f570717 100644 --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | |||
| @@ -376,11 +376,11 @@ static const fn_mipi_elem_exec exec_elem[] = { | |||
| 376 | */ | 376 | */ |
| 377 | 377 | ||
| 378 | static const char * const seq_name[] = { | 378 | static const char * const seq_name[] = { |
| 379 | [MIPI_SEQ_ASSERT_RESET] = "MIPI_SEQ_ASSERT_RESET", | 379 | [MIPI_SEQ_DEASSERT_RESET] = "MIPI_SEQ_DEASSERT_RESET", |
| 380 | [MIPI_SEQ_INIT_OTP] = "MIPI_SEQ_INIT_OTP", | 380 | [MIPI_SEQ_INIT_OTP] = "MIPI_SEQ_INIT_OTP", |
| 381 | [MIPI_SEQ_DISPLAY_ON] = "MIPI_SEQ_DISPLAY_ON", | 381 | [MIPI_SEQ_DISPLAY_ON] = "MIPI_SEQ_DISPLAY_ON", |
| 382 | [MIPI_SEQ_DISPLAY_OFF] = "MIPI_SEQ_DISPLAY_OFF", | 382 | [MIPI_SEQ_DISPLAY_OFF] = "MIPI_SEQ_DISPLAY_OFF", |
| 383 | [MIPI_SEQ_DEASSERT_RESET] = "MIPI_SEQ_DEASSERT_RESET", | 383 | [MIPI_SEQ_ASSERT_RESET] = "MIPI_SEQ_ASSERT_RESET", |
| 384 | [MIPI_SEQ_BACKLIGHT_ON] = "MIPI_SEQ_BACKLIGHT_ON", | 384 | [MIPI_SEQ_BACKLIGHT_ON] = "MIPI_SEQ_BACKLIGHT_ON", |
| 385 | [MIPI_SEQ_BACKLIGHT_OFF] = "MIPI_SEQ_BACKLIGHT_OFF", | 385 | [MIPI_SEQ_BACKLIGHT_OFF] = "MIPI_SEQ_BACKLIGHT_OFF", |
| 386 | [MIPI_SEQ_TEAR_ON] = "MIPI_SEQ_TEAR_ON", | 386 | [MIPI_SEQ_TEAR_ON] = "MIPI_SEQ_TEAR_ON", |
