[Intel-gfx] [PATCH 03/11] CHROMIUM: drm/i915: use backlight wrapper functions instead of direct calls

[clinton.a.taylor at intel.com]

From: Jesse Barnes <jbarnes at virtuousgeek.org>

Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Wayne Boyer <wayne.boyer at intel.com>

BUG=chrome-os-partner:25159
TEST=suspend/resume test on instrumented system shows correct signaling
on oscope.

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c

Change-Id: Id736d39da630cdfb045b293772f5594576660c12
Reviewed-on: https://chromium-review.googlesource.com/192472
Reviewed-by: Stéphane Marchesin <marcheu at chromium.org>
Reviewed-by: Aaron Durbin <adurbin at chromium.org>
Tested-by: Wayne Boyer <wayne.boyer at intel.com>
Commit-Queue: Wayne Boyer <wayne.boyer at intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c    |    2 +-
 drivers/gpu/drm/i915/intel_drv.h   |    1 +
 drivers/gpu/drm/i915/intel_panel.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 9242499..e036da4 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -375,7 +375,7 @@ static void assert_pwm(struct drm_i915_private *dev_priv,
 {
 	bool state;
 
-	state = dev_priv->display.get_backlight(connector);
+	state = intel_panel_get_backlight(connector);
 
 	WARN(state != expected_state, "pwm state failure, expected %d, found "
 	     "%d\n", expected_state, state);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index ea137f4..4ce4aca 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -954,6 +954,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *crtc,
 			      int fitting_mode);
 void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
 			       u32 max);
+u32 intel_panel_get_backlight(struct intel_connector *connector);
 int intel_panel_setup_backlight(struct drm_connector *connector);
 void intel_panel_enable_backlight(struct intel_connector *connector);
 void intel_panel_disable_backlight(struct intel_connector *connector);
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 12b02fe..40e0cb08 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -470,7 +470,7 @@ static u32 vlv_get_backlight(struct intel_connector *connector)
 	return _vlv_get_backlight(dev, pipe);
 }
 
-static u32 intel_panel_get_backlight(struct intel_connector *connector)
+u32 intel_panel_get_backlight(struct intel_connector *connector)
 {
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-- 
1.7.9.5