From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B17ECC433F5 for ; Thu, 29 Sep 2022 11:56:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A2B9910EA35; Thu, 29 Sep 2022 11:56:38 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91B1F10EA3F for ; Thu, 29 Sep 2022 11:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664452596; x=1695988596; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=YsimhSCD5vYeB0AeanV8j8B3nPWErTEXR8BJrnbYQWI=; b=enEyt2hcuvLh1u2NtyRFNdVWY12+w7Adeh1HuCF057Ujq9IVaQCbciCt ta8+NPnRTLr9hi5zcX9Zeu2MP67gj5sgTiM+ehdom2yTMd4tDcqKZK8bp 5RmMQF9M3axYYZQ+74yZvBCUqpgr6eO/JwKK6X7Yj1NyS0uHs/P8ArzC3 2qGqwOTUiglWiZwMqtQnSll0OPIBvY+G/sYlBGbYJK2aes9KBmGNbJZ2J ZZmpgEzY0Q0pZdW/BX5uTdrNNIklhuf+KhYMt6LawrnEPDVQ60MBg2yMT 0wOnyCyGYbjH57lLIG0QBNHHmEqOIn8Es/NOD2sXK2Z9hG0Zf31QKV7Jq A==; X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="300590570" X-IronPort-AV: E=Sophos;i="5.93,355,1654585200"; d="scan'208";a="300590570" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2022 04:56:36 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="747806832" X-IronPort-AV: E=Sophos;i="5.93,355,1654585200"; d="scan'208";a="747806832" Received: from jnikula-mobl4.fi.intel.com (HELO localhost) ([10.237.66.153]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2022 04:56:34 -0700 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org In-Reply-To: <20220929071521.26612-4-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220929071521.26612-1-ville.syrjala@linux.intel.com> <20220929071521.26612-4-ville.syrjala@linux.intel.com> Date: Thu, 29 Sep 2022 14:56:31 +0300 Message-ID: <87bkqyxukw.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 03/10] drm/i915: Simplify the intel_color_init_hooks() if ladder X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 29 Sep 2022, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > Get rid of the funny hsw vs. ivb extra indentation level in > intel_color_init_hooks(). > > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_color.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm= /i915/display/intel_color.c > index ddfe7c257a72..ce8a4be9b292 100644 > --- a/drivers/gpu/drm/i915/display/intel_color.c > +++ b/drivers/gpu/drm/i915/display/intel_color.c > @@ -2238,12 +2238,11 @@ void intel_color_init_hooks(struct drm_i915_priva= te *dev_priv) > dev_priv->display.funcs.color =3D &skl_color_funcs; > else if (DISPLAY_VER(dev_priv) =3D=3D 8) > dev_priv->display.funcs.color =3D &bdw_color_funcs; > - else if (DISPLAY_VER(dev_priv) =3D=3D 7) { > - if (IS_HASWELL(dev_priv)) > - dev_priv->display.funcs.color =3D &hsw_color_funcs; > - else > - dev_priv->display.funcs.color =3D &ivb_color_funcs; > - } else > + else if (IS_HASWELL(dev_priv)) > + dev_priv->display.funcs.color =3D &hsw_color_funcs; > + else if (DISPLAY_VER(dev_priv) =3D=3D 7) > + dev_priv->display.funcs.color =3D &ivb_color_funcs; > + else > dev_priv->display.funcs.color =3D &ilk_color_funcs; > } > } --=20 Jani Nikula, Intel Open Source Graphics Center