[Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error

[Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error

[Anshuman Gupta]

Fix kbuild test robot build error for below commit
<d54c1a513c487ac6d6b3c4595e93e3625b461cc3>.
has_transcoder() was unused because function which was using it
intel_display_capture_error_state() defined under
CONFIG_DRM_I915_CAPTURE_ERROR.
Moving has_transcoder() to under CONFIG_DRM_I915_CAPTURE_ERROR.
No functional change.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 2fd3ccd33e30..27ec245e0dd2 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -249,15 +249,6 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
 		return dev_priv->fdi_pll_freq;
 }
 
-static bool
-has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
-{
-	if (cpu_transcoder == TRANSCODER_EDP)
-		return HAS_TRANSCODER_EDP(dev_priv);
-	else
-		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
-}
-
 static const struct intel_limit intel_limits_i8xx_dac = {
 	.dot = { .min = 25000, .max = 350000 },
 	.vco = { .min = 908000, .max = 1512000 },
@@ -18838,6 +18829,15 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
 
 #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
 
+static bool
+has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
+{
+	if (cpu_transcoder == TRANSCODER_EDP)
+		return HAS_TRANSCODER_EDP(dev_priv);
+	else
+		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
+}
+
 struct intel_display_error_state {
 
 	u32 power_well_driver;
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error

[Jani Nikula]

On Thu, 27 Feb 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote:
> Fix kbuild test robot build error for below commit
> <d54c1a513c487ac6d6b3c4595e93e3625b461cc3>.

The proper format to reference other commits is

	d54c1a513c48 ("drm/i915: Fix broken transcoder err state")

If you put this magic spell in your ~/.gitconfig under [alias]:

	cite = "!f() { git log -1 '--pretty=format:%H (\"%s\")%n' $1 | sed -e 's/\\([0-f]\\{12\\}\\)[0-f]*/\\1/'; }; f"

you can use 'git cite <commit-ish>' to give you the properly formatted
citation.

> has_transcoder() was unused because function which was using it
> intel_display_capture_error_state() defined under
> CONFIG_DRM_I915_CAPTURE_ERROR.
> Moving has_transcoder() to under CONFIG_DRM_I915_CAPTURE_ERROR.
> No functional change.
>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reported-by: kbuild test robot <lkp@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>

Fixes: d54c1a513c48 ("drm/i915: Fix broken transcoder err state")
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 2fd3ccd33e30..27ec245e0dd2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -249,15 +249,6 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
>  		return dev_priv->fdi_pll_freq;
>  }
>  
> -static bool
> -has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
> -{
> -	if (cpu_transcoder == TRANSCODER_EDP)
> -		return HAS_TRANSCODER_EDP(dev_priv);
> -	else
> -		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
> -}
> -
>  static const struct intel_limit intel_limits_i8xx_dac = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 908000, .max = 1512000 },
> @@ -18838,6 +18829,15 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
>  
>  #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
>  
> +static bool
> +has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
> +{
> +	if (cpu_transcoder == TRANSCODER_EDP)
> +		return HAS_TRANSCODER_EDP(dev_priv);
> +	else
> +		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
> +}
> +
>  struct intel_display_error_state {
>  
>  	u32 power_well_driver;

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

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Fix kbuild test robot build error

[Patchwork]

== Series Details ==

Series: drm/i915: Fix kbuild test robot build error
URL   : https://patchwork.freedesktop.org/series/73990/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8012 -> Patchwork_16728
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/index.html

Known issues
------------

  Here are the changes found in Patchwork_16728 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@kms_frontbuffer_tracking@basic:
    - fi-hsw-peppy:       [PASS][1] -> [DMESG-WARN][2] ([i915#44])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8012/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html

  * igt@prime_self_import@basic-with_one_bo_two_files:
    - fi-tgl-y:           [PASS][3] -> [DMESG-WARN][4] ([CI#94] / [i915#402]) +1 similar issue
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8012/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html

  
#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s4-devices:
    - fi-tgl-y:           [FAIL][5] ([CI#94]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8012/fi-tgl-y/igt@gem_exec_suspend@basic-s4-devices.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/fi-tgl-y/igt@gem_exec_suspend@basic-s4-devices.html

  * igt@i915_selftest@live_execlists:
    - fi-icl-y:           [DMESG-FAIL][7] ([fdo#108569]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8012/fi-icl-y/igt@i915_selftest@live_execlists.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/fi-icl-y/igt@i915_selftest@live_execlists.html

  * igt@i915_selftest@live_gem_contexts:
    - fi-cml-s:           [DMESG-FAIL][9] ([i915#877]) -> [PASS][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8012/fi-cml-s/igt@i915_selftest@live_gem_contexts.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/fi-cml-s/igt@i915_selftest@live_gem_contexts.html

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-icl-u2:          [FAIL][11] ([i915#217]) -> [PASS][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8012/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html

  * igt@prime_vgem@basic-fence-flip:
    - fi-tgl-y:           [DMESG-WARN][13] ([CI#94] / [i915#402]) -> [PASS][14] +1 similar issue
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8012/fi-tgl-y/igt@prime_vgem@basic-fence-flip.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/fi-tgl-y/igt@prime_vgem@basic-fence-flip.html

  
  [CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
  [i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
  [i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
  [i915#877]: https://gitlab.freedesktop.org/drm/intel/issues/877


Participating hosts (45 -> 44)
------------------------------

  Additional (4): fi-glk-dsi fi-kbl-r fi-skl-6600u fi-kbl-7500u 
  Missing    (5): fi-tgl-dsi fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus 


Build changes
-------------

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_8012 -> Patchwork_16728

  CI-20190529: 20190529
  CI_DRM_8012: 50d0116a287763baf6225e2dbc3df150740e547a @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5471: 668afe52887a164ee6a12fd1c898bc1c9086cf3e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_16728: 21025ed0f8945fe13a74f474aeafcd346fb8a1ff @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

21025ed0f894 drm/i915: Fix kbuild test robot build error

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16728/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error

[Anshuman Gupta]

On 2020-02-27 at 09:04:03 +0200, Jani Nikula wrote:
> On Thu, 27 Feb 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote:
> > Fix kbuild test robot build error for below commit
> > <d54c1a513c487ac6d6b3c4595e93e3625b461cc3>.
> 
> The proper format to reference other commits is
> 
> 	d54c1a513c48 ("drm/i915: Fix broken transcoder err state")
> 
> If you put this magic spell in your ~/.gitconfig under [alias]:
> 
> 	cite = "!f() { git log -1 '--pretty=format:%H (\"%s\")%n' $1 | sed -e 's/\\([0-f]\\{12\\}\\)[0-f]*/\\1/'; }; f"
> 
> you can use 'git cite <commit-ish>' to give you the properly formatted
> citation.
Thanks Jani for the info.
> 
> > has_transcoder() was unused because function which was using it
> > intel_display_capture_error_state() defined under
> > CONFIG_DRM_I915_CAPTURE_ERROR.
> > Moving has_transcoder() to under CONFIG_DRM_I915_CAPTURE_ERROR.
> > No functional change.
> >
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Reported-by: kbuild test robot <lkp@intel.com>
> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> 
> Fixes: d54c1a513c48 ("drm/i915: Fix broken transcoder err state")
I will incorporate above citation in commit log.
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> > ---
> >  drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++---------
> >  1 file changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > index 2fd3ccd33e30..27ec245e0dd2 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -249,15 +249,6 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
> >  		return dev_priv->fdi_pll_freq;
> >  }
> >  
> > -static bool
> > -has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
> > -{
> > -	if (cpu_transcoder == TRANSCODER_EDP)
> > -		return HAS_TRANSCODER_EDP(dev_priv);
> > -	else
> > -		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
> > -}
> > -
> >  static const struct intel_limit intel_limits_i8xx_dac = {
> >  	.dot = { .min = 25000, .max = 350000 },
> >  	.vco = { .min = 908000, .max = 1512000 },
> > @@ -18838,6 +18829,15 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
> >  
> >  #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
> >  
> > +static bool
> > +has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
> > +{
> > +	if (cpu_transcoder == TRANSCODER_EDP)
> > +		return HAS_TRANSCODER_EDP(dev_priv);
> > +	else
> > +		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
> > +}
> > +
> >  struct intel_display_error_state {
> >  
> >  	u32 power_well_driver;
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error

[Shankar, Uma]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Anshuman
> Gupta
> Sent: Thursday, February 27, 2020 11:22 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error
> 
> Fixes: d54c1a513c48 ("drm/i915: Fix broken transcoder err state")
> has_transcoder() was unused because function which was using it,
> intel_display_capture_error_state() defined under
> CONFIG_DRM_I915_CAPTURE_ERROR.
> Moving has_transcoder() to under CONFIG_DRM_I915_CAPTURE_ERROR.
> No functional change.

Pushed to dinq. Thanks for the patch and review.
Updated the "Fixes" part while pushing the change.

> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reported-by: kbuild test robot <lkp@intel.com>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 2fd3ccd33e30..27ec245e0dd2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -249,15 +249,6 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
>  		return dev_priv->fdi_pll_freq;
>  }
> 
> -static bool
> -has_transcoder(struct drm_i915_private *dev_priv, enum transcoder
> cpu_transcoder) -{
> -	if (cpu_transcoder == TRANSCODER_EDP)
> -		return HAS_TRANSCODER_EDP(dev_priv);
> -	else
> -		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
> -}
> -
>  static const struct intel_limit intel_limits_i8xx_dac = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 908000, .max = 1512000 }, @@ -18838,6 +18829,15 @@ void
> intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
> 
>  #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
> 
> +static bool
> +has_transcoder(struct drm_i915_private *dev_priv, enum transcoder
> +cpu_transcoder) {
> +	if (cpu_transcoder == TRANSCODER_EDP)
> +		return HAS_TRANSCODER_EDP(dev_priv);
> +	else
> +		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder); }
> +
>  struct intel_display_error_state {
> 
>  	u32 power_well_driver;
> --
> 2.25.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error

[Jani Nikula]

On Thu, 27 Feb 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote:
> Fixes: d54c1a513c48 ("drm/i915: Fix broken transcoder err state")

That's supposed to go in the section with the "tags" below. Can be fixed
while applying, please don't resend for this.

BR,
Jani.

> has_transcoder() was unused because function which was using it,
> intel_display_capture_error_state() defined under
> CONFIG_DRM_I915_CAPTURE_ERROR.
> Moving has_transcoder() to under CONFIG_DRM_I915_CAPTURE_ERROR.
> No functional change.
>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reported-by: kbuild test robot <lkp@intel.com>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 2fd3ccd33e30..27ec245e0dd2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -249,15 +249,6 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
>  		return dev_priv->fdi_pll_freq;
>  }
>  
> -static bool
> -has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
> -{
> -	if (cpu_transcoder == TRANSCODER_EDP)
> -		return HAS_TRANSCODER_EDP(dev_priv);
> -	else
> -		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
> -}
> -
>  static const struct intel_limit intel_limits_i8xx_dac = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 908000, .max = 1512000 },
> @@ -18838,6 +18829,15 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
>  
>  #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
>  
> +static bool
> +has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
> +{
> +	if (cpu_transcoder == TRANSCODER_EDP)
> +		return HAS_TRANSCODER_EDP(dev_priv);
> +	else
> +		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
> +}
> +
>  struct intel_display_error_state {
>  
>  	u32 power_well_driver;

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

[Intel-gfx] [PATCH] drm/i915: Fix kbuild test robot build error

[Anshuman Gupta]

Fixes: d54c1a513c48 ("drm/i915: Fix broken transcoder err state")
has_transcoder() was unused because function which was using it,
intel_display_capture_error_state() defined under
CONFIG_DRM_I915_CAPTURE_ERROR.
Moving has_transcoder() to under CONFIG_DRM_I915_CAPTURE_ERROR.
No functional change.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reported-by: kbuild test robot <lkp@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 2fd3ccd33e30..27ec245e0dd2 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -249,15 +249,6 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
 		return dev_priv->fdi_pll_freq;
 }
 
-static bool
-has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
-{
-	if (cpu_transcoder == TRANSCODER_EDP)
-		return HAS_TRANSCODER_EDP(dev_priv);
-	else
-		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
-}
-
 static const struct intel_limit intel_limits_i8xx_dac = {
 	.dot = { .min = 25000, .max = 350000 },
 	.vco = { .min = 908000, .max = 1512000 },
@@ -18838,6 +18829,15 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
 
 #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
 
+static bool
+has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
+{
+	if (cpu_transcoder == TRANSCODER_EDP)
+		return HAS_TRANSCODER_EDP(dev_priv);
+	else
+		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
+}
+
 struct intel_display_error_state {
 
 	u32 power_well_driver;
-- 
2.25.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx