From: Jani Nikula <jani.nikula@linux.intel.com>
To: Dave Airlie <airlied@gmail.com>, intel-gfx@lists.freedesktop.org
Cc: Dave Airlie <airlied@redhat.com>
Subject: Re: [Intel-gfx] [PATCH 14/21] drm/i915: constify color function vtable.
Date: Wed, 08 Sep 2021 13:30:41 +0300 [thread overview]
Message-ID: <87y2875pgu.fsf@intel.com> (raw)
In-Reply-To: <20210908003944.2972024-15-airlied@gmail.com>
On Wed, 08 Sep 2021, Dave Airlie <airlied@gmail.com> wrote:
> From: Dave Airlie <airlied@redhat.com>
The commit message could contain some words about how ugly this used to
be and how beautiful it is now. Awesome.
One bug, comment inline.
>
> ---
> drivers/gpu/drm/i915/display/intel_color.c | 138 ++++++++++++++-------
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> 2 files changed, 93 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
> index ed79075158dd..b4e010c7e29d 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -1137,14 +1137,14 @@ void intel_color_load_luts(const struct intel_crtc_state *crtc_state)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
>
> - dev_priv->color_funcs.load_luts(crtc_state);
> + dev_priv->color_funcs->load_luts(crtc_state);
> }
>
> void intel_color_commit(const struct intel_crtc_state *crtc_state)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
>
> - dev_priv->color_funcs.color_commit(crtc_state);
> + dev_priv->color_funcs->color_commit(crtc_state);
> }
>
> static bool intel_can_preload_luts(const struct intel_crtc_state *new_crtc_state)
> @@ -1200,15 +1200,15 @@ int intel_color_check(struct intel_crtc_state *crtc_state)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
>
> - return dev_priv->color_funcs.color_check(crtc_state);
> + return dev_priv->color_funcs->color_check(crtc_state);
> }
>
> void intel_color_get_config(struct intel_crtc_state *crtc_state)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
>
> - if (dev_priv->color_funcs.read_luts)
> - dev_priv->color_funcs.read_luts(crtc_state);
> + if (dev_priv->color_funcs->read_luts)
> + dev_priv->color_funcs->read_luts(crtc_state);
> }
>
> static bool need_plane_update(struct intel_plane *plane,
> @@ -2092,6 +2092,76 @@ static void icl_read_luts(struct intel_crtc_state *crtc_state)
> }
> }
>
> +static const struct drm_i915_display_color_funcs chv_color_funcs = {
> + .color_check = chv_color_check,
> + .color_commit = i9xx_color_commit,
> + .load_luts = chv_load_luts,
> + .read_luts = chv_read_luts,
> +};
> +
> +static const struct drm_i915_display_color_funcs i965_color_funcs = {
> + .color_check = i9xx_color_check,
> + .color_commit = i9xx_color_commit,
> + .load_luts = i965_load_luts,
> + .read_luts = i965_read_luts,
> +};
> +
> +static const struct drm_i915_display_color_funcs i9xx_color_funcs = {
> + .color_check = i9xx_color_check,
> + .color_commit = i9xx_color_commit,
> + .load_luts = i9xx_load_luts,
> + .read_luts = i9xx_read_luts,
> +};
> +
> +static const struct drm_i915_display_color_funcs icl_color_funcs = {
> + .color_check = icl_color_check,
> + .color_commit = skl_color_commit,
> + .load_luts = icl_load_luts,
> + .read_luts = icl_read_luts,
> +};
> +
> +static const struct drm_i915_display_color_funcs glk_color_funcs = {
> + .color_check = glk_color_check,
> + .color_commit = skl_color_commit,
> + .load_luts = glk_load_luts,
> + .read_luts = glk_read_luts,
> +};
> +
> +static const struct drm_i915_display_color_funcs skl_color_funcs = {
> + .color_check = ivb_color_check,
> + .color_commit = skl_color_commit,
> + .load_luts = bdw_load_luts,
> + .read_luts = NULL,
> +};
> +
> +static const struct drm_i915_display_color_funcs bdw_color_funcs = {
> + .color_check = ivb_color_check,
> + .color_commit = hsw_color_commit,
> + .load_luts = bdw_load_luts,
> + .read_luts = NULL,
> +};
> +
> +static const struct drm_i915_display_color_funcs hsw_color_funcs = {
> + .color_check = ivb_color_check,
> + .color_commit = hsw_color_commit,
> + .load_luts = ivb_load_luts,
> + .read_luts = NULL,
> +};
> +
> +static const struct drm_i915_display_color_funcs ivb_color_funcs = {
> + .color_check = ivb_color_check,
> + .color_commit = ilk_color_commit,
> + .load_luts = ilk_load_luts,
Should be ivb_load_luts.
> + .read_luts = ilk_read_luts,
Should be NULL.
Old code for ivb i.e. non-hsw gen 7 was:
- } else if (DISPLAY_VER(dev_priv) >= 7) {
- dev_priv->color_funcs.load_luts = ivb_load_luts;
- } else {
Right? It's a nightmare to review this because the old code was a
nightmare to read.
I think with that fixed this is good, and,
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> +};
> +
> +static const struct drm_i915_display_color_funcs ilk_color_funcs = {
> + .color_check = ilk_color_check,
> + .color_commit = ilk_color_commit,
> + .load_luts = ilk_load_luts,
> + .read_luts = ilk_read_luts,
> +};
> +
> void intel_color_init(struct intel_crtc *crtc)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -2101,52 +2171,28 @@ void intel_color_init(struct intel_crtc *crtc)
>
> if (HAS_GMCH(dev_priv)) {
> if (IS_CHERRYVIEW(dev_priv)) {
> - dev_priv->color_funcs.color_check = chv_color_check;
> - dev_priv->color_funcs.color_commit = i9xx_color_commit;
> - dev_priv->color_funcs.load_luts = chv_load_luts;
> - dev_priv->color_funcs.read_luts = chv_read_luts;
> + dev_priv->color_funcs = &chv_color_funcs;
> } else if (DISPLAY_VER(dev_priv) >= 4) {
> - dev_priv->color_funcs.color_check = i9xx_color_check;
> - dev_priv->color_funcs.color_commit = i9xx_color_commit;
> - dev_priv->color_funcs.load_luts = i965_load_luts;
> - dev_priv->color_funcs.read_luts = i965_read_luts;
> + dev_priv->color_funcs = &i965_color_funcs;
> } else {
> - dev_priv->color_funcs.color_check = i9xx_color_check;
> - dev_priv->color_funcs.color_commit = i9xx_color_commit;
> - dev_priv->color_funcs.load_luts = i9xx_load_luts;
> - dev_priv->color_funcs.read_luts = i9xx_read_luts;
> + dev_priv->color_funcs = &i9xx_color_funcs;
> }
> } else {
> if (DISPLAY_VER(dev_priv) >= 11)
> - dev_priv->color_funcs.color_check = icl_color_check;
> - else if (DISPLAY_VER(dev_priv) >= 10)
> - dev_priv->color_funcs.color_check = glk_color_check;
> - else if (DISPLAY_VER(dev_priv) >= 7)
> - dev_priv->color_funcs.color_check = ivb_color_check;
> - else
> - dev_priv->color_funcs.color_check = ilk_color_check;
> -
> - if (DISPLAY_VER(dev_priv) >= 9)
> - dev_priv->color_funcs.color_commit = skl_color_commit;
> - else if (IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv))
> - dev_priv->color_funcs.color_commit = hsw_color_commit;
> - else
> - dev_priv->color_funcs.color_commit = ilk_color_commit;
> -
> - if (DISPLAY_VER(dev_priv) >= 11) {
> - dev_priv->color_funcs.load_luts = icl_load_luts;
> - dev_priv->color_funcs.read_luts = icl_read_luts;
> - } else if (DISPLAY_VER(dev_priv) == 10) {
> - dev_priv->color_funcs.load_luts = glk_load_luts;
> - dev_priv->color_funcs.read_luts = glk_read_luts;
> - } else if (DISPLAY_VER(dev_priv) >= 8) {
> - dev_priv->color_funcs.load_luts = bdw_load_luts;
> - } else if (DISPLAY_VER(dev_priv) >= 7) {
> - dev_priv->color_funcs.load_luts = ivb_load_luts;
> - } else {
> - dev_priv->color_funcs.load_luts = ilk_load_luts;
> - dev_priv->color_funcs.read_luts = ilk_read_luts;
> - }
> + dev_priv->color_funcs = &icl_color_funcs;
> + else if (DISPLAY_VER(dev_priv) == 10)
> + dev_priv->color_funcs = &glk_color_funcs;
> + else if (DISPLAY_VER(dev_priv) == 9)
> + dev_priv->color_funcs = &skl_color_funcs;
> + else if (DISPLAY_VER(dev_priv) == 8)
> + dev_priv->color_funcs = &bdw_color_funcs;
> + else if (DISPLAY_VER(dev_priv) == 7) {
> + if (IS_HASWELL(dev_priv))
> + dev_priv->color_funcs = &hsw_color_funcs;
> + else
> + dev_priv->color_funcs = &ivb_color_funcs;
> + } else
> + dev_priv->color_funcs = &ilk_color_funcs;
> }
>
> drm_crtc_enable_color_mgmt(&crtc->base,
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 6050bb519b18..e82df3bf493b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1015,7 +1015,7 @@ struct drm_i915_private {
> struct drm_i915_display_funcs display;
>
> /* Display internal color functions */
> - struct drm_i915_display_color_funcs color_funcs;
> + const struct drm_i915_display_color_funcs *color_funcs;
>
> /* Display internal audio functions */
> struct drm_i915_display_audio_funcs audio_funcs;
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2021-09-08 10:30 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 0:39 [Intel-gfx] [PATCH 00/21] i915/display: split and constify vtable Dave Airlie
2021-09-08 0:39 ` [Intel-gfx] [PATCH 01/21] drm/i915/pm: drop get_fifo_size vfunc Dave Airlie
2021-09-08 11:30 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 02/21] drm/i915: make update_wm take a dev_priv Dave Airlie
2021-09-08 1:17 ` David Airlie
2021-09-08 11:31 ` Jani Nikula
2021-09-08 11:32 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 03/21] drm/i915/wm: move the update watermark wrapper to display side Dave Airlie
2021-09-08 9:33 ` Jani Nikula
2021-09-08 20:40 ` Dave Airlie
2021-09-09 14:26 ` Ville Syrjälä
2021-09-08 0:39 ` [Intel-gfx] [PATCH 04/21] drm/i915: split clock gating init from display vtable Dave Airlie
2021-09-08 11:34 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 05/21] drm/i915: split watermark vfuncs " Dave Airlie
2021-09-08 9:40 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 06/21] drm/i915: split color functions " Dave Airlie
2021-09-08 9:46 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 07/21] drm/i915: split audio " Dave Airlie
2021-09-08 9:48 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 08/21] drm/i915: split cdclk " Dave Airlie
2021-09-08 9:52 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 09/21] drm/i915: split irq hotplug function " Dave Airlie
2021-09-08 10:00 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 10/21] drm/i915: split fdi link training " Dave Airlie
2021-09-08 10:02 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 11/21] drm/i915: split the dpll clock compute out " Dave Airlie
2021-09-08 10:09 ` Jani Nikula
2021-09-09 0:34 ` Dave Airlie
2021-09-08 0:39 ` [Intel-gfx] [PATCH 12/21] drm/i915: constify fdi link training vtable Dave Airlie
2021-09-08 10:10 ` Jani Nikula
2021-09-08 12:03 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 13/21] drm/i915: constify irq function vtable Dave Airlie
2021-09-08 10:12 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 14/21] drm/i915: constify color " Dave Airlie
2021-09-08 10:30 ` Jani Nikula [this message]
2021-09-08 0:39 ` [Intel-gfx] [PATCH 15/21] drm/i915: constify the audio " Dave Airlie
2021-09-08 10:37 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 16/21] drm/i915: constify the dpll clock vtable Dave Airlie
2021-09-08 10:38 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 17/21] drm/i915: constify the cdclk vtable Dave Airlie
2021-09-08 11:56 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 18/21] drm/i915: drop unused function ptr and comments Dave Airlie
2021-09-08 11:36 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 19/21] drm/i915: constify display function vtable Dave Airlie
2021-09-08 11:58 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 20/21] drm/i915: constify clock gating init vtable Dave Airlie
2021-09-08 12:00 ` Jani Nikula
2021-09-08 12:00 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 21/21] drm/i915: constify display wm vtable Dave Airlie
2021-09-08 12:13 ` Jani Nikula
2021-09-08 1:19 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for i915/display: split and constify vtable Patchwork
2021-09-08 1:24 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-09-08 12:04 ` Jani Nikula
2021-09-08 1:50 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-09-08 7:07 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-09-08 12:19 ` [Intel-gfx] [PATCH 00/21] " Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y2875pgu.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox