From: Shobhit Kumar <shobhit.kumar@intel.com> To: intel-gfx <intel-gfx@lists.freedesktop.org>, linux-kernel <linux-kernel@vger.kernel.org>, linux-gpio <linux-gpio@vger.kernel.org>, linux-pwm <linux-pwm@vger.kernel.org>, dri-devel <dri-devel@lists.freedesktop.org> Cc: Alexandre Courbot <gnurou@gmail.com>, Samuel Ortiz <sameo@linux.intel.com>, Povilas Staniulis <wdmonster@gmail.com>, David Airlie <airlied@linux.ie>, Shobhit Kumar <shobhit.kumar@intel.com>, Linus Walleij <linus.walleij@linaro.org>, Jani Nikula <jani.nikula@intel.com>, Chih-Wei Huang <cwhuang@android-x86.org>, Thierry Reding <thierry.reding@gmail.com>, Daniel Vetter <daniel.vetter@intel.com>, Lee Jones <lee.jones@linaro.org> Subject: [PATCH 7/8] drm/i915: Use the CRC gpio for panel enable/disable Date: Wed, 29 Apr 2015 19:30:04 +0530 [thread overview] Message-ID: <1430316005-16480-8-git-send-email-shobhit.kumar@intel.com> (raw) In-Reply-To: <1430316005-16480-1-git-send-email-shobhit.kumar@intel.com> The CRC (Crystal Cove) PMIC, controls the panel enable and disable signals for BYT for dsi panels. This is indicated in the VBT fields. Use that to initialize and use GPIO based control for these signals. v2: Use the newer gpiod interface(Alexandre) v3: Remove the redundant checks and unused code (Ville) CC: Samuel Ortiz <sameo@linux.intel.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> --- drivers/gpu/drm/i915/intel_dsi.c | 32 ++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_dsi.h | 6 ++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 5196642..be55ffa 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -31,6 +31,7 @@ #include <drm/drm_panel.h> #include <drm/drm_mipi_dsi.h> #include <linux/slab.h> +#include <linux/gpio/consumer.h> #include "i915_drv.h" #include "intel_drv.h" #include "intel_dsi.h" @@ -415,6 +416,12 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder) DRM_DEBUG_KMS("\n"); + /* Panel Enable over CRC PMIC */ + if (intel_dsi->gpio_panel) + gpiod_set_value_cansleep(intel_dsi->gpio_panel, 1); + + msleep(intel_dsi->panel_on_delay); + /* Disable DPOunit clock gating, can stall pipe * and we need DPLL REFA always enabled */ tmp = I915_READ(DPLL(pipe)); @@ -432,8 +439,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder) /* put device in ready state */ intel_dsi_device_ready(encoder); - msleep(intel_dsi->panel_on_delay); - drm_panel_prepare(intel_dsi->panel); for_each_dsi_port(port, intel_dsi->ports) @@ -576,6 +581,10 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder) msleep(intel_dsi->panel_off_delay); msleep(intel_dsi->panel_pwr_cycle_delay); + + /* Panel Disable over CRC PMIC */ + if (intel_dsi->gpio_panel) + gpiod_set_value_cansleep(intel_dsi->gpio_panel, 0); } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, @@ -955,6 +964,11 @@ static void intel_dsi_encoder_destroy(struct drm_encoder *encoder) /* XXX: Logically this call belongs in the panel driver. */ drm_panel_remove(intel_dsi->panel); } + + /* dispose of the gpios */ + if (intel_dsi->gpio_panel) + gpiod_put(intel_dsi->gpio_panel); + intel_encoder_destroy(encoder); } @@ -1071,6 +1085,20 @@ void intel_dsi_init(struct drm_device *dev) goto err; } + /* + * In case of BYT with CRC PMIC, we need to use GPIO for + * Panel control. + */ + if (dev_priv->vbt.dsi.config->pwm_blc == PPS_BLC_PMIC) { + intel_dsi->gpio_panel = + gpiod_get(dev->dev, "panel", GPIOD_OUT_HIGH); + + if (IS_ERR(intel_dsi->gpio_panel)) { + DRM_ERROR("Failed to own gpio for panel control\n"); + intel_dsi->gpio_panel = NULL; + } + } + intel_encoder->type = INTEL_OUTPUT_DSI; intel_encoder->cloneable = 0; drm_connector_init(dev, connector, &intel_dsi_connector_funcs, diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h index 2784ac4..bf1bade 100644 --- a/drivers/gpu/drm/i915/intel_dsi.h +++ b/drivers/gpu/drm/i915/intel_dsi.h @@ -29,6 +29,9 @@ #include <drm/drm_mipi_dsi.h> #include "intel_drv.h" +#define PPS_BLC_PMIC 0 +#define PPS_BLC_SOC 1 + /* Dual Link support */ #define DSI_DUAL_LINK_NONE 0 #define DSI_DUAL_LINK_FRONT_BACK 1 @@ -42,6 +45,9 @@ struct intel_dsi { struct drm_panel *panel; struct intel_dsi_host *dsi_hosts[I915_MAX_PORTS]; + /* GPIO Desc for CRC based Panel control */ + struct gpio_desc *gpio_panel; + struct intel_connector *attached_connector; /* bit mask of ports being driven */ -- 2.1.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Shobhit Kumar <shobhit.kumar@intel.com> To: intel-gfx <intel-gfx@lists.freedesktop.org>, linux-kernel <linux-kernel@vger.kernel.org>, linux-gpio <linux-gpio@vger.kernel.org>, linux-pwm <linux-pwm@vger.kernel.org>, dri-devel <dri-devel@lists.freedesktop.org> Cc: Linus Walleij <linus.walleij@linaro.org>, Alexandre Courbot <gnurou@gmail.com>, Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie>, Samuel Ortiz <sameo@linux.intel.com>, Thierry Reding <thierry.reding@gmail.com>, Jani Nikula <jani.nikula@intel.com>, Lee Jones <lee.jones@linaro.org>, Povilas Staniulis <wdmonster@gmail.com>, Chih-Wei Huang <cwhuang@android-x86.org>, Shobhit Kumar <shobhit.kumar@intel.com> Subject: [PATCH 7/8] drm/i915: Use the CRC gpio for panel enable/disable Date: Wed, 29 Apr 2015 19:30:04 +0530 [thread overview] Message-ID: <1430316005-16480-8-git-send-email-shobhit.kumar@intel.com> (raw) In-Reply-To: <1430316005-16480-1-git-send-email-shobhit.kumar@intel.com> The CRC (Crystal Cove) PMIC, controls the panel enable and disable signals for BYT for dsi panels. This is indicated in the VBT fields. Use that to initialize and use GPIO based control for these signals. v2: Use the newer gpiod interface(Alexandre) v3: Remove the redundant checks and unused code (Ville) CC: Samuel Ortiz <sameo@linux.intel.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> --- drivers/gpu/drm/i915/intel_dsi.c | 32 ++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_dsi.h | 6 ++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 5196642..be55ffa 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -31,6 +31,7 @@ #include <drm/drm_panel.h> #include <drm/drm_mipi_dsi.h> #include <linux/slab.h> +#include <linux/gpio/consumer.h> #include "i915_drv.h" #include "intel_drv.h" #include "intel_dsi.h" @@ -415,6 +416,12 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder) DRM_DEBUG_KMS("\n"); + /* Panel Enable over CRC PMIC */ + if (intel_dsi->gpio_panel) + gpiod_set_value_cansleep(intel_dsi->gpio_panel, 1); + + msleep(intel_dsi->panel_on_delay); + /* Disable DPOunit clock gating, can stall pipe * and we need DPLL REFA always enabled */ tmp = I915_READ(DPLL(pipe)); @@ -432,8 +439,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder) /* put device in ready state */ intel_dsi_device_ready(encoder); - msleep(intel_dsi->panel_on_delay); - drm_panel_prepare(intel_dsi->panel); for_each_dsi_port(port, intel_dsi->ports) @@ -576,6 +581,10 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder) msleep(intel_dsi->panel_off_delay); msleep(intel_dsi->panel_pwr_cycle_delay); + + /* Panel Disable over CRC PMIC */ + if (intel_dsi->gpio_panel) + gpiod_set_value_cansleep(intel_dsi->gpio_panel, 0); } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, @@ -955,6 +964,11 @@ static void intel_dsi_encoder_destroy(struct drm_encoder *encoder) /* XXX: Logically this call belongs in the panel driver. */ drm_panel_remove(intel_dsi->panel); } + + /* dispose of the gpios */ + if (intel_dsi->gpio_panel) + gpiod_put(intel_dsi->gpio_panel); + intel_encoder_destroy(encoder); } @@ -1071,6 +1085,20 @@ void intel_dsi_init(struct drm_device *dev) goto err; } + /* + * In case of BYT with CRC PMIC, we need to use GPIO for + * Panel control. + */ + if (dev_priv->vbt.dsi.config->pwm_blc == PPS_BLC_PMIC) { + intel_dsi->gpio_panel = + gpiod_get(dev->dev, "panel", GPIOD_OUT_HIGH); + + if (IS_ERR(intel_dsi->gpio_panel)) { + DRM_ERROR("Failed to own gpio for panel control\n"); + intel_dsi->gpio_panel = NULL; + } + } + intel_encoder->type = INTEL_OUTPUT_DSI; intel_encoder->cloneable = 0; drm_connector_init(dev, connector, &intel_dsi_connector_funcs, diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h index 2784ac4..bf1bade 100644 --- a/drivers/gpu/drm/i915/intel_dsi.h +++ b/drivers/gpu/drm/i915/intel_dsi.h @@ -29,6 +29,9 @@ #include <drm/drm_mipi_dsi.h> #include "intel_drv.h" +#define PPS_BLC_PMIC 0 +#define PPS_BLC_SOC 1 + /* Dual Link support */ #define DSI_DUAL_LINK_NONE 0 #define DSI_DUAL_LINK_FRONT_BACK 1 @@ -42,6 +45,9 @@ struct intel_dsi { struct drm_panel *panel; struct intel_dsi_host *dsi_hosts[I915_MAX_PORTS]; + /* GPIO Desc for CRC based Panel control */ + struct gpio_desc *gpio_panel; + struct intel_connector *attached_connector; /* bit mask of ports being driven */ -- 2.1.0
next prev parent reply other threads:[~2015-04-29 14:00 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-29 13:59 [PATCH 0/8] Crystalcove (CRC) PMIC based panel and pwm control Shobhit Kumar 2015-04-29 13:59 ` Shobhit Kumar 2015-04-29 13:59 ` [PATCH 1/8] drivers/gpio/gpiolib: Add support for removing registered consumer lookup table Shobhit Kumar 2015-05-05 9:32 ` [PATCH 1/8] gpiolib: " Shobhit Kumar 2015-05-05 9:32 ` Shobhit Kumar 2015-05-05 10:45 ` Lee Jones 2015-05-05 10:45 ` Lee Jones 2015-05-05 15:44 ` [Intel-gfx] " Daniel Vetter 2015-05-05 15:44 ` Daniel Vetter 2015-05-07 7:25 ` Lee Jones 2015-05-07 7:25 ` [Intel-gfx] " Lee Jones 2015-05-06 14:49 ` [PATCH 1/8] drivers/gpio/gpiolib: " Linus Walleij 2015-05-06 14:49 ` Linus Walleij 2015-05-06 15:09 ` Daniel Vetter 2015-05-06 15:09 ` [Intel-gfx] " Daniel Vetter 2015-05-12 8:52 ` Linus Walleij 2015-05-12 8:52 ` Linus Walleij 2015-04-29 13:59 ` [PATCH 2/8] drivers/pwm/core: Add support to remove registered consumer lookup tables Shobhit Kumar 2015-05-05 9:34 ` [PATCH 2/8] pwm: core: " Shobhit Kumar 2015-05-05 9:34 ` Shobhit Kumar 2015-05-06 12:21 ` Thierry Reding 2015-05-06 12:21 ` Thierry Reding 2015-04-29 14:00 ` [PATCH 3/8] drivers/mfd: Add lookup table for Panel Control as GPIO signal Shobhit Kumar 2015-04-29 14:27 ` Lee Jones 2015-04-30 7:17 ` Shobhit Kumar 2015-04-29 14:29 ` Lee Jones 2015-04-29 14:29 ` Lee Jones 2015-05-05 9:36 ` [PATCH 3/8] mfd: intel_soc_pmic_core: " Shobhit Kumar 2015-05-12 9:14 ` Linus Walleij 2015-05-12 9:14 ` Linus Walleij 2015-05-06 14:51 ` [PATCH 3/8] drivers/mfd: " Linus Walleij 2015-05-06 14:51 ` Linus Walleij 2015-04-29 14:00 ` [PATCH 4/8] drivers/mfd: Add PWM cell device for Crystalcove PMIC Shobhit Kumar 2015-04-29 14:00 ` Shobhit Kumar 2015-04-29 14:25 ` Lee Jones 2015-04-29 14:25 ` Lee Jones 2015-05-05 9:36 ` [PATCH 4/8] mfd: intel_soc_pmic_crc: " Shobhit Kumar 2015-04-29 14:00 ` [PATCH 5/8] drivers/mfd: ADD PWM lookup table for CRC PMIC based PWM Shobhit Kumar 2015-04-29 14:00 ` Shobhit Kumar 2015-04-29 14:24 ` Lee Jones 2015-05-05 9:48 ` Shobhit Kumar 2015-05-05 10:42 ` Lee Jones 2015-05-05 10:42 ` Lee Jones 2015-05-05 9:38 ` [PATCH 5/8] mfd: intel_soc_pmic_core: " Shobhit Kumar 2015-05-05 9:38 ` Shobhit Kumar 2015-04-29 14:00 ` [PATCH 6/8] drivers/pwm: Add Crystalcove (CRC) PWM driver Shobhit Kumar 2015-04-29 14:00 ` Shobhit Kumar 2015-04-30 21:12 ` Paul Bolle 2015-06-18 17:54 ` [Intel-gfx] " Shobhit Kumar 2015-06-18 18:41 ` Paul Bolle 2015-06-19 6:46 ` Shobhit Kumar 2015-06-19 6:46 ` [Intel-gfx] " Shobhit Kumar 2015-06-20 11:23 ` Paul Bolle 2015-06-20 11:23 ` Paul Bolle 2015-06-20 18:04 ` Paul Gortmaker 2015-06-20 18:04 ` Paul Gortmaker 2015-06-22 7:55 ` Shobhit Kumar 2015-06-22 7:55 ` [Intel-gfx] " Shobhit Kumar 2015-05-05 9:38 ` [PATCH 6/8] pwm: crc: " Shobhit Kumar 2015-05-05 9:38 ` Shobhit Kumar 2015-05-06 7:40 ` Paul Bolle 2015-05-06 7:40 ` Paul Bolle 2015-05-07 7:13 ` [Intel-gfx] " Shobhit Kumar 2015-05-06 12:14 ` Thierry Reding 2015-05-07 7:19 ` [Intel-gfx] " Shobhit Kumar 2015-05-20 15:09 ` Shobhit Kumar 2015-06-17 2:43 ` Shobhit Kumar 2015-04-29 14:00 ` Shobhit Kumar [this message] 2015-04-29 14:00 ` [PATCH 7/8] drm/i915: Use the CRC gpio for panel enable/disable Shobhit Kumar 2015-05-06 13:11 ` Jani Nikula 2015-05-06 13:11 ` Jani Nikula 2015-05-06 14:08 ` Daniel Vetter 2015-05-06 14:08 ` [Intel-gfx] " Daniel Vetter 2015-05-12 11:10 ` Linus Walleij 2015-04-29 14:00 ` [PATCH 8/8] drm/i915: Backlight control using CRC PMIC based PWM driver Shobhit Kumar 2015-04-29 14:00 ` Shobhit Kumar 2015-05-01 2:03 ` shuang.he 2015-05-06 13:39 ` Jani Nikula 2015-05-06 13:39 ` Jani Nikula
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1430316005-16480-8-git-send-email-shobhit.kumar@intel.com \ --to=shobhit.kumar@intel.com \ --cc=airlied@linux.ie \ --cc=cwhuang@android-x86.org \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=gnurou@gmail.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=lee.jones@linaro.org \ --cc=linus.walleij@linaro.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=sameo@linux.intel.com \ --cc=thierry.reding@gmail.com \ --cc=wdmonster@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.