Commit f79a568a authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915: Use str_on_off() 



Remove the local onoff() implementation and adopt the
str_on_off() from linux/string_helpers.h.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220225234631.3725943-4-lucas.demarchi@intel.com
parent ff9fbe7c

drivers/gpu/drm/i915/display/g4x_dp.c

+4 −2
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 * DisplayPort support for G4x,ILK,SNB,IVB,VLV,CHV (HSW+ handled by the DDI code).

 */



#include <linux/string_helpers.h>



#include "g4x_dp.h"

#include "intel_audio.h"

#include "intel_backlight.h"
@@ -192,7 +194,7 @@ static void assert_dp_port(struct intel_dp *intel_dp, bool state) 
	I915_STATE_WARN(cur_state != state,

			"[ENCODER:%d:%s] state assertion failure (expected %s, current %s)\n",

			dig_port->base.base.base.id, dig_port->base.base.name,

			onoff(state), onoff(cur_state));

			str_on_off(state), str_on_off(cur_state));

}

#define assert_dp_port_disabled(d) assert_dp_port((d), false)
@@ -202,7 +204,7 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state) 


	I915_STATE_WARN(cur_state != state,

			"eDP PLL state assertion failure (expected %s, current %s)\n",

			onoff(state), onoff(cur_state));

			str_on_off(state), str_on_off(cur_state));

}

#define assert_edp_pll_enabled(d) assert_edp_pll((d), true)

#define assert_edp_pll_disabled(d) assert_edp_pll((d), false)

drivers/gpu/drm/i915/display/intel_display.c

+4 −3
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static void wait_for_pipe_scanline_moving(struct intel_crtc *crtc, bool state) 
	if (wait_for(pipe_scanline_is_moving(dev_priv, pipe) == state, 100))

		drm_err(&dev_priv->drm,

			"pipe %c scanline %s wait timed out\n",

			pipe_name(pipe), onoff(state));

			pipe_name(pipe), str_on_off(state));

}



static void intel_wait_for_pipe_scanline_stopped(struct intel_crtc *crtc)
@@ -457,7 +457,7 @@ void assert_transcoder(struct drm_i915_private *dev_priv, 
	I915_STATE_WARN(cur_state != state,

			"transcoder %s assertion failure (expected %s, current %s)\n",

			transcoder_name(cpu_transcoder),

			onoff(state), onoff(cur_state));

			str_on_off(state), str_on_off(cur_state));

}



static void assert_plane(struct intel_plane *plane, bool state)
@@ -469,7 +469,8 @@ static void assert_plane(struct intel_plane *plane, bool state) 


	I915_STATE_WARN(cur_state != state,

			"%s assertion failure (expected %s, current %s)\n",

			plane->base.name, onoff(state), onoff(cur_state));

			plane->base.name, str_on_off(state),

			str_on_off(cur_state));

}



#define assert_plane_enabled(p) assert_plane(p, true)

drivers/gpu/drm/i915/display/intel_display_trace.h

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#if !defined(__INTEL_DISPLAY_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ)

#define __INTEL_DISPLAY_TRACE_H__



#include <linux/string_helpers.h>

#include <linux/types.h>

#include <linux/tracepoint.h>
@@ -161,7 +162,7 @@ TRACE_EVENT(intel_memory_cxsr, 
			   ),



	    TP_printk("%s->%s, pipe A: frame=%u, scanline=%u, pipe B: frame=%u, scanline=%u, pipe C: frame=%u, scanline=%u",

		      onoff(__entry->old), onoff(__entry->new),

		      str_on_off(__entry->old), str_on_off(__entry->new),

		      __entry->frame[PIPE_A], __entry->scanline[PIPE_A],

		      __entry->frame[PIPE_B], __entry->scanline[PIPE_B],

		      __entry->frame[PIPE_C], __entry->scanline[PIPE_C])

drivers/gpu/drm/i915/display/intel_dpll.c

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/string_helpers.h>



#include "intel_crtc.h"

#include "intel_de.h"
@@ -1945,7 +1946,7 @@ static void assert_pll(struct drm_i915_private *dev_priv, 
	cur_state = intel_de_read(dev_priv, DPLL(pipe)) & DPLL_VCO_ENABLE;

	I915_STATE_WARN(cur_state != state,

			"PLL state assertion failure (expected %s, current %s)\n",

			onoff(state), onoff(cur_state));

			str_on_off(state), str_on_off(cur_state));

}



void assert_pll_enabled(struct drm_i915_private *i915, enum pipe pipe)

drivers/gpu/drm/i915/display/intel_dpll_mgr.c

+5 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 * DEALINGS IN THE SOFTWARE.

 */



#include <linux/string_helpers.h>



#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dpio_phy.h"
@@ -178,13 +180,14 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv, 
	struct intel_dpll_hw_state hw_state;



	if (drm_WARN(&dev_priv->drm, !pll,

		     "asserting DPLL %s with no DPLL\n", onoff(state)))

		     "asserting DPLL %s with no DPLL\n", str_on_off(state)))

		return;



	cur_state = intel_dpll_get_hw_state(dev_priv, pll, &hw_state);

	I915_STATE_WARN(cur_state != state,

	     "%s assertion failure (expected %s, current %s)\n",

			pll->info->name, onoff(state), onoff(cur_state));

			pll->info->name, str_on_off(state),

			str_on_off(cur_state));

}



static enum tc_port icl_pll_id_to_tc_port(enum intel_dpll_id id)