Commit 01fabda8 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915: Use str_yes_no() 



Remove the local yesno() implementation and adopt the str_yes_no() 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-1-lucas.demarchi@intel.com
parent 230bc2be

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

+12 −11
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/module.h>

#include <linux/dma-resv.h>

#include <linux/slab.h>

#include <linux/string_helpers.h>

#include <linux/vga_switcheroo.h>



#include <drm/drm_atomic.h>
@@ -2884,7 +2885,7 @@ static int intel_crtc_compute_pipe_mode(struct intel_crtc_state *crtc_state) 
			    "[CRTC:%d:%s] requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n",

			    crtc->base.base.id, crtc->base.name,

			    pipe_mode->crtc_clock, clock_limit,

			    yesno(crtc_state->double_wide));

			    str_yes_no(crtc_state->double_wide));

		return -EINVAL;

	}
@@ -5261,7 +5262,7 @@ static void intel_dump_plane_state(const struct intel_plane_state *plane_state) 
		drm_dbg_kms(&i915->drm,

			    "[PLANE:%d:%s] fb: [NOFB], visible: %s\n",

			    plane->base.base.id, plane->base.name,

			    yesno(plane_state->uapi.visible));

			    str_yes_no(plane_state->uapi.visible));

		return;

	}
@@ -5269,7 +5270,7 @@ static void intel_dump_plane_state(const struct intel_plane_state *plane_state) 
		    "[PLANE:%d:%s] fb: [FB:%d] %ux%u format = %p4cc modifier = 0x%llx, visible: %s\n",

		    plane->base.base.id, plane->base.name,

		    fb->base.id, fb->width, fb->height, &fb->format->format,

		    fb->modifier, yesno(plane_state->uapi.visible));

		    fb->modifier, str_yes_no(plane_state->uapi.visible));

	drm_dbg_kms(&i915->drm, "\trotation: 0x%x, scaler: %d\n",

		    plane_state->hw.rotation, plane_state->scaler_id);

	if (plane_state->uapi.visible)
@@ -5292,7 +5293,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config, 


	drm_dbg_kms(&dev_priv->drm, "[CRTC:%d:%s] enable: %s %s\n",

		    crtc->base.base.id, crtc->base.name,

		    yesno(pipe_config->hw.enable), context);

		    str_yes_no(pipe_config->hw.enable), context);



	if (!pipe_config->hw.enable)

		goto dump_planes;
@@ -5300,7 +5301,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config, 
	snprintf_output_types(buf, sizeof(buf), pipe_config->output_types);

	drm_dbg_kms(&dev_priv->drm,

		    "active: %s, output_types: %s (0x%x), output format: %s\n",

		    yesno(pipe_config->hw.active),

		    str_yes_no(pipe_config->hw.active),

		    buf, pipe_config->output_types,

		    output_formats(pipe_config->output_format));
@@ -5370,7 +5371,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config, 
		intel_dump_dp_vsc_sdp(dev_priv, &pipe_config->infoframes.vsc);



	drm_dbg_kms(&dev_priv->drm, "vrr: %s, vmin: %d, vmax: %d, pipeline full: %d, guardband: %d flipline: %d, vmin vblank: %d, vmax vblank: %d\n",

		    yesno(pipe_config->vrr.enable),

		    str_yes_no(pipe_config->vrr.enable),

		    pipe_config->vrr.vmin, pipe_config->vrr.vmax,

		    pipe_config->vrr.pipeline_full, pipe_config->vrr.guardband,

		    pipe_config->vrr.flipline,
@@ -5412,7 +5413,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config, 
			    "pch pfit: " DRM_RECT_FMT ", %s, force thru: %s\n",

			    DRM_RECT_ARG(&pipe_config->pch_pfit.dst),

			    enableddisabled(pipe_config->pch_pfit.enabled),

			    yesno(pipe_config->pch_pfit.force_thru));

			    str_yes_no(pipe_config->pch_pfit.force_thru));



	drm_dbg_kms(&dev_priv->drm, "ips: %i, double wide: %i\n",

		    pipe_config->ips_enabled, pipe_config->double_wide);
@@ -6058,8 +6059,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	if (current_config->name != pipe_config->name) { \

		pipe_config_mismatch(fastset, crtc,  __stringify(name), \

				     "(expected %s, found %s)", \

				     yesno(current_config->name), \

				     yesno(pipe_config->name)); \

				     str_yes_no(current_config->name), \

				     str_yes_no(pipe_config->name)); \

		ret = false; \

	} \

} while (0)
@@ -6075,8 +6076,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	} else { \

		pipe_config_mismatch(fastset, crtc, __stringify(name), \

				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)", \

				     yesno(current_config->name), \

				     yesno(pipe_config->name)); \

				     str_yes_no(current_config->name), \

				     str_yes_no(pipe_config->name)); \

		ret = false; \

	} \

} while (0)

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

+37 −28
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Copyright © 2020 Intel Corporation

 */



#include <linux/string_helpers.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_fourcc.h>
@@ -53,7 +55,7 @@ static int i915_ips_status(struct seq_file *m, void *unused) 
	wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);



	seq_printf(m, "Enabled by kernel parameter: %s\n",

		   yesno(dev_priv->params.enable_ips));

		   str_yes_no(dev_priv->params.enable_ips));



	if (DISPLAY_VER(dev_priv) >= 8) {

		seq_puts(m, "Currently: unknown\n");
@@ -261,7 +263,7 @@ static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp) 
	bool enabled;

	u32 val;



	seq_printf(m, "Sink support: %s", yesno(psr->sink_support));

	seq_printf(m, "Sink support: %s", str_yes_no(psr->sink_support));

	if (psr->sink_support)

		seq_printf(m, " [0x%02x]", intel_dp->psr_dpcd[0]);

	seq_puts(m, "\n");
@@ -280,7 +282,7 @@ static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp) 


	if (!psr->enabled) {

		seq_printf(m, "PSR sink not reliable: %s\n",

			   yesno(psr->sink_not_reliable));

			   str_yes_no(psr->sink_not_reliable));



		goto unlock;

	}
@@ -447,13 +449,17 @@ static int i915_dmc_info(struct seq_file *m, void *unused) 


	wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);



	seq_printf(m, "fw loaded: %s\n", yesno(intel_dmc_has_payload(dev_priv)));

	seq_printf(m, "fw loaded: %s\n",

		   str_yes_no(intel_dmc_has_payload(dev_priv)));

	seq_printf(m, "path: %s\n", dmc->fw_path);

	seq_printf(m, "Pipe A fw support: %s\n",

		   yesno(GRAPHICS_VER(dev_priv) >= 12));

	seq_printf(m, "Pipe A fw loaded: %s\n", yesno(dmc->dmc_info[DMC_FW_PIPEA].payload));

	seq_printf(m, "Pipe B fw support: %s\n", yesno(IS_ALDERLAKE_P(dev_priv)));

	seq_printf(m, "Pipe B fw loaded: %s\n", yesno(dmc->dmc_info[DMC_FW_PIPEB].payload));

		   str_yes_no(GRAPHICS_VER(dev_priv) >= 12));

	seq_printf(m, "Pipe A fw loaded: %s\n",

		   str_yes_no(dmc->dmc_info[DMC_FW_PIPEA].payload));

	seq_printf(m, "Pipe B fw support: %s\n",

		   str_yes_no(IS_ALDERLAKE_P(dev_priv)));

	seq_printf(m, "Pipe B fw loaded: %s\n",

		   str_yes_no(dmc->dmc_info[DMC_FW_PIPEB].payload));



	if (!intel_dmc_has_payload(dev_priv))

		goto out;
@@ -578,7 +584,8 @@ static void intel_dp_info(struct seq_file *m, 
	const struct drm_property_blob *edid = intel_connector->base.edid_blob_ptr;



	seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);

	seq_printf(m, "\taudio support: %s\n", yesno(intel_dp->has_audio));

	seq_printf(m, "\taudio support: %s\n",

		   str_yes_no(intel_dp->has_audio));

	if (intel_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)

		intel_panel_info(m, &intel_connector->panel);
@@ -591,7 +598,7 @@ static void intel_dp_mst_info(struct seq_file *m, 
{

	bool has_audio = intel_connector->port->has_audio;



	seq_printf(m, "\taudio support: %s\n", yesno(has_audio));

	seq_printf(m, "\taudio support: %s\n", str_yes_no(has_audio));

}



static void intel_hdmi_info(struct seq_file *m,
@@ -600,7 +607,8 @@ static void intel_hdmi_info(struct seq_file *m, 
	struct intel_encoder *intel_encoder = intel_attached_encoder(intel_connector);

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(intel_encoder);



	seq_printf(m, "\taudio support: %s\n", yesno(intel_hdmi->has_audio));

	seq_printf(m, "\taudio support: %s\n",

		   str_yes_no(intel_hdmi->has_audio));

}



static void intel_lvds_info(struct seq_file *m,
@@ -758,7 +766,7 @@ static void intel_plane_hw_info(struct seq_file *m, struct intel_plane *plane) 
		   DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",

		   fb->base.id, &fb->format->format,

		   fb->modifier, fb->width, fb->height,

		   yesno(plane_state->uapi.visible),

		   str_yes_no(plane_state->uapi.visible),

		   DRM_RECT_FP_ARG(&plane_state->uapi.src),

		   DRM_RECT_ARG(&plane_state->uapi.dst),

		   rot_str);
@@ -797,7 +805,7 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *crtc) 
				&crtc_state->scaler_state.scalers[i];



			seq_printf(m, ", scalers[%d]: use=%s, mode=%x",

				   i, yesno(sc->in_use), sc->mode);

				   i, str_yes_no(sc->in_use), sc->mode);

		}

		seq_puts(m, "\n");

	} else {
@@ -920,12 +928,12 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc) 
		   crtc->base.base.id, crtc->base.name);



	seq_printf(m, "\tuapi: enable=%s, active=%s, mode=" DRM_MODE_FMT "\n",

		   yesno(crtc_state->uapi.enable),

		   yesno(crtc_state->uapi.active),

		   str_yes_no(crtc_state->uapi.enable),

		   str_yes_no(crtc_state->uapi.active),

		   DRM_MODE_ARG(&crtc_state->uapi.mode));



	seq_printf(m, "\thw: enable=%s, active=%s\n",

		   yesno(crtc_state->hw.enable), yesno(crtc_state->hw.active));

		   str_yes_no(crtc_state->hw.enable), str_yes_no(crtc_state->hw.active));

	seq_printf(m, "\tadjusted_mode=" DRM_MODE_FMT "\n",

		   DRM_MODE_ARG(&crtc_state->hw.adjusted_mode));

	seq_printf(m, "\tpipe__mode=" DRM_MODE_FMT "\n",
@@ -933,7 +941,7 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc) 


	seq_printf(m, "\tpipe src size=%dx%d, dither=%s, bpp=%d\n",

		   crtc_state->pipe_src_w, crtc_state->pipe_src_h,

		   yesno(crtc_state->dither), crtc_state->pipe_bpp);

		   str_yes_no(crtc_state->dither), crtc_state->pipe_bpp);



	intel_scaler_info(m, crtc);
@@ -949,8 +957,8 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc) 
	intel_plane_info(m, crtc);



	seq_printf(m, "\tunderrun reporting: cpu=%s pch=%s\n",

		   yesno(!crtc->cpu_fifo_underrun_disabled),

		   yesno(!crtc->pch_fifo_underrun_disabled));

		   str_yes_no(!crtc->cpu_fifo_underrun_disabled),

		   str_yes_no(!crtc->pch_fifo_underrun_disabled));



	crtc_updates_info(m, crtc, "\t");

}
@@ -1006,7 +1014,8 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused) 
		seq_printf(m, "DPLL%i: %s, id: %i\n", i, pll->info->name,

			   pll->info->id);

		seq_printf(m, " pipe_mask: 0x%x, active: 0x%x, on: %s\n",

			   pll->state.pipe_mask, pll->active_mask, yesno(pll->on));

			   pll->state.pipe_mask, pll->active_mask,

			   str_yes_no(pll->on));

		seq_printf(m, " tracked hardware state:\n");

		seq_printf(m, " dpll:    0x%08x\n", pll->state.hw_state.dpll);

		seq_printf(m, " dpll_md: 0x%08x\n",
@@ -1048,7 +1057,7 @@ static int i915_ipc_status_show(struct seq_file *m, void *data) 
	struct drm_i915_private *dev_priv = m->private;



	seq_printf(m, "Isochronous Priority Control: %s\n",

			yesno(dev_priv->ipc_enabled));

			str_yes_no(dev_priv->ipc_enabled));

	return 0;

}
@@ -1157,7 +1166,7 @@ static void drrs_status_per_crtc(struct seq_file *m, 
		    drrs->type == SEAMLESS_DRRS_SUPPORT)

			supported = true;



		seq_printf(m, "\tDRRS Supported: %s\n", yesno(supported));

		seq_printf(m, "\tDRRS Supported: %s\n", str_yes_no(supported));

	}

	drm_connector_list_iter_end(&conn_iter);
@@ -1741,7 +1750,7 @@ static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data) 


	seq_printf(m, "Threshold: %d\n", hotplug->hpd_storm_threshold);

	seq_printf(m, "Detected: %s\n",

		   yesno(delayed_work_pending(&hotplug->reenable_work)));

		   str_yes_no(delayed_work_pending(&hotplug->reenable_work)));



	return 0;

}
@@ -1815,7 +1824,7 @@ static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data) 
	struct drm_i915_private *dev_priv = m->private;



	seq_printf(m, "Enabled: %s\n",

		   yesno(dev_priv->hotplug.hpd_short_storm_enabled));

		   str_yes_no(dev_priv->hotplug.hpd_short_storm_enabled));



	return 0;

}
@@ -2210,14 +2219,14 @@ static int i915_dsc_fec_support_show(struct seq_file *m, void *data) 
		intel_dp = intel_attached_dp(to_intel_connector(connector));

		crtc_state = to_intel_crtc_state(crtc->state);

		seq_printf(m, "DSC_Enabled: %s\n",

			   yesno(crtc_state->dsc.compression_enable));

			   str_yes_no(crtc_state->dsc.compression_enable));

		seq_printf(m, "DSC_Sink_Support: %s\n",

			   yesno(drm_dp_sink_supports_dsc(intel_dp->dsc_dpcd)));

			   str_yes_no(drm_dp_sink_supports_dsc(intel_dp->dsc_dpcd)));

		seq_printf(m, "Force_DSC_Enable: %s\n",

			   yesno(intel_dp->force_dsc_en));

			   str_yes_no(intel_dp->force_dsc_en));

		if (!intel_dp_is_edp(intel_dp))

			seq_printf(m, "FEC_Sink_Support: %s\n",

				   yesno(drm_dp_sink_supports_fec(intel_dp->fec_capable)));

				   str_yes_no(drm_dp_sink_supports_fec(intel_dp->fec_capable)));

	} while (try_again);



	drm_modeset_drop_locks(&ctx);

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

+3 −3
Original line number Diff line number Diff line
@@ -210,9 +210,9 @@ TRACE_EVENT(g4x_wm, 
	    TP_printk("pipe %c, frame=%u, scanline=%u, wm %d/%d/%d, sr %s/%d/%d/%d, hpll %s/%d/%d/%d, fbc %s",

		      pipe_name(__entry->pipe), __entry->frame, __entry->scanline,

		      __entry->primary, __entry->sprite, __entry->cursor,

		      yesno(__entry->cxsr), __entry->sr_plane, __entry->sr_cursor, __entry->sr_fbc,

		      yesno(__entry->hpll), __entry->hpll_plane, __entry->hpll_cursor, __entry->hpll_fbc,

		      yesno(__entry->fbc))

		      str_yes_no(__entry->cxsr), __entry->sr_plane, __entry->sr_cursor, __entry->sr_fbc,

		      str_yes_no(__entry->hpll), __entry->hpll_plane, __entry->hpll_cursor, __entry->hpll_fbc,

		      str_yes_no(__entry->fbc))

);



TRACE_EVENT(vlv_wm,

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

+7 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/i2c.h>

#include <linux/notifier.h>

#include <linux/slab.h>

#include <linux/string_helpers.h>

#include <linux/timekeeping.h>

#include <linux/types.h>
@@ -2787,8 +2788,9 @@ intel_dp_configure_mst(struct intel_dp *intel_dp) 
	drm_dbg_kms(&i915->drm,

		    "[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",

		    encoder->base.base.id, encoder->base.name,

		    yesno(intel_dp_mst_source_support(intel_dp)), yesno(sink_can_mst),

		    yesno(i915->params.enable_dp_mst));

		    str_yes_no(intel_dp_mst_source_support(intel_dp)),

		    str_yes_no(sink_can_mst),

		    str_yes_no(i915->params.enable_dp_mst));



	if (!intel_dp_mst_source_support(intel_dp))

		return;
@@ -4375,9 +4377,9 @@ intel_dp_update_420(struct intel_dp *intel_dp) 
	drm_dbg_kms(&i915->drm,

		    "[CONNECTOR:%d:%s] RGB->YcbCr conversion? %s, YCbCr 4:2:0 allowed? %s, YCbCr 4:4:4->4:2:0 conversion? %s\n",

		    connector->base.base.id, connector->base.name,

		    yesno(intel_dp->dfp.rgb_to_ycbcr),

		    yesno(connector->base.ycbcr_420_allowed),

		    yesno(intel_dp->dfp.ycbcr_444_to_420));

		    str_yes_no(intel_dp->dfp.rgb_to_ycbcr),

		    str_yes_no(connector->base.ycbcr_420_allowed),

		    str_yes_no(intel_dp->dfp.ycbcr_444_to_420));

}



static void

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

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
 * forcibly disable it to allow proper screen updates.

 */



#include <linux/string_helpers.h>



#include <drm/drm_fourcc.h>



#include "i915_drv.h"
@@ -1744,7 +1746,7 @@ static int intel_fbc_debugfs_status_show(struct seq_file *m, void *unused) 
	if (fbc->active) {

		seq_puts(m, "FBC enabled\n");

		seq_printf(m, "Compressing: %s\n",

			   yesno(intel_fbc_is_compressing(fbc)));

			   str_yes_no(intel_fbc_is_compressing(fbc)));

	} else {

		seq_printf(m, "FBC disabled: %s\n", fbc->no_fbc_reason);

	}