CABC patch list
Subsystems (2)
cover CABC patch list
CABC stands for the Content Adaptive Backlight Control.
In the normal display the backlight which we see is due to the backlight which is being modulated by the filter, which is inturn dependent on the image. In brief the CABC does the histogram analysis of the image and then controls the filter and backlight. For example in CABC to display the dark image the backlight is dimmed and then controlls the filter to allow more light, because of which is power consuption will be reduced.
Below are the initial set of patches which supports the CABC. A field exists in the mipi configuration of the VBT which when enabled indicates the CABC is supported. Depending on this field the backlight control function pointer are initialized in the intel_panel.c file.
In case of dual link panels depending on the panel the DCS commands have to be send to either PORT A, PORT C or both PORT A and PORT C. Again a field is added in the VBT to get this data from the version 197 onwards. One of the below patches parses these fields from the VBT.
Addressed the review comments of Jani, which were mentioned in the below link
https://lists.freedesktop.org/archives/intel-gfx/2015-November/081233.html
Deepak M (2):
drm/i915: Parsing the PWM cntrl and CABC ON/OFF fileds in VBT drm/i915: CABC support for backlight control
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_bios.c | 10 ++ drivers/gpu/drm/i915/intel_bios.h | 5 +- drivers/gpu/drm/i915/intel_dsi.c | 19 +++- drivers/gpu/drm/i915/intel_dsi.h | 13 +++ drivers/gpu/drm/i915/intel_dsi_cabc.c | 179 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_panel.c | 4 + 8 files changed, 229 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_dsi_cabc.c
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: Parsing the PWM cntrl and CABC ON/OFF fileds in VBT
For dual link panel scenarios there are new fileds 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)
--- 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_port =0 ; + dev_priv->vbt.dsi.config->pwm_bkl_ctrl =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_port:2; + u16 pwm_bkl_ctrl: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 bkl_dcs_ports; +u8 pwm_blk_ctrl; +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 2/2 drm/i915: CABC support for 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.
In this design there will be no PWM signal from the SoC and DCS commands are sent to enable and control the backlight brightness.
v2: Moving the CABC bkl functions to new file.(Jani)
v3: Rebase
v4: Rebase
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 19 +++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 179 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_panel.c | 4 + 6 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_dsi_cabc.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_cabc.o \ intel_dsi_panel_vbt.o \ intel_dsi_pll.o \ intel_dvo.o \
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -3489,7 +3489,7 @@ 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_dsi_cabc_init_backlight_funcs (struct intel_connector *intel_connector);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_dsi.c +17 -2
@@ -1209,10 +1209,25 @@ 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 +switch (dev_priv->vbt.dsi.config->dl_cabc_port) { +case CABC_PORT_A : + intel_dsi->bkl_dcs_ports =BIT (PORT_A ); +break ; +case CABC_PORT_C : + intel_dsi->bkl_dcs_ports =BIT (PORT_C ); +break ; +case CABC_PORT_A_AND_C : + intel_dsi->bkl_dcs_ports =BIT (PORT_A ) |BIT (PORT_C ); +break ; +default : +DRM_ERROR ("Unknown MIPI ports for sending DCS\n" ); + } + }else { intel_dsi->ports =BIT (port); + intel_dsi->bkl_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 CABC_PORT_A 0x00 +#define CABC_PORT_C 0x01 +#define CABC_PORT_A_AND_C 0x02 +struct intel_dsi_host ;struct intel_dsi {
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +179 -0
179 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_cabc_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
Re: [MIPI CABC 2/2] drm/i915: CABC support for backlight control
Quoted 48 lines · Deepak M
In 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.
In this design there will be no PWM signal from the SoC and DCS commands are sent to enable and control the backlight brightness.
v2: Moving the CABC bkl functions to new file.(Jani)
v3: Rebase
v4: Rebase
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Yetunde Adebisi <[email protected]>Signed-off-by Deepak M <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 19 +++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 179 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_panel.c | 4 + 6 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_dsi_cabc.cdrivers/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_cabc.o \ intel_dsi_panel_vbt.o \ intel_dsi_pll.o \ intel_dvo.o \drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value, · line 3492
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -3489,7 +3489,7 @@ 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_dsi_cabc_init_backlight_funcs (struct intel_connector *intel_connector);
This probably fits better in intel_drv.h under a /* intel_dsi_cabc.c */ comment, see the file for examples.
Quoted 56 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0int 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_dsi.c +17
-2@@ -1209,10 +1209,25 @@ 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 +switch (dev_priv->vbt.dsi.config->dl_cabc_port) { +case CABC_PORT_A : + intel_dsi->bkl_dcs_ports =BIT (PORT_A ); +break ; +case CABC_PORT_C : + intel_dsi->bkl_dcs_ports =BIT (PORT_C ); +break ; +case CABC_PORT_A_AND_C : + intel_dsi->bkl_dcs_ports =BIT (PORT_A ) |BIT (PORT_C ); +break ; +default : +DRM_ERROR ("Unknown MIPI ports for sending DCS\n" ); + } + }else { intel_dsi->ports =BIT (port); + intel_dsi->bkl_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 CABC_PORT_A 0x00 +#define CABC_PORT_C 0x01 +#define CABC_PORT_A_AND_C 0x02 +struct intel_dsi_host ;struct intel_dsi {drivers/gpu/drm/i915/intel_dsi_cabc.c new file +0
-0
drivers/gpu/drm/i915/intel_dsi_cabc.c line 2
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0@@ -0,0 +1,179 @@ +/* +* Copyright © 2006-2010 Intel Corporation
2016
Quoted 29 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +29
-0+* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +* Author: Deepak M <m.deepak at intel.com> +*/ + +#include "intel_drv.h" +#include "intel_dsi.h" +#include "i915_drv.h" +#include <drm/drm_mipi_dsi.h> + +#define CABC_OFF (0 << 0)
drivers/gpu/drm/i915/intel_dsi_cabc.c line 41
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+#define CABC_USER_INTERFACE_IMAGE (1 << 0) +#define CABC_STILL_PICTURE (2 << 0) +#define CABC_VIDEO_MODE (3 << 0) + +#define CABC_BACKLIGHT (1 << 2) +#define CABC_DIMMING_DISPLAY (1 << 3) +#define CABC_BCTRL (1 << 5) + +#define CABC_MAX_VALUE 0xFF +
The defines below should be added to the relevant enum in include/video/mipi_display.h using the MIPI DCS specification names. I'll copy them below. Please create a separate prep patch and send it to dri-devel.
drivers/gpu/drm/i915/intel_dsi_cabc.c line 42
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_RD 0x52
MIPI_DCS_GET_DISPLAY_BRIGHTNESS
drivers/gpu/drm/i915/intel_dsi_cabc.c line 43
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_RD 0x5F
MIPI_DCS_GET_CABC_MIN_BRIGHTNESS
drivers/gpu/drm/i915/intel_dsi_cabc.c line 44
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_RD 0x56
MIPI_DCS_GET_POWER_SAVE
drivers/gpu/drm/i915/intel_dsi_cabc.c line 45
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_RD 0x54
MIPI_DCS_GET_CONTROL_DISPLAY
drivers/gpu/drm/i915/intel_dsi_cabc.c line 46
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_WR 0x51
MIPI_DCS_SET_DISPLAY_BRIGHTNESS
drivers/gpu/drm/i915/intel_dsi_cabc.c line 47
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_WR 0x5E
MIPI_DCS_SET_CABC_MIN_BRIGHTNESS
drivers/gpu/drm/i915/intel_dsi_cabc.c line 48
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_WR 0x55
MIPI_DCS_WRITE_POWER_SAVE
drivers/gpu/drm/i915/intel_dsi_cabc.c line 49
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_WR 0x53
MIPI_DCS_WRITE_CONTROL_DISPLAY
drivers/gpu/drm/i915/intel_dsi_cabc.c line 52
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +3
-0+ +static u32 cabc_get_backlight (struct intel_connector *connector) +{
struct intel_encoder *encoder = connector->encoder; struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
Same for all functions below.
Quoted 5 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +5
-0+struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 }; +enum port port;
drivers/gpu/drm/i915/intel_dsi_cabc.c line 67
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; +mipi_dsi_dcs_read (dsi_device,MIPI_DCS_CABC_LEVEL_RD , data,2 ); + } + +return data[1 ];
Hmm, it's up to the manufacturer whether the this is 8 or 16 bits. I guess you're just assuming 8 bits? I wonder if this should be more generic wrt 8 vs. 16 bits.
Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +8
-0+} + +static void cabc_set_backlight (struct intel_connector *connector,u32 level) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 };
drivers/gpu/drm/i915/intel_dsi_cabc.c line 85
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+enum port port; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] = level; + data[0 ] =MIPI_DCS_CABC_LEVEL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 );
Please use mipi_dsi_dcs_write(). Same for all functions below.
Quoted 54 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +54
-0+ } +} + +static void cabc_disable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +cabc_set_backlight (connector,0 ); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] =CABC_OFF ; + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } +} + +static void cabc_enable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct intel_panel *panel = &connector->panel; +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; + data[1 ] =CABC_BACKLIGHT |CABC_DIMMING_DISPLAY |CABC_BCTRL ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; + data[1 ] =CABC_STILL_PICTURE ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } + +cabc_set_backlight (connector, panel->backlight.level); +} + +static int cabc_setup_backlight (struct intel_connector *connector, +enum pipe unused) +{
drivers/gpu/drm/i915/intel_dsi_cabc.c line 149
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+struct drm_device *dev = connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_panel *panel = &connector->panel; + +if (dev_priv->vbt.backlight.present) + panel->backlight.present = true; +else { +DRM_ERROR ("no backlight present per VBT\n" ); +return 0 ; + }
None of the above is needed.
dev_priv->vbt.backlight.present is checked higher level in intel_panel_setup_backlight(), and panel->backlight.present = true is set there as well if this hook returns 0.
Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +6
-0+ + panel->backlight.max =CABC_MAX_VALUE ; + panel->backlight.level =CABC_MAX_VALUE ; + +return 0 ; +}
drivers/gpu/drm/i915/intel_dsi_cabc.c line 165
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector *intel_connector) +{ +struct drm_device *dev = intel_connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder = intel_connector->encoder; +struct intel_panel *panel = &intel_connector->panel; + +if (!dev_priv->vbt.dsi.config->cabc_supported) +return -EINVAL ;
-ENODEV seems more appropriate.
drivers/gpu/drm/i915/intel_dsi_cabc.c line 170
Quoted 5 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +5
-0+ +if (encoder->type !=INTEL_OUTPUT_DSI ) { +DRM_ERROR ("Use DSI encoder for CABC\n" ); +return -EINVAL ; + }
if (WARN_ON(encoder->type != INTEL_OUTPUT_DSI)) return -EINVAL;
Quoted 14 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +9
-0+ + panel->backlight.setup = cabc_setup_backlight; + panel->backlight.enable = cabc_enable_backlight; + panel->backlight.disable = cabc_disable_backlight; + panel->backlight.set = cabc_set_backlight; + panel->backlight.get = cabc_get_backlight; + +return 0 ; +}drivers/gpu/drm/i915/intel_panel.c +0
-0
drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1722
Quoted 5 lines
drivers/gpu/drm/i915/intel_panel.c +2
-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_cabc_init_backlight_funcs (connector) ==0 )
Indentation is not quite right.
Quoted 5 lines
drivers/gpu/drm/i915/intel_panel.c +2
-0+return ; +if (IS_BROXTON (dev_priv)) { panel->backlight.setup = bxt_setup_backlight; panel->backlight.enable = bxt_enable_backlight;
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [MIPI CABC 2/2] drm/i915: CABC support for backlight control
Quoted 252 lines
-----Original Message-----
From: Nikula, Jani
Sent: Tuesday, March 22, 2016 7:19 PM
To: Deepak, M <[email protected]>; [email protected]
Cc: Deepak, M <[email protected]>; Vetter, Daniel <[email protected]>; Adebisi, YetundeX <[email protected]>
Subject: Re: [MIPI CABC 2/2] drm/i915: CABC support for backlight controlQuoted 21 lines · Deepak M
In 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.
In this design there will be no PWM signal from the SoC and DCS commands are sent to enable and control the backlight brightness.
v2: Moving the CABC bkl functions to new file.(Jani)
v3: Rebase
v4: Rebase
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Yetunde Adebisi <[email protected]>Signed-off-by Deepak M <[email protected]>Quoted 6 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 19 +++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 179++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_drv.h void intel_sbi_write(struct drm_i915_private
Quoted 21 lines
drivers/gpu/drm/i915/intel_panel.c | 4 + 6 files changed, 206 insertions(+), 3 deletions(-) create mode100644
drivers/gpu/drm/i915/intel_dsi_cabc.c(quoted diff) +0
-0b/drivers/gpu/drm/i915/Makefile index 7ffb51b..065c410 100644
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_cabc.o \ intel_dsi_panel_vbt.o \ intel_dsi_pll.o \ intel_dvo.o \(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 050d860..d196404 100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -3489,7 +3489,7 @@ void intel_sbi_write(struct drm_i915_private
*dev_priv, u16 reg, u32 value,drivers/gpu/drm/i915/i915_drv.h
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0enum 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);drivers/gpu/drm/i915/i915_drv.h +2
-1- +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector +*intel_connector);This probably fits better in
intel_drv.hunder a /*intel_dsi_cabc.c*/ comment, see the file for examples.Quoted 15 lines
int
intel_gpu_freq(struct drm_i915_private *dev_priv, int val); intintel_freq_opcode(struct drm_i915_private *dev_priv, int val);drivers/gpu/drm/i915/intel_dsi.c +1
-1@@ -1209,10 +1209,25 @@ 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 );drivers/gpu/drm/i915/intel_dsi.c void intel_dsi_init(struct drm_device *dev) · line 1222
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +9
-1-else +switch (dev_priv->vbt.dsi.config->dl_cabc_port) { +case CABC_PORT_A : + intel_dsi->bkl_dcs_ports =BIT (PORT_A ); +break ; +case CABC_PORT_C : + intel_dsi->bkl_dcs_ports =BIT (PORT_C ); +break ; +case CABC_PORT_A_AND_C : + intel_dsi->bkl_dcs_ports = BIT(PORT_A) |
BIT(PORT_C);drivers/gpu/drm/i915/intel_dsi.c void intel_dsi_init(struct drm_device *dev)
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi.c +3
-0+break ; +default : + DRM_ERROR("Unknown MIPI ports for sendingDCS\n");
Quoted 30 lines
drivers/gpu/drm/i915/intel_dsi.c +4
-0+ } + }else { intel_dsi->ports =BIT (port); + intel_dsi->bkl_dcs_ports =BIT (port); + }/* Create a DSI host (and a device) for each port. */ for_each_dsi_port(port, intel_dsi->ports) { diff --git
a/drivers/gpu/drm/i915/intel_dsi.hb/drivers/gpu/drm/i915/intel_dsi.hindex 0e758f1..5c07d59 100644drivers/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 CABC_PORT_A 0x00 +#define CABC_PORT_C 0x01 +#define CABC_PORT_A_AND_C 0x02 +struct intel_dsi_host ;struct intel_dsi {drivers/gpu/drm/i915/intel_dsi_cabc.c new file +0
-0drivers/gpu/drm/i915/intel_dsi_cabc.c line 2
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0@@ -0,0 +1,179 @@ +/* +* Copyright © 2006-2010 Intel Corporation 2016
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom drivers/gpu/drm/i915/intel_dsi_cabc.c line 22
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including + the next + * paragraph) shall be included in all copies or substantial portions + of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANYKIND,
drivers/gpu/drm/i915/intel_dsi_cabc.c line 26
Quoted 4 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +4
-0+ EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY , + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. INNO EVENT
drivers/gpu/drm/i915/intel_dsi_cabc.c line 28
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,DAMAGES
drivers/gpu/drm/i915/intel_dsi_cabc.c line 30
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OROTHERWISE,
drivers/gpu/drm/i915/intel_dsi_cabc.c line 32
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USEOR
Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +11
-0+OTHER +* DEALINGS IN THE SOFTWARE. +* +* Author: Deepak M <m.deepak at intel.com> */ + +#include "intel_drv.h" +#include "intel_dsi.h" +#include "i915_drv.h" +#include <drm/drm_mipi_dsi.h> + +#define CABC_OFF (0 << 0)drivers/gpu/drm/i915/intel_dsi_cabc.c line 41
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+#define CABC_USER_INTERFACE_IMAGE (1 << 0) +#define CABC_STILL_PICTURE (2 << 0) +#define CABC_VIDEO_MODE (3 << 0) + +#define CABC_BACKLIGHT (1 << 2) +#define CABC_DIMMING_DISPLAY (1 << 3) +#define CABC_BCTRL (1 << 5) + +#define CABC_MAX_VALUE 0xFF +The defines below should be added to the relevant enum in
include/video/mipi_display.husing the MIPI DCS specification names. I'll copy them below. Please create a separate prep patch and send it to dri- devel.drivers/gpu/drm/i915/intel_dsi_cabc.c line 42
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_RD 0x52
MIPI_DCS_GET_DISPLAY_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 43
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_RD 0x5F
MIPI_DCS_GET_CABC_MIN_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 44
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_RD 0x56
MIPI_DCS_GET_POWER_SAVEdrivers/gpu/drm/i915/intel_dsi_cabc.c line 45
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_RD 0x54
MIPI_DCS_GET_CONTROL_DISPLAYdrivers/gpu/drm/i915/intel_dsi_cabc.c line 46
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_WR 0x51
MIPI_DCS_SET_DISPLAY_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 47
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_WR 0x5E
MIPI_DCS_SET_CABC_MIN_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 48
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_WR 0x55
MIPI_DCS_WRITE_POWER_SAVEdrivers/gpu/drm/i915/intel_dsi_cabc.c line 49
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_WR 0x53
MIPI_DCS_WRITE_CONTROL_DISPLAYdrivers/gpu/drm/i915/intel_dsi_cabc.c line 63
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ +static u32 cabc_get_backlight (struct intel_connector *connector) {struct intel_encoder *encoder = connector->encoder; struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);Same for all functions below.
drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 12 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +12
-0+struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 }; +enum port port; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + mipi_dsi_dcs_read(dsi_device, MIPI_DCS_CABC_LEVEL_RD,data, 2);
Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c line 67
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +3
-0+ } + +return data[1 ];Hmm, it's up to the manufacturer whether the this is 8 or 16 bits. I guess you're just assuming 8 bits? I wonder if this should be more generic wrt 8 vs. 16 bits.
[Deepak, M] Need to think on how to make it generic wrt 8 vs 16 bits, problem here is to somehow we have to identify the no of parameters or we have to pass this info in VBT...
Quoted 145 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +8
-0+} + +static void cabc_set_backlight (struct intel_connector *connector,u32 +level) { +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 };drivers/gpu/drm/i915/intel_dsi_cabc.c line 85
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+enum port port; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] = level; + data[0 ] =MIPI_DCS_CABC_LEVEL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 );Please use
mipi_dsi_dcs_write(). Same for all functions below.Quoted 32 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +32
-0+ } +} + +static void cabc_disable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +cabc_set_backlight (connector,0 ); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] =CABC_OFF ; + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } +} + +static void cabc_enable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct intel_panel *panel = &connector->panel; +struct mipi_dsi_device *dsi_device;drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; + data[1] = CABC_BACKLIGHT | CABC_DIMMING_DISPLAY |
CABC_BCTRL;Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +11
-0+mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; + data[1 ] =CABC_STILL_PICTURE ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } + +cabc_set_backlight (connector, panel->backlight.level); } + +static int cabc_setup_backlight (struct intel_connector *connector, +enum pipe unused) +{drivers/gpu/drm/i915/intel_dsi_cabc.c line 149
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+struct drm_device *dev = connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_panel *panel = &connector->panel; + +if (dev_priv->vbt.backlight.present) + panel->backlight.present = true; +else { +DRM_ERROR ("no backlight present per VBT\n" ); +return 0 ; + }None of the above is needed.
dev_priv->vbt.backlight.presentis checked higher level inintel_panel_setup_backlight(), andpanel->backlight.present= true is set there as well if this hook returns 0.Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +6
-0+ + panel->backlight.max =CABC_MAX_VALUE ; + panel->backlight.level =CABC_MAX_VALUE ; + +return 0 ; +}drivers/gpu/drm/i915/intel_dsi_cabc.c line 165
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector +*intel_connector) { +struct drm_device *dev = intel_connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder = intel_connector->encoder; +struct intel_panel *panel = &intel_connector->panel; + +if (!dev_priv->vbt.dsi.config->cabc_supported) +return -EINVAL ;
-ENODEVseems more appropriate.drivers/gpu/drm/i915/intel_dsi_cabc.c line 170
Quoted 5 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +5
-0+ +if (encoder->type !=INTEL_OUTPUT_DSI ) { +DRM_ERROR ("Use DSI encoder for CABC\n" ); +return -EINVAL ; + }if (WARN_ON(encoder->type != INTEL_OUTPUT_DSI)) return -EINVAL;drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct
Quoted 15 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +9
-0+ + panel->backlight.setup = cabc_setup_backlight; + panel->backlight.enable = cabc_enable_backlight; + panel->backlight.disable = cabc_disable_backlight; + panel->backlight.set = cabc_set_backlight; + panel->backlight.get = cabc_get_backlight; + +return 0 ; +}drivers/gpu/drm/i915/intel_panel.c +0
-0@@ -1718,6 +1718,10 @@ intel_panel_init_backlight_funcs(struct
intel_panel*panel)drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel)
Quoted 4 lines
drivers/gpu/drm/i915/intel_panel.c +1
-0container_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&&drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1722
Quoted 1 line
drivers/gpu/drm/i915/intel_panel.c +1
-0+ intel_dsi_cabc_init_backlight_funcs(connector) == 0)Indentation is not quite right.
Quoted 8 lines
drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1727
Quoted 5 lines
drivers/gpu/drm/i915/intel_panel.c +2
-0+return ; +if (IS_BROXTON (dev_priv)) { panel->backlight.setup = bxt_setup_backlight; panel->backlight.enable = bxt_enable_backlight;--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [MIPI CABC 2/2] drm/i915: CABC support for backlight control
Quoted 258 lines · On Wed, 23 Mar 2016, "Deepak, M" <[email protected]> wrote:
Quoted 250 lines
-----Original Message-----
From: Nikula, Jani
Sent: Tuesday, March 22, 2016 7:19 PM
To: Deepak, M <[email protected]>; [email protected]
Cc: Deepak, M <[email protected]>; Vetter, Daniel <[email protected]>; Adebisi, YetundeX <[email protected]>
Subject: Re: [MIPI CABC 2/2] drm/i915: CABC support for backlight controlQuoted 21 lines · Deepak M
In 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.
In this design there will be no PWM signal from the SoC and DCS commands are sent to enable and control the backlight brightness.
v2: Moving the CABC bkl functions to new file.(Jani)
v3: Rebase
v4: Rebase
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Yetunde Adebisi <[email protected]>Signed-off-by Deepak M <[email protected]>Quoted 6 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 19 +++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 179++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_drv.h void intel_sbi_write(struct drm_i915_private
Quoted 21 lines
drivers/gpu/drm/i915/intel_panel.c | 4 + 6 files changed, 206 insertions(+), 3 deletions(-) create mode100644
drivers/gpu/drm/i915/intel_dsi_cabc.c(quoted diff) +0
-0b/drivers/gpu/drm/i915/Makefile index 7ffb51b..065c410 100644
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_cabc.o \ intel_dsi_panel_vbt.o \ intel_dsi_pll.o \ intel_dvo.o \(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 050d860..d196404 100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -3489,7 +3489,7 @@ void intel_sbi_write(struct drm_i915_private
*dev_priv, u16 reg, u32 value,drivers/gpu/drm/i915/i915_drv.h
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0enum 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);drivers/gpu/drm/i915/i915_drv.h +2
-1- +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector +*intel_connector);This probably fits better in
intel_drv.hunder a /*intel_dsi_cabc.c*/ comment, see the file for examples.Quoted 15 lines
int
intel_gpu_freq(struct drm_i915_private *dev_priv, int val); intintel_freq_opcode(struct drm_i915_private *dev_priv, int val);drivers/gpu/drm/i915/intel_dsi.c +1
-1@@ -1209,10 +1209,25 @@ 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 );drivers/gpu/drm/i915/intel_dsi.c void intel_dsi_init(struct drm_device *dev) · line 1222
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +9
-1-else +switch (dev_priv->vbt.dsi.config->dl_cabc_port) { +case CABC_PORT_A : + intel_dsi->bkl_dcs_ports =BIT (PORT_A ); +break ; +case CABC_PORT_C : + intel_dsi->bkl_dcs_ports =BIT (PORT_C ); +break ; +case CABC_PORT_A_AND_C : + intel_dsi->bkl_dcs_ports = BIT(PORT_A) |
BIT(PORT_C);drivers/gpu/drm/i915/intel_dsi.c void intel_dsi_init(struct drm_device *dev)
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi.c +3
-0+break ; +default : + DRM_ERROR("Unknown MIPI ports for sendingDCS\n");
Quoted 30 lines
drivers/gpu/drm/i915/intel_dsi.c +4
-0+ } + }else { intel_dsi->ports =BIT (port); + intel_dsi->bkl_dcs_ports =BIT (port); + }/* Create a DSI host (and a device) for each port. */ for_each_dsi_port(port, intel_dsi->ports) { diff --git
a/drivers/gpu/drm/i915/intel_dsi.hb/drivers/gpu/drm/i915/intel_dsi.hindex 0e758f1..5c07d59 100644drivers/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 CABC_PORT_A 0x00 +#define CABC_PORT_C 0x01 +#define CABC_PORT_A_AND_C 0x02 +struct intel_dsi_host ;struct intel_dsi {drivers/gpu/drm/i915/intel_dsi_cabc.c new file +0
-0drivers/gpu/drm/i915/intel_dsi_cabc.c line 2
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0@@ -0,0 +1,179 @@ +/* +* Copyright © 2006-2010 Intel Corporation 2016
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom drivers/gpu/drm/i915/intel_dsi_cabc.c line 22
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including + the next + * paragraph) shall be included in all copies or substantial portions + of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANYKIND,
drivers/gpu/drm/i915/intel_dsi_cabc.c line 26
Quoted 4 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +4
-0+ EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY , + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. INNO EVENT
drivers/gpu/drm/i915/intel_dsi_cabc.c line 28
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,DAMAGES
drivers/gpu/drm/i915/intel_dsi_cabc.c line 30
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OROTHERWISE,
drivers/gpu/drm/i915/intel_dsi_cabc.c line 32
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USEOR
Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +11
-0+OTHER +* DEALINGS IN THE SOFTWARE. +* +* Author: Deepak M <m.deepak at intel.com> */ + +#include "intel_drv.h" +#include "intel_dsi.h" +#include "i915_drv.h" +#include <drm/drm_mipi_dsi.h> + +#define CABC_OFF (0 << 0)drivers/gpu/drm/i915/intel_dsi_cabc.c line 41
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+#define CABC_USER_INTERFACE_IMAGE (1 << 0) +#define CABC_STILL_PICTURE (2 << 0) +#define CABC_VIDEO_MODE (3 << 0) + +#define CABC_BACKLIGHT (1 << 2) +#define CABC_DIMMING_DISPLAY (1 << 3) +#define CABC_BCTRL (1 << 5) + +#define CABC_MAX_VALUE 0xFF +The defines below should be added to the relevant enum in
include/video/mipi_display.husing the MIPI DCS specification names. I'll copy them below. Please create a separate prep patch and send it to dri- devel.drivers/gpu/drm/i915/intel_dsi_cabc.c line 42
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_RD 0x52
MIPI_DCS_GET_DISPLAY_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 43
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_RD 0x5F
MIPI_DCS_GET_CABC_MIN_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 44
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_RD 0x56
MIPI_DCS_GET_POWER_SAVEdrivers/gpu/drm/i915/intel_dsi_cabc.c line 45
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_RD 0x54
MIPI_DCS_GET_CONTROL_DISPLAYdrivers/gpu/drm/i915/intel_dsi_cabc.c line 46
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_WR 0x51
MIPI_DCS_SET_DISPLAY_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 47
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_WR 0x5E
MIPI_DCS_SET_CABC_MIN_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 48
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_WR 0x55
MIPI_DCS_WRITE_POWER_SAVEdrivers/gpu/drm/i915/intel_dsi_cabc.c line 49
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_WR 0x53
MIPI_DCS_WRITE_CONTROL_DISPLAYdrivers/gpu/drm/i915/intel_dsi_cabc.c line 63
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ +static u32 cabc_get_backlight (struct intel_connector *connector) {struct intel_encoder *encoder = connector->encoder; struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);Same for all functions below.
drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 12 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +12
-0+struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 }; +enum port port; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + mipi_dsi_dcs_read(dsi_device, MIPI_DCS_CABC_LEVEL_RD,data, 2);
Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c line 67
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +3
-0+ } + +return data[1 ];Hmm, it's up to the manufacturer whether the this is 8 or 16 bits. I guess you're just assuming 8 bits? I wonder if this should be more generic wrt 8 vs. 16 bits.
Quoted 3 lines
[Deepak, M] Need to think on how to make it generic wrt 8 vs 16 bits, problem here is to somehow we have to identify the no of parameters or we have to pass this info in VBT...
Look at the maximum value to decide? That's what needs to be set in setup if the size changes, so no need to add another variable.
BR,
Jani.
Quoted 153 lines
Quoted 153 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +8
-0+} + +static void cabc_set_backlight (struct intel_connector *connector,u32 +level) { +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 };drivers/gpu/drm/i915/intel_dsi_cabc.c line 85
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+enum port port; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] = level; + data[0 ] =MIPI_DCS_CABC_LEVEL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 );Please use
mipi_dsi_dcs_write(). Same for all functions below.Quoted 32 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +32
-0+ } +} + +static void cabc_disable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +cabc_set_backlight (connector,0 ); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] =CABC_OFF ; + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } +} + +static void cabc_enable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct intel_panel *panel = &connector->panel; +struct mipi_dsi_device *dsi_device;drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; + data[1] = CABC_BACKLIGHT | CABC_DIMMING_DISPLAY |
CABC_BCTRL;Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +11
-0+mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; + data[1 ] =CABC_STILL_PICTURE ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } + +cabc_set_backlight (connector, panel->backlight.level); } + +static int cabc_setup_backlight (struct intel_connector *connector, +enum pipe unused) +{drivers/gpu/drm/i915/intel_dsi_cabc.c line 149
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+struct drm_device *dev = connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_panel *panel = &connector->panel; + +if (dev_priv->vbt.backlight.present) + panel->backlight.present = true; +else { +DRM_ERROR ("no backlight present per VBT\n" ); +return 0 ; + }None of the above is needed.
dev_priv->vbt.backlight.presentis checked higher level inintel_panel_setup_backlight(), andpanel->backlight.present= true is set there as well if this hook returns 0.Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +6
-0+ + panel->backlight.max =CABC_MAX_VALUE ; + panel->backlight.level =CABC_MAX_VALUE ; + +return 0 ; +}drivers/gpu/drm/i915/intel_dsi_cabc.c line 165
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector +*intel_connector) { +struct drm_device *dev = intel_connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder = intel_connector->encoder; +struct intel_panel *panel = &intel_connector->panel; + +if (!dev_priv->vbt.dsi.config->cabc_supported) +return -EINVAL ;
-ENODEVseems more appropriate.drivers/gpu/drm/i915/intel_dsi_cabc.c line 170
Quoted 5 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +5
-0+ +if (encoder->type !=INTEL_OUTPUT_DSI ) { +DRM_ERROR ("Use DSI encoder for CABC\n" ); +return -EINVAL ; + }if (WARN_ON(encoder->type != INTEL_OUTPUT_DSI)) return -EINVAL;drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct
Quoted 15 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +9
-0+ + panel->backlight.setup = cabc_setup_backlight; + panel->backlight.enable = cabc_enable_backlight; + panel->backlight.disable = cabc_disable_backlight; + panel->backlight.set = cabc_set_backlight; + panel->backlight.get = cabc_get_backlight; + +return 0 ; +}drivers/gpu/drm/i915/intel_panel.c +0
-0@@ -1718,6 +1718,10 @@ intel_panel_init_backlight_funcs(struct
intel_panel*panel)drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel)
Quoted 4 lines
drivers/gpu/drm/i915/intel_panel.c +1
-0container_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&&drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1722
Quoted 1 line
drivers/gpu/drm/i915/intel_panel.c +1
-0+ intel_dsi_cabc_init_backlight_funcs(connector) == 0)Indentation is not quite right.
drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1727
Quoted 5 lines
drivers/gpu/drm/i915/intel_panel.c +2
-0+return ; +if (IS_BROXTON (dev_priv)) { panel->backlight.setup = bxt_setup_backlight; panel->backlight.enable = bxt_enable_backlight;--
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [MIPI CABC 2/2] drm/i915: CABC support for backlight control
Quoted 260 lines · Jani Nikula
[ text/plain ]
Quoted 258 lines · On Wed, 23 Mar 2016, "Deepak, M" <[email protected]> wrote:
Quoted 258 lines
-----Original Message-----
From: Nikula, Jani
Sent: Tuesday, March 22, 2016 7:19 PM
To: Deepak, M <[email protected]>; [email protected]
Cc: Deepak, M <[email protected]>; Vetter, Daniel <[email protected]>; Adebisi, YetundeX <[email protected]>
Subject: Re: [MIPI CABC 2/2] drm/i915: CABC support for backlight controlQuoted 21 lines · Deepak M
In 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.
In this design there will be no PWM signal from the SoC and DCS commands are sent to enable and control the backlight brightness.
v2: Moving the CABC bkl functions to new file.(Jani)
v3: Rebase
v4: Rebase
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Yetunde Adebisi <[email protected]>Signed-off-by Deepak M <[email protected]>Quoted 6 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 19 +++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 179++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_drv.h void intel_sbi_write(struct drm_i915_private
Quoted 21 lines
drivers/gpu/drm/i915/intel_panel.c | 4 + 6 files changed, 206 insertions(+), 3 deletions(-) create mode100644
drivers/gpu/drm/i915/intel_dsi_cabc.c(quoted diff) +0
-0b/drivers/gpu/drm/i915/Makefile index 7ffb51b..065c410 100644
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_cabc.o \ intel_dsi_panel_vbt.o \ intel_dsi_pll.o \ intel_dvo.o \(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 050d860..d196404 100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -3489,7 +3489,7 @@ void intel_sbi_write(struct drm_i915_private
*dev_priv, u16 reg, u32 value,drivers/gpu/drm/i915/i915_drv.h
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0enum 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);drivers/gpu/drm/i915/i915_drv.h +2
-1- +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector +*intel_connector);This probably fits better in
intel_drv.hunder a /*intel_dsi_cabc.c*/ comment, see the file for examples.Quoted 15 lines
int
intel_gpu_freq(struct drm_i915_private *dev_priv, int val); intintel_freq_opcode(struct drm_i915_private *dev_priv, int val);drivers/gpu/drm/i915/intel_dsi.c +1
-1@@ -1209,10 +1209,25 @@ 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 );drivers/gpu/drm/i915/intel_dsi.c void intel_dsi_init(struct drm_device *dev) · line 1222
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +9
-1-else +switch (dev_priv->vbt.dsi.config->dl_cabc_port) { +case CABC_PORT_A : + intel_dsi->bkl_dcs_ports =BIT (PORT_A ); +break ; +case CABC_PORT_C : + intel_dsi->bkl_dcs_ports =BIT (PORT_C ); +break ; +case CABC_PORT_A_AND_C : + intel_dsi->bkl_dcs_ports = BIT(PORT_A) |
BIT(PORT_C);drivers/gpu/drm/i915/intel_dsi.c void intel_dsi_init(struct drm_device *dev)
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi.c +3
-0+break ; +default : + DRM_ERROR("Unknown MIPI ports for sendingDCS\n");
Quoted 30 lines
drivers/gpu/drm/i915/intel_dsi.c +4
-0+ } + }else { intel_dsi->ports =BIT (port); + intel_dsi->bkl_dcs_ports =BIT (port); + }/* Create a DSI host (and a device) for each port. */ for_each_dsi_port(port, intel_dsi->ports) { diff --git
a/drivers/gpu/drm/i915/intel_dsi.hb/drivers/gpu/drm/i915/intel_dsi.hindex 0e758f1..5c07d59 100644drivers/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 CABC_PORT_A 0x00 +#define CABC_PORT_C 0x01 +#define CABC_PORT_A_AND_C 0x02 +struct intel_dsi_host ;struct intel_dsi {drivers/gpu/drm/i915/intel_dsi_cabc.c new file +0
-0drivers/gpu/drm/i915/intel_dsi_cabc.c line 2
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0@@ -0,0 +1,179 @@ +/* +* Copyright © 2006-2010 Intel Corporation 2016
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom drivers/gpu/drm/i915/intel_dsi_cabc.c line 22
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including + the next + * paragraph) shall be included in all copies or substantial portions + of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANYKIND,
drivers/gpu/drm/i915/intel_dsi_cabc.c line 26
Quoted 4 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +4
-0+ EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY , + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. INNO EVENT
drivers/gpu/drm/i915/intel_dsi_cabc.c line 28
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,DAMAGES
drivers/gpu/drm/i915/intel_dsi_cabc.c line 30
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OROTHERWISE,
drivers/gpu/drm/i915/intel_dsi_cabc.c line 32
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USEOR
Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +11
-0+OTHER +* DEALINGS IN THE SOFTWARE. +* +* Author: Deepak M <m.deepak at intel.com> */ + +#include "intel_drv.h" +#include "intel_dsi.h" +#include "i915_drv.h" +#include <drm/drm_mipi_dsi.h> + +#define CABC_OFF (0 << 0)drivers/gpu/drm/i915/intel_dsi_cabc.c line 41
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+#define CABC_USER_INTERFACE_IMAGE (1 << 0) +#define CABC_STILL_PICTURE (2 << 0) +#define CABC_VIDEO_MODE (3 << 0) + +#define CABC_BACKLIGHT (1 << 2) +#define CABC_DIMMING_DISPLAY (1 << 3) +#define CABC_BCTRL (1 << 5) + +#define CABC_MAX_VALUE 0xFF +The defines below should be added to the relevant enum in
include/video/mipi_display.husing the MIPI DCS specification names. I'll copy them below. Please create a separate prep patch and send it to dri- devel.drivers/gpu/drm/i915/intel_dsi_cabc.c line 42
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_RD 0x52
MIPI_DCS_GET_DISPLAY_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 43
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_RD 0x5F
MIPI_DCS_GET_CABC_MIN_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 44
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_RD 0x56
MIPI_DCS_GET_POWER_SAVEdrivers/gpu/drm/i915/intel_dsi_cabc.c line 45
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_RD 0x54
MIPI_DCS_GET_CONTROL_DISPLAYdrivers/gpu/drm/i915/intel_dsi_cabc.c line 46
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_LEVEL_WR 0x51
MIPI_DCS_SET_DISPLAY_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 47
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_MIN_BRIGHTNESS_WR 0x5E
MIPI_DCS_SET_CABC_MIN_BRIGHTNESSdrivers/gpu/drm/i915/intel_dsi_cabc.c line 48
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_WR 0x55
MIPI_DCS_WRITE_POWER_SAVEdrivers/gpu/drm/i915/intel_dsi_cabc.c line 49
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+#define MIPI_DCS_CABC_CONTROL_BRIGHT_WR 0x53
MIPI_DCS_WRITE_CONTROL_DISPLAYdrivers/gpu/drm/i915/intel_dsi_cabc.c line 63
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ +static u32 cabc_get_backlight (struct intel_connector *connector) {struct intel_encoder *encoder = connector->encoder; struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);Same for all functions below.
drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 12 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +12
-0+struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 }; +enum port port; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + mipi_dsi_dcs_read(dsi_device, MIPI_DCS_CABC_LEVEL_RD,data, 2);
drivers/gpu/drm/i915/intel_dsi_cabc.c line 67
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +3
-0+ } + +return data[1 ];Hmm, it's up to the manufacturer whether the this is 8 or 16 bits. I guess you're just assuming 8 bits? I wonder if this should be more generic wrt 8 vs. 16 bits.
Quoted 6 lines
Quoted 3 lines
[Deepak, M] Need to think on how to make it generic wrt 8 vs 16 bits, problem here is to somehow we have to identify the no of parameters or we have to pass this info in VBT...
Look at the maximum value to decide? That's what needs to be set in setup if the size changes, so no need to add another variable.
Or just ignore this part for now, and go for either 8 or 16 bits, not this sometimes this sometimes that.
Quoted 157 lines
BR,
Jani.Quoted 153 lines
Quoted 153 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +8
-0+} + +static void cabc_set_backlight (struct intel_connector *connector,u32 +level) { +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 };drivers/gpu/drm/i915/intel_dsi_cabc.c line 85
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+enum port port; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] = level; + data[0 ] =MIPI_DCS_CABC_LEVEL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 );Please use
mipi_dsi_dcs_write(). Same for all functions below.Quoted 32 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +32
-0+ } +} + +static void cabc_disable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +cabc_set_backlight (connector,0 ); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[1 ] =CABC_OFF ; + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } +} + +static void cabc_enable_backlight (struct intel_connector *connector) +{ +struct intel_dsi *intel_dsi =NULL ; +struct intel_encoder *encoder =NULL ; +struct intel_panel *panel = &connector->panel; +struct mipi_dsi_device *dsi_device;drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+enum port port; +u8 data[2 ] = {0 }; + + encoder = connector->encoder; + intel_dsi =enc_to_intel_dsi (&encoder->base); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data[0 ] =MIPI_DCS_CABC_CONTROL_BRIGHT_WR ; + data[1] = CABC_BACKLIGHT | CABC_DIMMING_DISPLAY |
CABC_BCTRL;Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +11
-0+mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + data[0 ] =MIPI_DCS_CABC_CONTROL_WR ; + data[1 ] =CABC_STILL_PICTURE ; +mipi_dsi_dcs_write_buffer (dsi_device, data,2 ); + } + +cabc_set_backlight (connector, panel->backlight.level); } + +static int cabc_setup_backlight (struct intel_connector *connector, +enum pipe unused) +{drivers/gpu/drm/i915/intel_dsi_cabc.c line 149
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+struct drm_device *dev = connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_panel *panel = &connector->panel; + +if (dev_priv->vbt.backlight.present) + panel->backlight.present = true; +else { +DRM_ERROR ("no backlight present per VBT\n" ); +return 0 ; + }None of the above is needed.
dev_priv->vbt.backlight.presentis checked higher level inintel_panel_setup_backlight(), andpanel->backlight.present= true is set there as well if this hook returns 0.Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +6
-0+ + panel->backlight.max =CABC_MAX_VALUE ; + panel->backlight.level =CABC_MAX_VALUE ; + +return 0 ; +}drivers/gpu/drm/i915/intel_dsi_cabc.c line 165
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+ +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector +*intel_connector) { +struct drm_device *dev = intel_connector->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder = intel_connector->encoder; +struct intel_panel *panel = &intel_connector->panel; + +if (!dev_priv->vbt.dsi.config->cabc_supported) +return -EINVAL ;
-ENODEVseems more appropriate.drivers/gpu/drm/i915/intel_dsi_cabc.c line 170
Quoted 5 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +5
-0+ +if (encoder->type !=INTEL_OUTPUT_DSI ) { +DRM_ERROR ("Use DSI encoder for CABC\n" ); +return -EINVAL ; + }if (WARN_ON(encoder->type != INTEL_OUTPUT_DSI)) return -EINVAL;drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct
Quoted 15 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +9
-0+ + panel->backlight.setup = cabc_setup_backlight; + panel->backlight.enable = cabc_enable_backlight; + panel->backlight.disable = cabc_disable_backlight; + panel->backlight.set = cabc_set_backlight; + panel->backlight.get = cabc_get_backlight; + +return 0 ; +}drivers/gpu/drm/i915/intel_panel.c +0
-0@@ -1718,6 +1718,10 @@ intel_panel_init_backlight_funcs(struct
intel_panel*panel)drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel)
Quoted 4 lines
drivers/gpu/drm/i915/intel_panel.c +1
-0container_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&&drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1722
Quoted 1 line
drivers/gpu/drm/i915/intel_panel.c +1
-0+ intel_dsi_cabc_init_backlight_funcs(connector) == 0)Indentation is not quite right.
drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1727
Quoted 5 lines
drivers/gpu/drm/i915/intel_panel.c +2
-0+return ; +if (IS_BROXTON (dev_priv)) { panel->backlight.setup = bxt_setup_backlight; panel->backlight.enable = bxt_enable_backlight;--
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for CABC patch list (rev4)
In reply to Deepak M== Series Details ==
== Series Details ==
Series: CABC patch list (rev4)
URL : https://patchwork.freedesktop.org/series/801/
State : failure
== Summary ==
Series 801v4 CABC patch list
http://patchwork.freedesktop.org/api/1.0/series/801/revisions/4/mbox/
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> DMESG-WARN (bsw-nuc-2)
Test gem_sync:
Subgroup basic-bsd:
pass -> DMESG-FAIL (ilk-hp8440p)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> DMESG-WARN (hsw-brixbox)
pass -> DMESG-WARN (bdw-ultra)
Subgroup basic-plain-flip:
dmesg-warn -> PASS (bdw-ultra)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
fail -> DMESG-FAIL (snb-x220t)
pass -> DMESG-WARN (snb-dellxps)
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup basic-rte:
dmesg-warn -> PASS (snb-x220t)
dmesg-warn -> PASS (snb-dellxps)
dmesg-warn -> PASS (byt-nuc) UNSTABLEbdw-nuci7 total:192 pass:180 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:192 pass:170 dwarn:1 dfail:0 fail:0 skip:21 bsw-nuc-2 total:192 pass:153 dwarn:2 dfail:0 fail:0 skip:37 byt-nuc total:192 pass:157 dwarn:0 dfail:0 fail:0 skip:35 hsw-brixbox total:192 pass:169 dwarn:1 dfail:0 fail:0 skip:22 ilk-hp8440p total:192 pass:127 dwarn:1 dfail:1 fail:0 skip:63 ivb-t430s total:192 pass:167 dwarn:0 dfail:0 fail:0 skip:25 skl-i5k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23 snb-dellxps total:192 pass:157 dwarn:1 dfail:0 fail:0 skip:34 snb-x220t total:192 pass:158 dwarn:0 dfail:1 fail:0 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1668/
4b39223f6e3bef4dfa678f7239dcd87c38e20e96 drm-intel-nightly: 2016y-03m-21d-18h-43m-18s UTC integration manifest d932b2d799c9053e0db544f3ca42d59f4fbdcbd2 drm/i915: CABC support for backlight control 9e5099ce3194aa3adf5b87470aacb7a4afdd6514 drm/i915: Parsing the PWM cntrl and CABC ON/OFF fileds in VBT
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx