drm/i915: Fix kbuild test robot build error
diff mbox series

Message ID 20200227175147.11362-1-anshuman.gupta@intel.com
State New
Headers show
Series
  • drm/i915: Fix kbuild test robot build error
Related show

Commit Message

Anshuman Gupta Feb. 27, 2020, 5:51 p.m. UTC
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(-)

Comments

Jani Nikula Feb. 28, 2020, 7:48 a.m. UTC | #1
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;
Shankar, Uma March 3, 2020, 12:47 p.m. UTC | #2
> -----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

Patch
diff mbox series

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;