diff options
| author | Imre Deak | 2016-08-10 13:07:30 +0200 |
|---|---|---|
| committer | Imre Deak | 2016-08-10 15:00:44 +0200 |
| commit | 5a162e229a0472bb3e953aa6fc1bb6fcf52843c8 (patch) | |
| tree | b195de732e932bcb9e3d442b07a508accbf656c3 /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | drm/i915: Merge the PPS register definitions (diff) | |
| download | kernel-qcow2-linux-5a162e229a0472bb3e953aa6fc1bb6fcf52843c8.tar.gz kernel-qcow2-linux-5a162e229a0472bb3e953aa6fc1bb6fcf52843c8.tar.xz kernel-qcow2-linux-5a162e229a0472bb3e953aa6fc1bb6fcf52843c8.zip | |
drm/i915: Merge TARGET_POWER_ON and PANEL_POWER_ON flag definitions
These two flags mean the same thing, so remove the duplication.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470827254-21954-2-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 413e729d2499..c5739fc9e5fe 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -220,7 +220,7 @@ static void intel_enable_lvds(struct intel_encoder *encoder) I915_WRITE(lvds_encoder->reg, I915_READ(lvds_encoder->reg) | LVDS_PORT_EN); - I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) | POWER_TARGET_ON); + I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) | PANEL_POWER_ON); POSTING_READ(lvds_encoder->reg); if (intel_wait_for_register(dev_priv, PP_STATUS(0), PP_ON, PP_ON, 1000)) DRM_ERROR("timed out waiting for panel to power on\n"); @@ -234,7 +234,7 @@ static void intel_disable_lvds(struct intel_encoder *encoder) struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); struct drm_i915_private *dev_priv = to_i915(dev); - I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) & ~POWER_TARGET_ON); + I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) & ~PANEL_POWER_ON); if (intel_wait_for_register(dev_priv, PP_STATUS(0), PP_ON, 0, 1000)) DRM_ERROR("timed out waiting for panel to power off\n"); |