drm/i915: Parsing the PWM cntrl and CABC ON/OFF fileds in VBT
Subsystems (2)
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 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
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)
---
The DCS command macro`s are defined in the patch which is posted in the dri-devel list.
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 | 19 ++++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 154 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_panel.c | 4 + 7 files changed, 182 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 +0 -1
@@ -3489,7 +3489,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
@@ -1325,6 +1325,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_cabc.c */ +int intel_dsi_cabc_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 +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 +154 -0
154 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: [PATCH 2/2] drm/i915: CABC support for backlight control
Quoted 12 lines · Deepak M
[ text/plain ]
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.
Quoted 8 lines
v2: Moving the CABC bkl functions to new file.(Jani)
v3: Rebase
v4: Rebase
v5: Use
mipi_dsi_dcs_write()instead ofmipi_dsi_dcs_write_buffer()(Jani)
Move DCS macro`s toinclude/video/mipi_display.h(Jani)
Where's the patch actually adding the macros? We need that in the same series to have CI actually build and run this; this fails without them.
BR,
Jani.
Quoted 279 lines
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Yetunde Adebisi <[email protected]>Signed-off-by Deepak M <[email protected]>---
The DCS command macro`s are defined in the patch which is posted in the dri-devel list.
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 | 19 ++++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 154 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_panel.c | 4 + 7 files changed, 182 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
-1@@ -3489,7 +3489,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@@ -1325,6 +1325,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_cabc.c */ +int intel_dsi_cabc_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 +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 +154
-0@@ -0,0 +1,154 @@ +/* +* Copyright © 2016 Intel Corporation +* +* 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 <video/mipi_display.h> +#include <drm/drm_mipi_dsi.h> + +#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 CABC_BACKLIGHT (1 << 2) +#define CABC_DIMMING_DISPLAY (1 << 3) +#define CABC_BCTRL (1 << 5) + +#define CABC_MAX_VALUE 0xFF + +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); +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 }; +enum port port; + +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_GET_DISPLAY_BRIGHTNESS , + data,2 ); + } + +return data[1 ]; +} + +static void cabc_set_backlight (struct intel_connector *connector,u32 level) +{ +struct intel_encoder *encoder = connector->encoder; +struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct mipi_dsi_device *dsi_device; +u8 data =0 ; +enum port port; + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data = level; +mipi_dsi_dcs_write (dsi_device,MIPI_DCS_SET_DISPLAY_BRIGHTNESS , + &data,sizeof (data)); + } +} + +static void cabc_disable_backlight (struct intel_connector *connector) +{ +struct intel_encoder *encoder = connector->encoder; +struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data =0 ; + +cabc_set_backlight (connector,0 ); + +for_each_dsi_port (port, intel_dsi->bkl_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)); +mipi_dsi_dcs_write (dsi_device,MIPI_DCS_WRITE_CONTROL_DISPLAY , + &data,sizeof (data)); + } +} + +static void cabc_enable_backlight (struct intel_connector *connector) +{ +struct intel_encoder *encoder = connector->encoder; +struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_panel *panel = &connector->panel; +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data =0 ; + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data =CABC_BACKLIGHT |CABC_DIMMING_DISPLAY |CABC_BCTRL ; +mipi_dsi_dcs_write (dsi_device,MIPI_DCS_WRITE_CONTROL_DISPLAY , + &data,sizeof (data)); + data =CABC_STILL_PICTURE ; +mipi_dsi_dcs_write (dsi_device,MIPI_DCS_WRITE_POWER_SAVE , + &data,sizeof (data)); + } + +cabc_set_backlight (connector, panel->backlight.level); +} + +static int cabc_setup_backlight (struct intel_connector *connector, +enum pipe unused) +{ +struct intel_panel *panel = &connector->panel; + + panel->backlight.max =CABC_MAX_VALUE ; + panel->backlight.level =CABC_MAX_VALUE ; + +return 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 -ENODEV ; + +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 ; + + 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 +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 · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: CABC support for backlight control
Quoted 30 lines
-----Original Message-----
From: Nikula, Jani
Sent: Thursday, March 24, 2016 3:11 PM
To: Deepak, M <[email protected]>; [email protected]
Cc: Deepak, M <[email protected]>; Vetter, Daniel <[email protected]>; Adebisi, YetundeX <[email protected]>
Subject: Re: [PATCH 2/2] drm/i915: CABC support for backlight controlQuoted 18 lines · Deepak M
[ text/plain ]
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
Quoted 10 lines
Quoted 2 lines
v5: Use
mipi_dsi_dcs_write()instead ofmipi_dsi_dcs_write_buffer()(Jani)
Move DCS macro`s toinclude/video/mipi_display.h(Jani)Where's the patch actually adding the macros? We need that in the same series to have CI actually build and run this; this fails without them.
BR,
Jani.
[Deepak, M] Okay will resend these patches including that patch also.
Quoted 307 lines
Quoted 10 lines
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Yetunde Adebisi <[email protected]>Signed-off-by Deepak M <[email protected]>---
The DCS command macro`s are defined in the patch which is posted in the dri-devel list.
Quoted 6 lines
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 | 19 ++++- drivers/gpu/drm/i915/intel_dsi.h | 4 + drivers/gpu/drm/i915/intel_dsi_cabc.c | 154++++++++++++++++++++++++++++++++++
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 + 7 files changed, 182 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..9ed60f8 100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -3489,7 +3489,6 @@ void intel_sbi_write(struct drm_i915_private
*dev_priv, u16 reg, u32 value,Quoted 35 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);
-
intintel_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_drv.h +3
-0@@ -1325,6 +1325,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_cabc.c */ +int intel_dsi_cabc_init_backlight_funcs (struct intel_connector +*intel_connector);/* intel_dvo.c */ void intel_dvo_init(struct drm_device *dev); diff --git
a/drivers/gpu/drm/i915/intel_dsi.cb/drivers/gpu/drm/i915/intel_dsi.cindex 456676c..7aa707f 100644drivers/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 42 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 +12
-0@@ -0,0 +1,154 @@ +/* +* Copyright © 2016 Intel Corporation +* +* 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 22 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +22
-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 <video/mipi_display.h> +#include <drm/drm_mipi_dsi.h> + +#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 CABC_BACKLIGHT (1 << 2) +#define CABC_DIMMING_DISPLAY (1 << 3) +#define CABC_BCTRL (1 << 5) + +#define CABC_MAX_VALUE 0xFF +drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-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); +struct mipi_dsi_device *dsi_device; +u8 data[2 ] = {0 }; +enum port port; + +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_GET_DISPLAY_BRIGHTNESS,Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +8
-0+ data, 2); + } + +return data[1 ]; +} + +static void cabc_set_backlight (struct intel_connector *connector,u32 +level) {drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+struct intel_encoder *encoder = connector->encoder; +struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct mipi_dsi_device *dsi_device; +u8 data =0 ; +enum port port; + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data = level; + mipi_dsi_dcs_write(dsi_device,
MIPI_DCS_SET_DISPLAY_BRIGHTNESS,Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +8
-0+ &data, sizeof(data)); + } +} + +static void cabc_disable_backlight (struct intel_connector *connector) +{ +struct intel_encoder *encoder = connector->encoder; +struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+struct mipi_dsi_device *dsi_device; +enum port port; +u8 data =0 ; + +cabc_set_backlight (connector,0 ); + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data =CABC_OFF ; + mipi_dsi_dcs_write(dsi_device,
MIPI_DCS_WRITE_POWER_SAVE,drivers/gpu/drm/i915/intel_dsi_cabc.c line 102
Quoted 2 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +2
-0+ &data, sizeof(data)); + mipi_dsi_dcs_write(dsi_device,
MIPI_DCS_WRITE_CONTROL_DISPLAY,Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +6
-0+ &data, sizeof(data)); + } +} + +static void cabc_enable_backlight (struct intel_connector *connector) +{drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +10
-0+struct intel_encoder *encoder = connector->encoder; +struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_panel *panel = &connector->panel; +struct mipi_dsi_device *dsi_device; +enum port port; +u8 data =0 ; + +for_each_dsi_port (port, intel_dsi->bkl_dcs_ports) { + dsi_device = intel_dsi->dsi_hosts[port]->device; + data = CABC_BACKLIGHT | CABC_DIMMING_DISPLAY |
CABC_BCTRL;drivers/gpu/drm/i915/intel_dsi_cabc.c line 119
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +1
-0+ mipi_dsi_dcs_write(dsi_device,
MIPI_DCS_WRITE_CONTROL_DISPLAY,drivers/gpu/drm/i915/intel_dsi_cabc.c
Quoted 3 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +3
-0+ &data, sizeof(data)); + data =CABC_STILL_PICTURE ; + mipi_dsi_dcs_write(dsi_device,
MIPI_DCS_WRITE_POWER_SAVE,drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct
Quoted 48 lines
drivers/gpu/drm/i915/intel_dsi_cabc.c new file +42
-0+ &data, sizeof(data)); + } + +cabc_set_backlight (connector, panel->backlight.level); } + +static int cabc_setup_backlight (struct intel_connector *connector, +enum pipe unused) +{ +struct intel_panel *panel = &connector->panel; + + panel->backlight.max =CABC_MAX_VALUE ; + panel->backlight.level =CABC_MAX_VALUE ; + +return 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 -ENODEV ; + +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 ; + + 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&&
Quoted 9 lines
drivers/gpu/drm/i915/intel_panel.c intel_panel_init_backlight_funcs(struct intel_panel *panel) · line 1727
Quoted 6 lines
drivers/gpu/drm/i915/intel_panel.c +3
-0+ 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;--
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 series starting with [1/2] drm/i915: Parsing the PWM cntrl and CABC ON/OFF fileds in VBT
In reply to Deepak M== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Parsing the PWM cntrl and CABC ON/OFF fileds in VBT
URL : https://patchwork.freedesktop.org/series/4847/
State : failure
== Summary ==
CC [M] drivers/net/ethernet/intel/igb/e1000_mac.o CC [M] drivers/net/ethernet/intel/igb/e1000_nvm.o CC [M] drivers/net/ethernet/intel/e1000/e1000_hw.o CC [M] drivers/net/ethernet/intel/igb/e1000_phy.o CC [M] drivers/net/ethernet/intel/e1000/e1000_ethtool.o CC [M] drivers/net/ethernet/intel/igb/e1000_mbx.o CC [M] drivers/net/ethernet/intel/e1000e/80003es2lan.o CC [M] drivers/net/ethernet/intel/igb/igb_ptp.o CC [M] drivers/net/ethernet/intel/igb/e1000_i210.o CC [M] drivers/net/ethernet/intel/e1000e/mac.o CC [M] drivers/net/ethernet/intel/igb/igb_hwmon.o CC [M] drivers/net/ethernet/intel/e1000e/manage.o CC [M] drivers/net/ethernet/intel/e1000e/nvm.o CC [M] drivers/net/ethernet/intel/e1000/e1000_param.o CC [M] drivers/net/ethernet/intel/e1000e/phy.o CC [M] drivers/net/ethernet/intel/e1000e/param.o CC [M] drivers/net/ethernet/intel/e1000e/ethtool.o CC [M] drivers/net/ethernet/intel/e1000e/netdev.o CC [M] drivers/net/ethernet/intel/e1000e/ptp.o LD drivers/usb/host/xhci-hcd.o LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o LD drivers/usb/host/built-in.o LD drivers/usb/built-in.o LD [M] drivers/net/ethernet/intel/e1000/e1000.o LD [M] drivers/net/ethernet/intel/igb/igb.o LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o LD drivers/net/ethernet/built-in.o LD drivers/net/built-in.o
Makefile:950: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx