Commit d2de8ccf authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/fbc: Move FBC debugfs stuff into intel_fbc.c 



In order to encapsulate FBC harder let's just move the debugfs
stuff into intel_fbc.c.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211124113652.22090-12-ville.syrjala@linux.intel.com


Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 32024bb8

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

+2 −48
Original line number Diff line number Diff line
@@ -40,52 +40,6 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused) 
	return 0;

}



static int i915_fbc_status(struct seq_file *m, void *unused)

{

	struct drm_i915_private *dev_priv = node_to_i915(m->private);

	struct intel_fbc *fbc = &dev_priv->fbc;

	intel_wakeref_t wakeref;



	if (!HAS_FBC(dev_priv))

		return -ENODEV;



	wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);

	mutex_lock(&fbc->lock);



	if (intel_fbc_is_active(fbc)) {

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

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

			   yesno(intel_fbc_is_compressing(fbc)));

	} else {

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

	}



	mutex_unlock(&fbc->lock);

	intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);



	return 0;

}



static int i915_fbc_false_color_get(void *data, u64 *val)

{

	struct drm_i915_private *dev_priv = data;



	*val = dev_priv->fbc.false_color;



	return 0;

}



static int i915_fbc_false_color_set(void *data, u64 val)

{

	struct drm_i915_private *dev_priv = data;



	return intel_fbc_set_false_color(&dev_priv->fbc, val);

}



DEFINE_SIMPLE_ATTRIBUTE(i915_fbc_false_color_fops,

			i915_fbc_false_color_get, i915_fbc_false_color_set,

			"%llu\n");



static int i915_ips_status(struct seq_file *m, void *unused)

{

	struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -2058,7 +2012,6 @@ static const struct file_operations i915_fifo_underrun_reset_ops = { 


static const struct drm_info_list intel_display_debugfs_list[] = {

	{"i915_frontbuffer_tracking", i915_frontbuffer_tracking, 0},

	{"i915_fbc_status", i915_fbc_status, 0},

	{"i915_ips_status", i915_ips_status, 0},

	{"i915_sr_status", i915_sr_status, 0},

	{"i915_opregion", i915_opregion, 0},
@@ -2083,7 +2036,6 @@ static const struct { 
	{"i915_pri_wm_latency", &i915_pri_wm_latency_fops},

	{"i915_spr_wm_latency", &i915_spr_wm_latency_fops},

	{"i915_cur_wm_latency", &i915_cur_wm_latency_fops},

	{"i915_fbc_false_color", &i915_fbc_false_color_fops},

	{"i915_dp_test_data", &i915_displayport_test_data_fops},

	{"i915_dp_test_type", &i915_displayport_test_type_fops},

	{"i915_dp_test_active", &i915_displayport_test_active_fops},
@@ -2110,6 +2062,8 @@ void intel_display_debugfs_register(struct drm_i915_private *i915) 
	drm_debugfs_create_files(intel_display_debugfs_list,

				 ARRAY_SIZE(intel_display_debugfs_list),

				 minor->debugfs_root, minor);



	intel_fbc_debugfs_register(i915);

}



static int i915_panel_show(struct seq_file *m, void *data)

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

+79 −31
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static void intel_fbc_hw_deactivate(struct intel_fbc *fbc) 
	fbc->funcs->deactivate(fbc);

}



bool intel_fbc_is_compressing(struct intel_fbc *fbc)

static bool intel_fbc_is_compressing(struct intel_fbc *fbc)

{

	return fbc->funcs->is_compressing(fbc);

}
@@ -612,36 +612,6 @@ static void intel_fbc_nuke(struct intel_fbc *fbc) 
	fbc->funcs->nuke(fbc);

}



int intel_fbc_set_false_color(struct intel_fbc *fbc, bool enable)

{

	if (!fbc->funcs || !fbc->funcs->set_false_color)

		return -ENODEV;



	mutex_lock(&fbc->lock);



	fbc->false_color = enable;



	fbc->funcs->set_false_color(fbc, enable);



	mutex_unlock(&fbc->lock);



	return 0;

}



/**

 * intel_fbc_is_active - Is FBC active?

 * @fbc: The FBC instance

 *

 * This function is used to verify the current state of FBC.

 *

 * FIXME: This should be tracked in the plane config eventually

 * instead of queried at runtime for most callers.

 */

bool intel_fbc_is_active(struct intel_fbc *fbc)

{

	return fbc->active;

}



static void intel_fbc_activate(struct intel_fbc *fbc)

{

	intel_fbc_hw_activate(fbc);
@@ -1691,3 +1661,81 @@ void intel_fbc_init(struct drm_i915_private *i915) 
	if (intel_fbc_hw_is_active(fbc))

		intel_fbc_hw_deactivate(fbc);

}



static int intel_fbc_debugfs_status_show(struct seq_file *m, void *unused)

{

	struct intel_fbc *fbc = m->private;

	struct drm_i915_private *i915 = fbc->i915;

	intel_wakeref_t wakeref;



	wakeref = intel_runtime_pm_get(&i915->runtime_pm);

	mutex_lock(&fbc->lock);



	if (fbc->active) {

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

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

			   yesno(intel_fbc_is_compressing(fbc)));

	} else {

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

	}



	mutex_unlock(&fbc->lock);

	intel_runtime_pm_put(&i915->runtime_pm, wakeref);



	return 0;

}



DEFINE_SHOW_ATTRIBUTE(intel_fbc_debugfs_status);



static int intel_fbc_debugfs_false_color_get(void *data, u64 *val)

{

	struct intel_fbc *fbc = data;



	*val = fbc->false_color;



	return 0;

}



static int intel_fbc_debugfs_false_color_set(void *data, u64 val)

{

	struct intel_fbc *fbc = data;



	mutex_lock(&fbc->lock);



	fbc->false_color = val;



	if (fbc->active)

		fbc->funcs->set_false_color(fbc, fbc->false_color);



	mutex_unlock(&fbc->lock);



	return 0;

}



DEFINE_SIMPLE_ATTRIBUTE(intel_fbc_debugfs_false_color_fops,

			intel_fbc_debugfs_false_color_get,

			intel_fbc_debugfs_false_color_set,

			"%llu\n");



static void intel_fbc_debugfs_add(struct intel_fbc *fbc)

{

	struct drm_i915_private *i915 = fbc->i915;

	struct drm_minor *minor = i915->drm.primary;



	debugfs_create_file("i915_fbc_status", 0444,

			    minor->debugfs_root, fbc,

			    &intel_fbc_debugfs_status_fops);



	if (fbc->funcs->set_false_color)

		debugfs_create_file("i915_fbc_false_color", 0644,

				    minor->debugfs_root, fbc,

				    &intel_fbc_debugfs_false_color_fops);

}



void intel_fbc_debugfs_register(struct drm_i915_private *i915)

{

	struct intel_fbc *fbc = &i915->fbc;



	if (HAS_FBC(i915))

		intel_fbc_debugfs_add(fbc);

}

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

+1 −3
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ struct intel_fbc; 
struct intel_plane_state;



int intel_fbc_atomic_check(struct intel_atomic_state *state);

bool intel_fbc_is_active(struct intel_fbc *fbc);

bool intel_fbc_is_compressing(struct intel_fbc *fbc);

bool intel_fbc_pre_update(struct intel_atomic_state *state,

			  struct intel_crtc *crtc);

void intel_fbc_post_update(struct intel_atomic_state *state,
@@ -37,6 +35,6 @@ void intel_fbc_flush(struct drm_i915_private *dev_priv, 
		     unsigned int frontbuffer_bits, enum fb_op_origin origin);

void intel_fbc_handle_fifo_underrun_irq(struct drm_i915_private *i915);

void intel_fbc_reset_underrun(struct drm_i915_private *i915);

int intel_fbc_set_false_color(struct intel_fbc *fbc, bool enable);

void intel_fbc_debugfs_register(struct drm_i915_private *i915);



#endif /* __INTEL_FBC_H__ */