diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-09-28 09:51:42 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-04 02:23:13 -0400 |
commit | 6a2a5c5dea7e83474f3481553caf00dc018647b3 (patch) | |
tree | 8050d1de34ab3c1f67ef2e1a213706b0a2b19754 /drivers/gpu/drm/i915/intel_display.c | |
parent | 23ebf8b9eab9151c3cccca8dbf44a8d47357158d (diff) |
drm/i915: Replace a bunch of connector->base.display_info with a local variable
Reduce the eyesore with a local variable.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1475070703-6435-10-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8d4c35d55b1b..ad8d712ae84c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -12654,22 +12654,22 @@ static void | |||
12654 | connected_sink_compute_bpp(struct intel_connector *connector, | 12654 | connected_sink_compute_bpp(struct intel_connector *connector, |
12655 | struct intel_crtc_state *pipe_config) | 12655 | struct intel_crtc_state *pipe_config) |
12656 | { | 12656 | { |
12657 | const struct drm_display_info *info = &connector->base.display_info; | ||
12657 | int bpp = pipe_config->pipe_bpp; | 12658 | int bpp = pipe_config->pipe_bpp; |
12658 | 12659 | ||
12659 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp constrains\n", | 12660 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp constrains\n", |
12660 | connector->base.base.id, | 12661 | connector->base.base.id, |
12661 | connector->base.name); | 12662 | connector->base.name); |
12662 | 12663 | ||
12663 | /* Don't use an invalid EDID bpc value */ | 12664 | /* Don't use an invalid EDID bpc value */ |
12664 | if (connector->base.display_info.bpc && | 12665 | if (info->bpc != 0 && info->bpc * 3 < bpp) { |
12665 | connector->base.display_info.bpc * 3 < bpp) { | ||
12666 | DRM_DEBUG_KMS("clamping display bpp (was %d) to EDID reported max of %d\n", | 12666 | DRM_DEBUG_KMS("clamping display bpp (was %d) to EDID reported max of %d\n", |
12667 | bpp, connector->base.display_info.bpc*3); | 12667 | bpp, info->bpc * 3); |
12668 | pipe_config->pipe_bpp = connector->base.display_info.bpc*3; | 12668 | pipe_config->pipe_bpp = info->bpc * 3; |
12669 | } | 12669 | } |
12670 | 12670 | ||
12671 | /* Clamp bpp to 8 on screens without EDID 1.4 */ | 12671 | /* Clamp bpp to 8 on screens without EDID 1.4 */ |
12672 | if (connector->base.display_info.bpc == 0 && bpp > 24) { | 12672 | if (info->bpc == 0 && bpp > 24) { |
12673 | DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n", | 12673 | DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n", |
12674 | bpp); | 12674 | bpp); |
12675 | pipe_config->pipe_bpp = 24; | 12675 | pipe_config->pipe_bpp = 24; |