diff options
author | Imre Deak <imre.deak@intel.com> | 2015-11-27 11:55:28 -0500 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2015-12-02 09:43:08 -0500 |
commit | 8e695444cba743253024ee31abb940778bd65c27 (patch) | |
tree | 757e9e06e3c68f4c15cf50e8b3269402beb8ee4e | |
parent | 88747f133b20e1a2b2f303a68c97ebca211eddc1 (diff) |
drm/i915: add MISSING_CASE to a few port/aux power domain helpers
MISSING_CASE() would have been useful to track down a recent problem in
intel_display_port_aux_power_domain(), so add it there and a few related
helpers. This was also suggested by Ville in his review of the latest
DMC/DC changes, we forgot to address that.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
[Cherry-picked from drm-intel-next-queued b9fec167 (Imre)]
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1448643329-18675-5-git-send-email-imre.deak@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ea03006cc08e..22e86d2e408d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -5194,7 +5194,7 @@ static enum intel_display_power_domain port_to_power_domain(enum port port) | |||
5194 | case PORT_E: | 5194 | case PORT_E: |
5195 | return POWER_DOMAIN_PORT_DDI_E_2_LANES; | 5195 | return POWER_DOMAIN_PORT_DDI_E_2_LANES; |
5196 | default: | 5196 | default: |
5197 | WARN_ON_ONCE(1); | 5197 | MISSING_CASE(port); |
5198 | return POWER_DOMAIN_PORT_OTHER; | 5198 | return POWER_DOMAIN_PORT_OTHER; |
5199 | } | 5199 | } |
5200 | } | 5200 | } |
@@ -5214,7 +5214,7 @@ static enum intel_display_power_domain port_to_aux_power_domain(enum port port) | |||
5214 | /* FIXME: Check VBT for actual wiring of PORT E */ | 5214 | /* FIXME: Check VBT for actual wiring of PORT E */ |
5215 | return POWER_DOMAIN_AUX_D; | 5215 | return POWER_DOMAIN_AUX_D; |
5216 | default: | 5216 | default: |
5217 | WARN_ON_ONCE(1); | 5217 | MISSING_CASE(port); |
5218 | return POWER_DOMAIN_AUX_A; | 5218 | return POWER_DOMAIN_AUX_A; |
5219 | } | 5219 | } |
5220 | } | 5220 | } |
@@ -5275,7 +5275,7 @@ intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder) | |||
5275 | intel_dig_port = enc_to_mst(&intel_encoder->base)->primary; | 5275 | intel_dig_port = enc_to_mst(&intel_encoder->base)->primary; |
5276 | return port_to_aux_power_domain(intel_dig_port->port); | 5276 | return port_to_aux_power_domain(intel_dig_port->port); |
5277 | default: | 5277 | default: |
5278 | WARN_ON_ONCE(1); | 5278 | MISSING_CASE(intel_encoder->type); |
5279 | return POWER_DOMAIN_AUX_A; | 5279 | return POWER_DOMAIN_AUX_A; |
5280 | } | 5280 | } |
5281 | } | 5281 | } |