drm: Add new DCS commands in the enum list
Subsystems (3)
PATCH 1/5 drm: Add new DCS commands in the enum list
Adding new DCS commands which are specified in the DCS 1.3 spec related to CABC.
v2: Sorted the Macro`s by value (Andrzej)
--- include/video/mipi_display.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/video/mipi_display.h +8 -0
@@ -117,6 +117,14 @@ enum {MIPI_DCS_GET_SCANLINE =0x45 ,MIPI_DCS_READ_DDB_START =0xA1 ,MIPI_DCS_READ_DDB_CONTINUE =0xA8 , +MIPI_DCS_SET_DISPLAY_BRIGHTNESS =0x51 ,/*Spec 1.3*/ +MIPI_DCS_GET_DISPLAY_BRIGHTNESS =0x52 ,/*Spec 1.3*/ +MIPI_DCS_WRITE_CONTROL_DISPLAY =0x53 ,/*Spec 1.3*/ +MIPI_DCS_GET_CONTROL_DISPLAY =0x54 ,/*Spec 1.3*/ +MIPI_DCS_WRITE_POWER_SAVE =0x55 ,/*Spec 1.3*/ +MIPI_DCS_GET_POWER_SAVE =0x56 ,/*Spec 1.3*/ +MIPI_DCS_SET_CABC_MIN_BRIGHTNESS =0x5E ,/*Spec 1.3*/ + MIPI_DCS_GET_CABC_MIN_BRIGHTNESS = 0x5F, /*Spec 1.3*/ };/* MIPI DCS pixel formats */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915: Parsing the PWM cntrl and CABC ON/OFF fields in VBT
For dual link panel scenarios there are new fields added in the VBT which indicate on which port the PWM cntrl and CABC ON/OFF commands needs to be sent.
v2: Moving the comment to intel_dsi.h(Jani)
v3: Renaming the field names (Jani)
--- drivers/gpu/drm/i915/intel_bios.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_bios.h | 5 ++++- drivers/gpu/drm/i915/intel_dsi.h | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_bios.c +10 -0
@@ -749,6 +749,16 @@ parse_mipi_config(struct drm_i915_private *dev_priv,return ; } +/* +* These fileds are introduced from the VBT version 197 onwards, +* so making sure that these bits are set zero in the pervious +* versions. +*/ +if (dev_priv->vbt.dsi.config->dual_link && bdb->version <197 ) { + dev_priv->vbt.dsi.config->dl_cabc_ports =0 ; + dev_priv->vbt.dsi.config->dl_panel_pwm_ports =0 ; + } +/* We have mandatory mipi config blocks. Initialize as generic panel */ dev_priv->vbt.dsi.panel_id =MIPI_DSI_GENERIC_PANEL_ID ; }
drivers/gpu/drm/i915/intel_bios.h +4 -1
@@ -113,7 +113,10 @@ struct mipi_config { u16 dual_link:2; u16 lane_cnt:2; u16 pixel_overlap:3; - u16 rsvd3:9; + u16 rgb_flip:1; + u16 dl_cabc_ports:2; + u16 dl_panel_pwm_ports:2; + u16 rsvd3:4;u16 rsvd4;
drivers/gpu/drm/i915/intel_dsi.h +9 -0
@@ -78,6 +78,15 @@ struct intel_dsi {u8 escape_clk_div;u8 dual_link; + +/* +* Below field will inform us on which port the panel blk_cntrl +* and CABC ON/OFF commands needs to be sent in case of dual link +* panels +*/ +u8 cabc_dcs_ports; +u8 panel_pwm_dcs_ports; +u8 pixel_overlap;u32 port_bits;u32 bw_timer;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: Parse LFP brightness control field in VBT
In reply to Deepak MThese fields in VBT indicates the PWM source which is used and also the controller number.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_bios.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 5 +++++ drivers/gpu/drm/i915/intel_vbt_defs.h | 6 ++++++ 4 files changed, 25 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1488,6 +1488,8 @@ struct intel_vbt_data {bool present;bool active_low_pwm;u8 min_brightness;/* min_brightness/255 of max */ +u8 pwm_pin;/* Source of PWM */ +u8 pwm_controller;/* Controller used in particular PWM */ } backlight;/* MIPI DSI */
drivers/gpu/drm/i915/intel_bios.c +12 -0
@@ -284,6 +284,7 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv, {const struct bdb_lfp_backlight_data *backlight_data;const struct bdb_lfp_backlight_data_entry *entry; +const struct bdb_lfp_backlight_control_data *bl_ctrl_data; backlight_data =find_section (bdb,BDB_LVDS_BACKLIGHT );if (!backlight_data)
@@ -296,6 +297,7 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv, } entry = &backlight_data->data[panel_type]; + bl_ctrl_data = &backlight_data->blc_ctl[panel_type]; dev_priv->vbt.backlight.present = entry->type ==BDB_BACKLIGHT_TYPE_PWM ;if (!dev_priv->vbt.backlight.present) {
@@ -304,6 +306,16 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv,return ; } +/* +* IF the VBT version is less than 191, set the +* pwm controller as PMIC by default. +*/ + dev_priv->vbt.backlight.pwm_pin =BLC_CONTROL_PIN_PMIC ; +if (bdb->version >=191 ) { + dev_priv->vbt.backlight.pwm_pin = bl_ctrl_data->pin; + dev_priv->vbt.backlight.pwm_controller = bl_ctrl_data->controller; + } + dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz; dev_priv->vbt.backlight.active_low_pwm = entry->active_low_pwm; dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -124,6 +124,11 @@#define INTEL_I2C_BUS_DVO 1#define INTEL_I2C_BUS_SDVO 2 +#define BLC_CONTROL_PIN_PMIC 0 +#define BLC_CONTROL_PIN_LPSS_PWM 1 +#define BLC_CONTROL_PIN_DDI 2 +#define BLC_CONTROL_PIN_PANEL_PWM 3 +/* these are outputs from the chip - integrated only external chips are via DVO or SDVO output */ enum intel_output_type {
drivers/gpu/drm/i915/intel_vbt_defs.h +6 -0
@@ -440,10 +440,16 @@ struct bdb_lfp_backlight_data_entry {u8 obsolete3; } __packed; +struct bdb_lfp_backlight_control_data { +u8 pin:4 ; +u8 controller:4 ; +} __packed; +struct bdb_lfp_backlight_data {u8 entry_size;struct bdb_lfp_backlight_data_entry data[16 ];u8 level[16 ]; +struct bdb_lfp_backlight_control_data blc_ctl[16 ]; } __packed;struct aimdb_header {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: Add DCS control for Panel PWM
In reply to Deepak MIf the source of the backlight PWM is from the
panel then the PWM can be controlled by DCS
command, this patch adds the support to
enable/disbale panel PWM, control backlight level
etc...
v2: Moving the CABC bkl functions to new file.(Jani)
v3: Rebase
v4: Rebase
v5: Use mipi_dsi_dcs_write() instead of mipi_dsi_dcs_write_buffer() (Jani)
Move DCS macro`s to include/video/mipi_display.h (Jani)
v6: Rename the file to intel_dsi_dcs_backlight.c
Removing the CABC operations
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_dsi.c | 24 +++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 160 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_panel.c | 4 + 7 files changed, 193 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -83,6 +83,7 @@ i915-y += dvo_ch7017.o \ intel_dp_mst.o \ intel_dp.o \ intel_dsi.o \ + intel_dsi_dcs_backlight.o \ intel_dsi_panel_vbt.o \ intel_dsi_pll.o \ intel_dvo.o \
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -3491,7 +3491,6 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value, enum intel_sbi_destination destination);u32 vlv_flisdsi_read (struct drm_i915_private *dev_priv,u32 reg);void vlv_flisdsi_write (struct drm_i915_private *dev_priv,u32 reg,u32 val); -int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1330,6 +1330,8 @@ void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);/* intel_dsi.c */ void intel_dsi_init (struct drm_device *dev); +/* intel_dsi_panel_pwm.c */ +int intel_dsi_panel_pwm_init_backlight_funcs (struct intel_connector *intel_connector);/* intel_dvo.c */ void intel_dvo_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_dsi.c +22 -2
@@ -1209,10 +1209,30 @@ void intel_dsi_init(struct drm_device *dev)else intel_encoder->crtc_mask =BIT (PIPE_B ); -if (dev_priv->vbt.dsi.config->dual_link) +if (dev_priv->vbt.dsi.config->dual_link) { intel_dsi->ports =BIT (PORT_A ) |BIT (PORT_C ); -else + +/* +* Based on the VBT value assign the ports on +* which Panel PWM On/OFF DCS coomands needs to be sent +*/ +switch (dev_priv->vbt.dsi.config->dl_panel_pwm_ports) { +case PANEL_PWM_PORT_A : + intel_dsi->panel_pwm_dcs_ports =BIT (PORT_A ); +break ; +case PANEL_PWM_PORT_C : + intel_dsi->panel_pwm_dcs_ports =BIT (PORT_C ); +break ; +case PANEL_PWM_PORT_A_AND_C : + intel_dsi->panel_pwm_dcs_ports =BIT (PORT_A ) |BIT (PORT_C ); +break ; +default : + intel_dsi->panel_pwm_dcs_ports =BIT (PORT_A ) |BIT (PORT_C ); + } + }else { intel_dsi->ports =BIT (port); + intel_dsi->panel_pwm_dcs_ports =BIT (port); + }/* Create a DSI host (and a device) for each port. */ for_each_dsi_port (port, intel_dsi->ports) {
drivers/gpu/drm/i915/intel_dsi.h +4 -0
@@ -34,6 +34,10 @@#define DSI_DUAL_LINK_FRONT_BACK 1#define DSI_DUAL_LINK_PIXEL_ALT 2 +#define PANEL_PWM_PORT_A 0x00 +#define PANEL_PWM_PORT_C 0x01 +#define PANEL_PWM_PORT_A_AND_C 0x02 +struct intel_dsi_host ;struct intel_dsi {
drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c new file +160 -0
160 lines not on this page · raw message
drivers/gpu/drm/i915/intel_panel.c +4 -0
@@ -1718,6 +1718,10 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) container_of(panel, struct intel_connector, panel);struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +if (connector->base.connector_type ==DRM_MODE_CONNECTOR_DSI && +intel_dsi_panel_pwm_init_backlight_funcs (connector) ==0 ) +return ; +if (IS_BROXTON (dev_priv)) { panel->backlight.setup = bxt_setup_backlight; panel->backlight.enable = bxt_enable_backlight;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915: CABC support for Panel PWM backlight control
In reply to Deepak MIn CABC (Content Adaptive Brightness Control) content grey level scale can be increased while simultaneously decreasing brightness of the backlight to achieve same perceived brightness.
The CABC is not standardized and panel vendors are free to follow their implementation. The CABC implementaion here assumes that the panels use standard SW register for control.
CABC is supported only when the PWM source for backlight is from the panel.
--- drivers/gpu/drm/i915/intel_dsi.c | 19 ++++++++++++++++ drivers/gpu/drm/i915/intel_dsi.h | 3 +++ drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 30 ++++++++++++++++++++++++++ 3 files changed, 52 insertions(+)
drivers/gpu/drm/i915/intel_dsi.c +19 -0
@@ -1229,9 +1229,28 @@ void intel_dsi_init(struct drm_device *dev)default : intel_dsi->panel_pwm_dcs_ports =BIT (PORT_A ) |BIT (PORT_C ); } + +/* +* Based on the VBT value assign the ports on +* which CABC ON/OFF comands needs to be sent +*/ +switch (dev_priv->vbt.dsi.config->dl_cabc_ports) { +case CABC_PORT_A : + intel_dsi->cabc_dcs_ports =BIT (PORT_A ); +break ; +case CABC_PORT_C : + intel_dsi->cabc_dcs_ports =BIT (PORT_C ); +break ; +case CABC_PORT_A_AND_C : + intel_dsi->cabc_dcs_ports =BIT (PORT_A ) |BIT (PORT_C ); +break ; +default : + intel_dsi->cabc_dcs_ports =BIT (PORT_A ) |BIT (PORT_C ); + } }else { intel_dsi->ports =BIT (port); intel_dsi->panel_pwm_dcs_ports =BIT (port); + intel_dsi->cabc_dcs_ports =BIT (port); }/* Create a DSI host (and a device) for each port. */
drivers/gpu/drm/i915/intel_dsi.h +3 -0
@@ -37,6 +37,9 @@#define PANEL_PWM_PORT_A 0x00#define PANEL_PWM_PORT_C 0x01#define PANEL_PWM_PORT_A_AND_C 0x02 +#define CABC_PORT_A 0x00 +#define CABC_PORT_C 0x01 +#define CABC_PORT_A_AND_C 0x02struct intel_dsi_host ;
drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c +30 -0
@@ -33,6 +33,11 @@#define PANEL_PWM_DISP_DIMMING (1 << 3)#define PANEL_PWM_BCTRL (1 << 5) +#define CABC_OFF (0 << 0) +#define CABC_USER_INTERFACE_IMAGE (1 << 0) +#define CABC_STILL_PICTURE (2 << 0) +#define CABC_VIDEO_MODE (3 << 0) +#define PANEL_PWM_MAX_VALUE 0xFFstatic u32 panel_pwm_get_backlight (struct intel_connector *connector)
@@ -81,6 +86,8 @@ static void panel_pwm_set_backlight(struct intel_connector *connector, u32 levelstatic void panel_pwm_disable_backlight (struct intel_connector *connector) { +struct drm_device *dev = connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private;struct intel_encoder *encoder = connector->encoder;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);struct mipi_dsi_device *dsi_device;
@@ -89,6 +96,16 @@ static void panel_pwm_disable_backlight(struct intel_connector *connector)panel_pwm_set_backlight (connector,0 ); +if (dev_priv->vbt.dsi.config->cabc_supported) { + data =0 ; +for_each_dsi_port (port, intel_dsi->cabc_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data =CABC_OFF ; +mipi_dsi_dcs_write (dsi_device,MIPI_DCS_WRITE_POWER_SAVE , + &data,sizeof (data)); + } + } +for_each_dsi_port (port, intel_dsi->panel_pwm_dcs_ports) { dsi_device = intel_dsi->dsi_hosts[port]->device; data &= ~PANEL_PWM_BKL_EN ;/* Turn Off Backlight */
@@ -101,6 +118,8 @@ static void panel_pwm_disable_backlight(struct intel_connector *connector)static void panel_pwm_enable_backlight (struct intel_connector *connector) { +struct drm_device *dev = connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private;struct intel_encoder *encoder = connector->encoder;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);struct intel_panel *panel = &connector->panel;
@@ -117,6 +136,17 @@ static void panel_pwm_enable_backlight(struct intel_connector *connector) &data, sizeof(data)); } +if (dev_priv->vbt.dsi.config->cabc_supported) { + data =0 ; +for_each_dsi_port (port, intel_dsi->cabc_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; +/* Enabling CABC in still mode */ + data =CABC_STILL_PICTURE ; +mipi_dsi_dcs_write (dsi_device,MIPI_DCS_WRITE_POWER_SAVE , + &data,sizeof (data)); + } + } +panel_pwm_set_backlight (connector, panel->backlight.level); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/5] drm: Add new DCS commands in the enum list
In reply to Deepak M== Series Details ==
== Series Details ==
Series: series starting with [1/5] drm: Add new DCS commands in the enum list
URL : https://patchwork.freedesktop.org/series/4993/
State : failure
== Summary ==
Series 4993v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/4993/revisions/1/mbox/
Test drv_module_reload_basic:
dmesg-warn -> DMESG-FAIL (snb-dellxps)
dmesg-warn -> DMESG-FAIL (hsw-brixbox)
Test gem_ctx_switch:
Subgroup basic-default:
pass -> FAIL (bdw-ultra)
Test gem_exec_nop:
Subgroup basic:
fail -> PASS (snb-x220t)
pass -> FAIL (bdw-ultra)
Test gem_exec_suspend:
Subgroup basic-s4:
skip -> FAIL (bdw-ultra)
Test gem_exec_whisper:
Subgroup basic:
pass -> FAIL (bdw-ultra)
Test gem_mmap_gtt:
Subgroup basic-read-write-distinct:
incomplete -> PASS (snb-x220t)
Test gem_sync:
Subgroup basic-all:
fail -> PASS (snb-x220t)
pass -> FAIL (bdw-ultra)
Subgroup basic-blt:
pass -> FAIL (snb-dellxps)
pass -> FAIL (bdw-ultra)
Subgroup basic-bsd:
pass -> FAIL (bdw-ultra)
pass -> FAIL (ivb-t430s)
Subgroup basic-default:
pass -> FAIL (bdw-ultra)
Subgroup basic-render:
pass -> FAIL (bdw-ultra) UNSTABLE
Subgroup basic-vebox:
pass -> FAIL (bdw-ultra)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (byt-nuc)
Test kms_force_connector_basic:
Subgroup force-edid:
pass -> SKIP (ivb-t430s)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (hsw-gt2)
Subgroup suspend-read-crc-pipe-c:
dmesg-fail -> SKIP (snb-x220t)
pass -> DMESG-WARN (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (bsw-nuc-2)
pass -> DMESG-WARN (byt-nuc)
Subgroup basic-rte:
dmesg-warn -> PASS (byt-nuc) UNSTABLE
Test prime_self_import:
Subgroup basic-with_fd_dup:
incomplete -> PASS (snb-x220t)bdw-nuci7 total:195 pass:181 dwarn:1 dfail:0 fail:1 skip:12 bdw-ultra total:195 pass:162 dwarn:1 dfail:0 fail:12 skip:20 bsw-nuc-2 total:195 pass:154 dwarn:3 dfail:0 fail:1 skip:37 byt-nuc total:195 pass:156 dwarn:2 dfail:0 fail:2 skip:35 hsw-brixbox total:195 pass:171 dwarn:0 dfail:1 fail:1 skip:22 hsw-gt2 total:113 pass:101 dwarn:0 dfail:0 fail:1 skip:10 ilk-hp8440p total:195 pass:129 dwarn:1 dfail:0 fail:1 skip:64 ivb-t430s total:195 pass:166 dwarn:1 dfail:0 fail:2 skip:26 skl-i7k-2 total:195 pass:170 dwarn:1 dfail:0 fail:1 skip:23 skl-nuci5 total:195 pass:182 dwarn:1 dfail:0 fail:1 skip:11 snb-dellxps total:195 pass:158 dwarn:0 dfail:1 fail:2 skip:34 snb-x220t total:195 pass:159 dwarn:1 dfail:0 fail:2 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1734/
2702045fbd4188c1c26bd890bc43976fd10937ad drm-intel-nightly: 2016y-03m-29d-12h-21m-19s UTC integration manifest a6e25ca20baff1fed320cb39c798ad77724ee708 drm/i915: CABC support for Panel PWM backlight control 227c38a6fcc16a9509188c6fff360a66e669cc27 drm/i915: Add DCS control for Panel PWM 5ba6980d6a96b1d67b4c80e82d9251901c500fc7 drm/i915: Parse LFP brightness control field in VBT cbb92b6e8fcf6f48b7982776ece9738612467825 drm/i915: Parsing the PWM cntrl and CABC ON/OFF fields in VBT 5f54a515183f510df917a2138ab38a4a7f8ffdc6 drm: Add new DCS commands in the enum list
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx