aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_panel.c
diff options
context:
space:
mode:
authorVandana Kannan <vandana.kannan@intel.com>2015-05-05 05:21:56 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-05-08 07:03:38 -0400
commit0fb890c01349c52b55b7adb4a18b362d141303d1 (patch)
treeb98b086a323045a871c09472aff9e7a45ae26825 /drivers/gpu/drm/i915/intel_panel.c
parentb3da4a627eb710254e09c6b8dbe94a4aa35382d2 (diff)
drm/i915/bxt: BLC implementation
Enabling BLC on BXT. Includes register definition, and new functions for BXT. In BXT, there are 2 sets of registers for BLC. Until there is clarity about which set would be effective, set 1 is being used. This would have to be re-visited if there is any change or when 2 LFPs are enabled on BXT. This patch enables brightness change which would be effected by use of hot-keys or sysfs entry. TODO:- BLC implementation will have to re-visited when 1. there is clarity about which set of registers has to be used and when. 2. CDCLK frequency is changed v2: Jani's review comments - Modified comment in i915_reg.h - Renamed register defintions - Removed definition of duty cycle max. Not required now and its not 64-bit. v3: - Rebase on top of VLV/CHV backlight changes, in particuliar bxt_set_backlight() now has a different prototype (Damien) Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Shankar, Uma <uma.shankar@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
-rw-r--r--drivers/gpu/drm/i915/intel_panel.c87
1 files changed, 86 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 08532d4ffe0a..7d83527f95f7 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -536,6 +536,14 @@ static u32 vlv_get_backlight(struct intel_connector *connector)
536 return _vlv_get_backlight(dev, pipe); 536 return _vlv_get_backlight(dev, pipe);
537} 537}
538 538
539static u32 bxt_get_backlight(struct intel_connector *connector)
540{
541 struct drm_device *dev = connector->base.dev;
542 struct drm_i915_private *dev_priv = dev->dev_private;
543
544 return I915_READ(BXT_BLC_PWM_DUTY1);
545}
546
539static u32 intel_panel_get_backlight(struct intel_connector *connector) 547static u32 intel_panel_get_backlight(struct intel_connector *connector)
540{ 548{
541 struct drm_device *dev = connector->base.dev; 549 struct drm_device *dev = connector->base.dev;
@@ -616,6 +624,14 @@ static void vlv_set_backlight(struct intel_connector *connector, u32 level)
616 I915_WRITE(VLV_BLC_PWM_CTL(pipe), tmp | level); 624 I915_WRITE(VLV_BLC_PWM_CTL(pipe), tmp | level);
617} 625}
618 626
627static void bxt_set_backlight(struct intel_connector *connector, u32 level)
628{
629 struct drm_device *dev = connector->base.dev;
630 struct drm_i915_private *dev_priv = dev->dev_private;
631
632 I915_WRITE(BXT_BLC_PWM_DUTY1, level);
633}
634
619static void 635static void
620intel_panel_actually_set_backlight(struct intel_connector *connector, u32 level) 636intel_panel_actually_set_backlight(struct intel_connector *connector, u32 level)
621{ 637{
@@ -741,6 +757,18 @@ static void vlv_disable_backlight(struct intel_connector *connector)
741 I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp & ~BLM_PWM_ENABLE); 757 I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp & ~BLM_PWM_ENABLE);
742} 758}
743 759
760static void bxt_disable_backlight(struct intel_connector *connector)
761{
762 struct drm_device *dev = connector->base.dev;
763 struct drm_i915_private *dev_priv = dev->dev_private;
764 u32 tmp;
765
766 intel_panel_actually_set_backlight(connector, 0);
767
768 tmp = I915_READ(BXT_BLC_PWM_CTL1);
769 I915_WRITE(BXT_BLC_PWM_CTL1, tmp & ~BXT_BLC_PWM_ENABLE);
770}
771
744void intel_panel_disable_backlight(struct intel_connector *connector) 772void intel_panel_disable_backlight(struct intel_connector *connector)
745{ 773{
746 struct drm_device *dev = connector->base.dev; 774 struct drm_device *dev = connector->base.dev;
@@ -947,6 +975,33 @@ static void vlv_enable_backlight(struct intel_connector *connector)
947 I915_WRITE(VLV_BLC_PWM_CTL2(pipe), ctl2 | BLM_PWM_ENABLE); 975 I915_WRITE(VLV_BLC_PWM_CTL2(pipe), ctl2 | BLM_PWM_ENABLE);
948} 976}
949 977
978static void bxt_enable_backlight(struct intel_connector *connector)
979{
980 struct drm_device *dev = connector->base.dev;
981 struct drm_i915_private *dev_priv = dev->dev_private;
982 struct intel_panel *panel = &connector->panel;
983 u32 pwm_ctl;
984
985 pwm_ctl = I915_READ(BXT_BLC_PWM_CTL1);
986 if (pwm_ctl & BXT_BLC_PWM_ENABLE) {
987 DRM_DEBUG_KMS("backlight already enabled\n");
988 pwm_ctl &= ~BXT_BLC_PWM_ENABLE;
989 I915_WRITE(BXT_BLC_PWM_CTL1, pwm_ctl);
990 }
991
992 I915_WRITE(BXT_BLC_PWM_FREQ1, panel->backlight.max);
993
994 intel_panel_actually_set_backlight(connector, panel->backlight.level);
995
996 pwm_ctl = 0;
997 if (panel->backlight.active_low_pwm)
998 pwm_ctl |= BXT_BLC_PWM_POLARITY;
999
1000 I915_WRITE(BXT_BLC_PWM_CTL1, pwm_ctl);
1001 POSTING_READ(BXT_BLC_PWM_CTL1);
1002 I915_WRITE(BXT_BLC_PWM_CTL1, pwm_ctl | BXT_BLC_PWM_ENABLE);
1003}
1004
950void intel_panel_enable_backlight(struct intel_connector *connector) 1005void intel_panel_enable_backlight(struct intel_connector *connector)
951{ 1006{
952 struct drm_device *dev = connector->base.dev; 1007 struct drm_device *dev = connector->base.dev;
@@ -1299,6 +1354,30 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
1299 return 0; 1354 return 0;
1300} 1355}
1301 1356
1357static int
1358bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
1359{
1360 struct drm_device *dev = connector->base.dev;
1361 struct drm_i915_private *dev_priv = dev->dev_private;
1362 struct intel_panel *panel = &connector->panel;
1363 u32 pwm_ctl, val;
1364
1365 pwm_ctl = I915_READ(BXT_BLC_PWM_CTL1);
1366 panel->backlight.active_low_pwm = pwm_ctl & BXT_BLC_PWM_POLARITY;
1367
1368 panel->backlight.max = I915_READ(BXT_BLC_PWM_FREQ1);
1369 if (!panel->backlight.max)
1370 return -ENODEV;
1371
1372 val = bxt_get_backlight(connector);
1373 panel->backlight.level = intel_panel_compute_brightness(connector, val);
1374
1375 panel->backlight.enabled = (pwm_ctl & BXT_BLC_PWM_ENABLE) &&
1376 panel->backlight.level != 0;
1377
1378 return 0;
1379}
1380
1302int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe) 1381int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
1303{ 1382{
1304 struct drm_device *dev = connector->dev; 1383 struct drm_device *dev = connector->dev;
@@ -1350,7 +1429,13 @@ void intel_panel_init_backlight_funcs(struct drm_device *dev)
1350{ 1429{
1351 struct drm_i915_private *dev_priv = dev->dev_private; 1430 struct drm_i915_private *dev_priv = dev->dev_private;
1352 1431
1353 if (IS_BROADWELL(dev) || (INTEL_INFO(dev)->gen >= 9)) { 1432 if (IS_BROXTON(dev)) {
1433 dev_priv->display.setup_backlight = bxt_setup_backlight;
1434 dev_priv->display.enable_backlight = bxt_enable_backlight;
1435 dev_priv->display.disable_backlight = bxt_disable_backlight;
1436 dev_priv->display.set_backlight = bxt_set_backlight;
1437 dev_priv->display.get_backlight = bxt_get_backlight;
1438 } else if (IS_BROADWELL(dev) || IS_SKYLAKE(dev)) {
1354 dev_priv->display.setup_backlight = bdw_setup_backlight; 1439 dev_priv->display.setup_backlight = bdw_setup_backlight;
1355 dev_priv->display.enable_backlight = bdw_enable_backlight; 1440 dev_priv->display.enable_backlight = bdw_enable_backlight;
1356 dev_priv->display.disable_backlight = pch_disable_backlight; 1441 dev_priv->display.disable_backlight = pch_disable_backlight;