| From ced11233a99f59a6b71e0ce315e80577d28f2f32 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Mon, 16 Sep 2013 17:38:30 +0300 |
| Subject: drm/i915: Add POWER_DOMAIN_VGA |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| VGA registers/memory live inside the the display power well. Add a power |
| domain for VGA. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit cdf8dd7f888bb8b48adf2ae3babc5aad4b1a7a1e) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_drv.h | 1 + |
| drivers/gpu/drm/i915/intel_pm.c | 3 +++ |
| 2 files changed, 4 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h |
| index 09a5c829168c..8c52cbdb76f3 100644 |
| --- a/drivers/gpu/drm/i915/i915_drv.h |
| +++ b/drivers/gpu/drm/i915/i915_drv.h |
| @@ -99,6 +99,7 @@ enum intel_display_power_domain { |
| POWER_DOMAIN_TRANSCODER_B, |
| POWER_DOMAIN_TRANSCODER_C, |
| POWER_DOMAIN_TRANSCODER_EDP = POWER_DOMAIN_TRANSCODER_A + 0xF, |
| + POWER_DOMAIN_VGA, |
| }; |
| |
| #define POWER_DOMAIN_PIPE(pipe) ((pipe) + POWER_DOMAIN_PIPE_A) |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index 99f4eadb1af3..4692f8cb7724 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -5283,6 +5283,7 @@ bool intel_display_power_enabled(struct drm_device *dev, |
| case POWER_DOMAIN_PIPE_A: |
| case POWER_DOMAIN_TRANSCODER_EDP: |
| return true; |
| + case POWER_DOMAIN_VGA: |
| case POWER_DOMAIN_PIPE_B: |
| case POWER_DOMAIN_PIPE_C: |
| case POWER_DOMAIN_PIPE_A_PANEL_FITTER: |
| @@ -5371,6 +5372,7 @@ void intel_display_power_get(struct drm_device *dev, |
| case POWER_DOMAIN_PIPE_A: |
| case POWER_DOMAIN_TRANSCODER_EDP: |
| return; |
| + case POWER_DOMAIN_VGA: |
| case POWER_DOMAIN_PIPE_B: |
| case POWER_DOMAIN_PIPE_C: |
| case POWER_DOMAIN_PIPE_A_PANEL_FITTER: |
| @@ -5401,6 +5403,7 @@ void intel_display_power_put(struct drm_device *dev, |
| case POWER_DOMAIN_PIPE_A: |
| case POWER_DOMAIN_TRANSCODER_EDP: |
| return; |
| + case POWER_DOMAIN_VGA: |
| case POWER_DOMAIN_PIPE_B: |
| case POWER_DOMAIN_PIPE_C: |
| case POWER_DOMAIN_PIPE_A_PANEL_FITTER: |
| -- |
| 1.8.5.rc3 |
| |