On Wed, 2016-09-28 at 16:51 +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Reduce the eyesore with a local variable.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2 at gmail.com>
> ---
> Â drivers/gpu/drm/i915/intel_display.c | 14 +++++++-------
> Â 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 8e464e089794..34ca03e621ba 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12657,22 +12657,22 @@ static void
> Â connected_sink_compute_bpp(struct intel_connector *connector,
> Â Â Â Â struct intel_crtc_state *pipe_config)
> Â {
> + const struct drm_display_info *info = &connector->base.display_info;
> Â int bpp = pipe_config->pipe_bpp;
> Â
> Â DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp constrains\n",
> - connector->base.base.id,
> - connector->base.name);
> + Â Â Â Â Â Â connector->base.base.id,
> + Â Â Â Â Â Â connector->base.name);
> Â
> Â /* Don't use an invalid EDID bpc value */
> - if (connector->base.display_info.bpc &&
> - Â Â Â Â connector->base.display_info.bpc * 3 < bpp) {
> + if (info->bpc != 0 && info->bpc * 3 < bpp) {
> Â DRM_DEBUG_KMS("clamping display bpp (was %d) to EDID reported
> max of %d\n",
> - Â Â Â Â Â Â bpp, connector->base.display_info.bpc*3);
> - pipe_config->pipe_bpp = connector->base.display_info.bpc*3;
> + Â Â Â Â Â Â bpp, info->bpc * 3);
> + pipe_config->pipe_bpp = info->bpc * 3;
> Â }
> Â
> Â /* Clamp bpp to 8 on screens without EDID 1.4 */
> - if (connector->base.display_info.bpc == 0 && bpp > 24) {
> + if (info->bpc == 0 && bpp > 24) {
> Â DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit
> of 24\n",
> Â Â Â Â Â Â Â bpp);
> Â pipe_config->pipe_bpp = 24;