diff options
| author | Ville Syrjälä | 2014-11-07 10:16:02 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-14 10:29:20 +0100 |
| commit | 6517d2734d22b09d3c9dc44fe6879f013a716d19 (patch) | |
| tree | df411938303a20ab2710bb939526252a74572900 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | drm/i915: Don't deref NULL crtc in intel_get_pipe_from_connector() (diff) | |
| download | kernel-qcow2-linux-6517d2734d22b09d3c9dc44fe6879f013a716d19.tar.gz kernel-qcow2-linux-6517d2734d22b09d3c9dc44fe6879f013a716d19.tar.xz kernel-qcow2-linux-6517d2734d22b09d3c9dc44fe6879f013a716d19.zip | |
drm/i915: Pass the current pipe from eDP init to backlight setup
On VLV/CHV both pipes A and B have their own backlight control
registers. In order to correctly read out the current hardware state at
init we need to know which pipe is driving the eDP port. Pass that
information down from the eDP init code into the backlight code.
To determine the correct pipe we first look at which pipe is currently
configured in the port control register, if that look invalid we look
at which pipe's PPS is currently controlling the port, and if that
too looks invalid we just assume pipe A.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 24993486fd24..ef5155739a1e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1096,7 +1096,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *crtc, int fitting_mode); void intel_panel_set_backlight_acpi(struct intel_connector *connector, u32 level, u32 max); -int intel_panel_setup_backlight(struct drm_connector *connector); +int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe); void intel_panel_enable_backlight(struct intel_connector *connector); void intel_panel_disable_backlight(struct intel_connector *connector); void intel_panel_destroy_backlight(struct drm_connector *connector); |