All of lore.kernel.org
 help / color / mirror / Atom feed
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 1/8] drm/i915: refactor ddi translations into a separate file
Date: Thu, 21 Jan 2021 14:03:31 +0200	[thread overview]
Message-ID: <87sg6ulcoc.fsf@intel.com> (raw)
In-Reply-To: <87v9bqlcrg.fsf@intel.com>

On Thu, 21 Jan 2021, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Thu, 21 Jan 2021, Dave Airlie <airlied@gmail.com> wrote:
>> From: Dave Airlie <airlied@redhat.com>
>>
>> Ville suggested this, these tables are probably better being
>> standalone.
>>
>> This fixes up the cnl/bxt interfaces to be like the others,
>> the intel one I left alone since it has a few extra entrypoints.
>>
>> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> Signed-off-by: Dave Airlie <airlied@redhat.com>
>> ---
>>  drivers/gpu/drm/i915/Makefile                 |    1 +
>>  drivers/gpu/drm/i915/display/intel_ddi.c      | 1417 +----------------
>>  .../drm/i915/display/intel_ddi_buf_trans.c    | 1358 ++++++++++++++++
>>  .../drm/i915/display/intel_ddi_buf_trans.h    |  100 ++
>>  4 files changed, 1471 insertions(+), 1405 deletions(-)
>>  create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
>>  create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h
>
> Sorry, but the rebase fails to take into account at least the Rocket
> Lake changes in tgl_get_combo_buf_trans_dp().

Aww crap, this was the case alreayd in *my* rebase of the
same. *facepalm*.

A day of brown paper bags for me.

BR,
Jani.


>
> Also, there were a number of sparse warnings for missing static:
>
> +drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:714:28: warning: symbol 'bdw_get_buf_trans_edp' was not declared. Should it be static?
> +drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:728:28: warning: symbol 'skl_get_buf_trans_dp' was not declared. Should it be static?
> +drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:745:28: warning: symbol 'kbl_get_buf_trans_dp' was not declared. Should it be static?
> +drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:766:28: warning: symbol 'skl_get_buf_trans_edp' was not declared. Should it be static?
> +drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:798:28: warning: symbol 'skl_get_buf_trans_hdmi' was not declared. Should it be static?
> +drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:813:5: warning: symbol 'skl_buf_trans_num_entries' was not declared. Should it be static?
>
> BR,
> Jani.
>
>
>> -static const struct cnl_ddi_buf_trans *
>> -tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder,
>> -			   const struct intel_crtc_state *crtc_state,
>> -			   int *n_entries)
>> -{
>> -	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>> -
>> -	if (crtc_state->port_clock > 270000) {
>> -		if (IS_ROCKETLAKE(dev_priv)) {
>> -			*n_entries = ARRAY_SIZE(rkl_combo_phy_ddi_translations_dp_hbr2_hbr3);
>> -			return rkl_combo_phy_ddi_translations_dp_hbr2_hbr3;
>> -		} else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) {
>> -			*n_entries = ARRAY_SIZE(tgl_uy_combo_phy_ddi_translations_dp_hbr2);
>> -			return tgl_uy_combo_phy_ddi_translations_dp_hbr2;
>> -		} else {
>> -			*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr2);
>> -			return tgl_combo_phy_ddi_translations_dp_hbr2;
>> -		}
>> -	} else {
>> -		if (IS_ROCKETLAKE(dev_priv)) {
>> -			*n_entries = ARRAY_SIZE(rkl_combo_phy_ddi_translations_dp_hbr);
>> -			return rkl_combo_phy_ddi_translations_dp_hbr;
>> -		} else {
>> -			*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr);
>> -			return tgl_combo_phy_ddi_translations_dp_hbr;
>> -		}
>> -	}
>> -}
>
>
>> +static const struct cnl_ddi_buf_trans *
>> +tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder,
>> +			   const struct intel_crtc_state *crtc_state,
>> +			   int *n_entries)
>> +{
>> +	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>> +
>> +	if (crtc_state->port_clock > 270000) {
>> +		if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) {
>> +			*n_entries = ARRAY_SIZE(tgl_uy_combo_phy_ddi_translations_dp_hbr2);
>> +			return tgl_uy_combo_phy_ddi_translations_dp_hbr2;
>> +		} else {
>> +			*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr2);
>> +			return tgl_combo_phy_ddi_translations_dp_hbr2;
>> +		}
>> +	} else {
>> +		*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr);
>> +		return tgl_combo_phy_ddi_translations_dp_hbr;
>> +	}
>> +}

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2021-01-21 12:03 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-21  4:25 [Intel-gfx] [rfc v8] remaining intel_display.c refactors Dave Airlie
2021-01-21  4:25 ` [Intel-gfx] [PATCH 1/8] drm/i915: refactor ddi translations into a separate file Dave Airlie
2021-01-21 12:01   ` Jani Nikula
2021-01-21 12:03     ` Jani Nikula [this message]
2021-01-21  4:25 ` [Intel-gfx] [PATCH 2/8] drm/i915: migrate hsw fdi code to new file Dave Airlie
2021-01-21  4:25 ` [Intel-gfx] [PATCH 3/8] drm/i915: migrate skl planes code new file (v4) Dave Airlie
2021-01-21  4:25 ` [Intel-gfx] [PATCH 4/8] drm/i915: move pipe update code into crtc Dave Airlie
2021-01-21  4:25 ` [Intel-gfx] [PATCH 5/8] drm/i915: split fb scalable checks into g4x and skl versions Dave Airlie
2021-01-21  4:25 ` [Intel-gfx] [PATCH 6/8] drm/i915: move is_ccs_modifier to an inline Dave Airlie
2021-01-21  4:25 ` [Intel-gfx] [PATCH 7/8] drm/i915: migrate pll enable/disable code to intel_dpll.[ch] Dave Airlie
2021-01-21  4:25 ` [Intel-gfx] [PATCH 8/8] drm/i915: migrate i9xx plane get config Dave Airlie
2021-01-21  4:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/8] drm/i915: refactor ddi translations into a separate file Patchwork
2021-01-21  4:59 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-01-21  5:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-01-21  6:38 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

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=87sg6ulcoc.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.