drm/i915/cnp: Backlight support for CNP.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 2 Jun 2017 20:06:42 +0000 (13:06 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 2 Jun 2017 20:58:02 +0000 (13:58 -0700)
Split out BXT and CNP's setup_backlight(),enable_backlight(),
disable_backlight() and hz_to_pwm() into
two separate functions instead of reusing BXT function.

Reuse set_backlight() and get_backlight() since they have
no reference to the utility pin.

v2: Reuse BXT functions with controller 0 instead of
    redefining it. (Jani).
    Use dev_priv->rawclk_freq instead of getting the value
    from SFUSE_STRAP.
v3: Avoid setup backligh controller along with hooks and
    fully reuse hooks setup as suggested by Jani.
v4: Clean up commit message.
v5: Implement per PCH instead per platform.

v6: Introduce a new function for CNP.(Jani and Ville)

v7: Squash the all CNP Backlight support patches into a
single patch. (Jani)

v8: Correct indentation, remove unneeded blank lines and
correct mail address (Jani).

v9: Remove unused enum pipe. (by CI)

v10: Remove comment mentioning SFUSE_STRAP in a part of
     the code that we don't use it. (Jani)
     Make controller = 0 since current CNP has only one
     controller and put a comment mentioning why we
     reuse the BXT definitions and are keeping the
     controller = 0. (DK)
v11: Remove spurious line. (DK)

Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Suggested-by: Jani Nikula <jani.nikula@intel.com>
Suggested-by: Ville Syrjala <ville.syrjala@intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1496434004-29812-4-git-send-email-rodrigo.vivi@intel.com
drivers/gpu/drm/i915/intel_panel.c

index c8103f8d4dfa7723e5b4093c17b656b7853a2453..4114cb3f14e71c7dbf6fde046afbdf8b7ee1faf8 100644 (file)
@@ -796,6 +796,19 @@ static void bxt_disable_backlight(struct intel_connector *connector)
        }
 }
 
+static void cnp_disable_backlight(struct intel_connector *connector)
+{
+       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+       struct intel_panel *panel = &connector->panel;
+       u32 tmp;
+
+       intel_panel_actually_set_backlight(connector, 0);
+
+       tmp = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
+       I915_WRITE(BXT_BLC_PWM_CTL(panel->backlight.controller),
+                  tmp & ~BXT_BLC_PWM_ENABLE);
+}
+
 static void pwm_disable_backlight(struct intel_connector *connector)
 {
        struct intel_panel *panel = &connector->panel;
@@ -1086,6 +1099,35 @@ static void bxt_enable_backlight(struct intel_connector *connector)
                        pwm_ctl | BXT_BLC_PWM_ENABLE);
 }
 
+static void cnp_enable_backlight(struct intel_connector *connector)
+{
+       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+       struct intel_panel *panel = &connector->panel;
+       u32 pwm_ctl;
+
+       pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
+       if (pwm_ctl & BXT_BLC_PWM_ENABLE) {
+               DRM_DEBUG_KMS("backlight already enabled\n");
+               pwm_ctl &= ~BXT_BLC_PWM_ENABLE;
+               I915_WRITE(BXT_BLC_PWM_CTL(panel->backlight.controller),
+                          pwm_ctl);
+       }
+
+       I915_WRITE(BXT_BLC_PWM_FREQ(panel->backlight.controller),
+                  panel->backlight.max);
+
+       intel_panel_actually_set_backlight(connector, panel->backlight.level);
+
+       pwm_ctl = 0;
+       if (panel->backlight.active_low_pwm)
+               pwm_ctl |= BXT_BLC_PWM_POLARITY;
+
+       I915_WRITE(BXT_BLC_PWM_CTL(panel->backlight.controller), pwm_ctl);
+       POSTING_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
+       I915_WRITE(BXT_BLC_PWM_CTL(panel->backlight.controller),
+                  pwm_ctl | BXT_BLC_PWM_ENABLE);
+}
+
 static void pwm_enable_backlight(struct intel_connector *connector)
 {
        struct intel_panel *panel = &connector->panel;
@@ -1249,6 +1291,17 @@ void intel_backlight_device_unregister(struct intel_connector *connector)
 }
 #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
 
+/*
+ * CNP: PWM clock frequency is 19.2 MHz or 24 MHz.
+ *      PWM increment = 1
+ */
+static u32 cnp_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
+{
+       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+
+       return DIV_ROUND_CLOSEST(KHz(dev_priv->rawclk_freq), pwm_freq_hz);
+}
+
 /*
  * BXT: PWM clock frequency = 19.2 MHz.
  */
@@ -1644,6 +1697,42 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
        return 0;
 }
 
+static int
+cnp_setup_backlight(struct intel_connector *connector, enum pipe unused)
+{
+       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+       struct intel_panel *panel = &connector->panel;
+       u32 pwm_ctl, val;
+
+       /*
+        * CNP has the BXT implementation of backlight, but with only
+        * one controller. Future platforms could have multiple controllers
+        * so let's make this extensible and prepared for the future.
+        */
+       panel->backlight.controller = 0;
+
+       pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
+
+       panel->backlight.active_low_pwm = pwm_ctl & BXT_BLC_PWM_POLARITY;
+       panel->backlight.max =
+               I915_READ(BXT_BLC_PWM_FREQ(panel->backlight.controller));
+
+       if (!panel->backlight.max)
+               panel->backlight.max = get_backlight_max_vbt(connector);
+
+       if (!panel->backlight.max)
+               return -ENODEV;
+
+       val = bxt_get_backlight(connector);
+       val = intel_panel_compute_brightness(connector, val);
+       panel->backlight.level = clamp(val, panel->backlight.min,
+                                      panel->backlight.max);
+
+       panel->backlight.enabled = pwm_ctl & BXT_BLC_PWM_ENABLE;
+
+       return 0;
+}
+
 static int pwm_setup_backlight(struct intel_connector *connector,
                               enum pipe pipe)
 {
@@ -1760,6 +1849,13 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
                panel->backlight.set = bxt_set_backlight;
                panel->backlight.get = bxt_get_backlight;
                panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
+       } else if (HAS_PCH_CNP(dev_priv)) {
+               panel->backlight.setup = cnp_setup_backlight;
+               panel->backlight.enable = cnp_enable_backlight;
+               panel->backlight.disable = cnp_disable_backlight;
+               panel->backlight.set = bxt_set_backlight;
+               panel->backlight.get = bxt_get_backlight;
+               panel->backlight.hz_to_pwm = cnp_hz_to_pwm;
        } else if (HAS_PCH_LPT(dev_priv) || HAS_PCH_SPT(dev_priv) ||
                   HAS_PCH_KBP(dev_priv)) {
                panel->backlight.setup = lpt_setup_backlight;