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 D3F4AC433F5 for ; Thu, 29 Sep 2022 10:41:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 24B8010E06F; Thu, 29 Sep 2022 10:41:57 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BFB610E06F for ; Thu, 29 Sep 2022 10:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664448113; x=1695984113; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=rkOlOc2xI5WG6aM7FN+noAJAdKlwraeqiakmxP8pnC8=; b=mGU5CzOd8fjWQLBIH1mwffZusI5i+4EOyBdu+9psIbSMlxIg0PyZdMte J41pbcfUHlse53r1EynC0gO5t3OodVxpQ0tckQxZoyzNWIzy4cRi9QLBb N9R3OyfSSKmjGngxUZe+hUKsA/MxIj3yL+kx1xWGaumgoXaAGYsW1WojJ e0StpRQpFE2tiWnoymRq7Or7a0nvrFFrjsb0aRwv/dc/TCpsrULPBqCR8 5GaO48FA6ML1ZiArkN129MzeKTQuBIAmRFh9eHWXJfY4mjZTKXin77EI0 q7/E+fidVgR+03v5SDt6mZN8qaycHcscA4II42RB3mUa+xpVcQgm5pOOE Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="289021045" X-IronPort-AV: E=Sophos;i="5.93,354,1654585200"; d="scan'208";a="289021045" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2022 03:41:52 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="797509853" X-IronPort-AV: E=Sophos;i="5.93,354,1654585200"; d="scan'208";a="797509853" Received: from jnikula-mobl4.fi.intel.com (HELO localhost) ([10.237.66.153]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2022 03:41:51 -0700 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org In-Reply-To: <20220929071521.26612-3-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-3-ville.syrjala@linux.intel.com> Date: Thu, 29 Sep 2022 13:41:47 +0300 Message-ID: <87o7uyxy1g.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 02/10] drm/i915: Split up intel_color_init() 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 > > intel_color_init() does both device level and crtc level stuff. > Split it up accordingly. > > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 > --- > drivers/gpu/drm/i915/display/intel_color.c | 15 +++++++++------ > drivers/gpu/drm/i915/display/intel_color.h | 4 +++- > drivers/gpu/drm/i915/display/intel_crtc.c | 3 +-- > drivers/gpu/drm/i915/display/intel_display.c | 1 + > 4 files changed, 14 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm= /i915/display/intel_color.c > index bbc56affb3ec..ddfe7c257a72 100644 > --- a/drivers/gpu/drm/i915/display/intel_color.c > +++ b/drivers/gpu/drm/i915/display/intel_color.c > @@ -2206,13 +2206,21 @@ static const struct intel_color_funcs ilk_color_f= uncs =3D { > .read_luts =3D ilk_read_luts, > }; >=20=20 > -void intel_color_init(struct intel_crtc *crtc) > +void intel_crtc_color_init(struct intel_crtc *crtc) > { > struct drm_i915_private *dev_priv =3D to_i915(crtc->base.dev); > bool has_ctm =3D INTEL_INFO(dev_priv)->display.color.degamma_lut_size != =3D 0; >=20=20 > drm_mode_crtc_set_gamma_size(&crtc->base, 256); >=20=20 > + drm_crtc_enable_color_mgmt(&crtc->base, > + INTEL_INFO(dev_priv)->display.color.degamma_lut_size, > + has_ctm, > + INTEL_INFO(dev_priv)->display.color.gamma_lut_size); > +} > + > +void intel_color_init_hooks(struct drm_i915_private *dev_priv) > +{ > if (HAS_GMCH(dev_priv)) { > if (IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.funcs.color =3D &chv_color_funcs; > @@ -2238,9 +2246,4 @@ void intel_color_init(struct intel_crtc *crtc) > } else > dev_priv->display.funcs.color =3D &ilk_color_funcs; > } > - > - drm_crtc_enable_color_mgmt(&crtc->base, > - INTEL_INFO(dev_priv)->display.color.degamma_lut_size, > - has_ctm, > - INTEL_INFO(dev_priv)->display.color.gamma_lut_size); > } > diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm= /i915/display/intel_color.h > index fd873425e082..67702451e2fd 100644 > --- a/drivers/gpu/drm/i915/display/intel_color.h > +++ b/drivers/gpu/drm/i915/display/intel_color.h > @@ -10,9 +10,11 @@ >=20=20 > struct intel_crtc_state; > struct intel_crtc; > +struct drm_i915_private; > struct drm_property_blob; >=20=20 > -void intel_color_init(struct intel_crtc *crtc); > +void intel_color_init_hooks(struct drm_i915_private *i915); > +void intel_crtc_color_init(struct intel_crtc *crtc); > int intel_color_check(struct intel_crtc_state *crtc_state); > void intel_color_commit_noarm(const struct intel_crtc_state *crtc_state); > void intel_color_commit_arm(const struct intel_crtc_state *crtc_state); > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/= i915/display/intel_crtc.c > index 6792a9056f46..2d9fc7383bfc 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc.c > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c > @@ -365,8 +365,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv= , enum pipe pipe) > BIT(DRM_SCALING_FILTER_DEFAULT) | > BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR)); >=20=20 > - intel_color_init(crtc); > - > + intel_crtc_color_init(crtc); > intel_crtc_drrs_init(crtc); > intel_crtc_crc_init(crtc); I'd name all of these like: intel_color_crtc_init(); intel_drrs_crtc_init(); intel_crc_crtc_init(); I think in gem side the "name functions based on first/context argument" style has lead to serious problems wrt code organization. They still stick to it, but I can't make heads or tails where function definitions or declarations are supposed to be placed or found. BR, Jani. >=20=20 > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index eb8eaeb19881..a103413cb081 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -8326,6 +8326,7 @@ void intel_init_display_hooks(struct drm_i915_priva= te *dev_priv) > if (!HAS_DISPLAY(dev_priv)) > return; >=20=20 > + intel_color_init_hooks(dev_priv); > intel_init_cdclk_hooks(dev_priv); > intel_audio_hooks_init(dev_priv); --=20 Jani Nikula, Intel Open Source Graphics Center