Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acfb9973 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Add pretty printer for modparams 



We dump modparams in few places (debugfs, gpu_error) using different
functions. Lets add reusable function to avoid code duplication.

add/remove: 1/0 grow/shrink: 0/2 up/down: 1096/-2339 (-1243)
Function                                     old     new   delta
i915_params_dump                               -    1096   +1096
i915_capabilities                           1353     185   -1168
i915_error_state_to_str                     5507    4336   -1171
Total: Before=1285716, After=1284473, chg -0.10%

v2: use forward decl rather than include (Chris)

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171219114346.26308-3-michal.wajdeczko@intel.com
parent eb10ed9a

drivers/gpu/drm/i915/i915_debugfs.c

+1 −20
Original line number Diff line number Diff line
@@ -37,23 +37,6 @@ static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node) 
	return to_i915(node->minor->dev);

}



static __always_inline void seq_print_param(struct seq_file *m,

					    const char *name,

					    const char *type,

					    const void *x)

{

	if (!__builtin_strcmp(type, "bool"))

		seq_printf(m, "i915.%s=%s\n", name, yesno(*(const bool *)x));

	else if (!__builtin_strcmp(type, "int"))

		seq_printf(m, "i915.%s=%d\n", name, *(const int *)x);

	else if (!__builtin_strcmp(type, "unsigned int"))

		seq_printf(m, "i915.%s=%u\n", name, *(const unsigned int *)x);

	else if (!__builtin_strcmp(type, "char *"))

		seq_printf(m, "i915.%s=%s\n", name, *(const char **)x);

	else

		BUILD_BUG();

}



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

{

	struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -67,9 +50,7 @@ static int i915_capabilities(struct seq_file *m, void *data) 
	intel_device_info_dump_flags(info, &p);



	kernel_param_lock(THIS_MODULE);

#define PRINT_PARAM(T, x, ...) seq_print_param(m, #x, #T, &i915_modparams.x);

	I915_PARAMS_FOR_EACH(PRINT_PARAM);

#undef PRINT_PARAM

	i915_params_dump(&i915_modparams, &p);

	kernel_param_unlock(THIS_MODULE);



	return 0;

drivers/gpu/drm/i915/i915_gpu_error.c

+4 −21
Original line number Diff line number Diff line
@@ -569,29 +569,12 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m, 
	intel_device_info_dump_flags(info, &p);

}



static __always_inline void err_print_param(struct drm_i915_error_state_buf *m,

					    const char *name,

					    const char *type,

					    const void *x)

{

	if (!__builtin_strcmp(type, "bool"))

		err_printf(m, "i915.%s=%s\n", name, yesno(*(const bool *)x));

	else if (!__builtin_strcmp(type, "int"))

		err_printf(m, "i915.%s=%d\n", name, *(const int *)x);

	else if (!__builtin_strcmp(type, "unsigned int"))

		err_printf(m, "i915.%s=%u\n", name, *(const unsigned int *)x);

	else if (!__builtin_strcmp(type, "char *"))

		err_printf(m, "i915.%s=%s\n", name, *(const char **)x);

	else

		BUILD_BUG();

}



static void err_print_params(struct drm_i915_error_state_buf *m,

			     const struct i915_params *p)

			     const struct i915_params *params)

{

#define PRINT(T, x, ...) err_print_param(m, #x, #T, &p->x);

	I915_PARAMS_FOR_EACH(PRINT);

#undef PRINT

	struct drm_printer p = i915_error_printer(m);



	i915_params_dump(params, &p);

}



static void err_print_pciid(struct drm_i915_error_state_buf *m,

drivers/gpu/drm/i915/i915_params.c

+33 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
 * IN THE SOFTWARE.

 */



#include <drm/drm_print.h>



#include "i915_params.h"

#include "i915_drv.h"
@@ -172,3 +174,34 @@ i915_param_named(enable_dpcd_backlight, bool, 0600, 


i915_param_named(enable_gvt, bool, 0400,

	"Enable support for Intel GVT-g graphics virtualization host support(default:false)");



static __always_inline void _print_param(struct drm_printer *p,

					 const char *name,

					 const char *type,

					 const void *x)

{

	if (!__builtin_strcmp(type, "bool"))

		drm_printf(p, "i915.%s=%s\n", name, yesno(*(const bool *)x));

	else if (!__builtin_strcmp(type, "int"))

		drm_printf(p, "i915.%s=%d\n", name, *(const int *)x);

	else if (!__builtin_strcmp(type, "unsigned int"))

		drm_printf(p, "i915.%s=%u\n", name, *(const unsigned int *)x);

	else if (!__builtin_strcmp(type, "char *"))

		drm_printf(p, "i915.%s=%s\n", name, *(const char **)x);

	else

		BUILD_BUG();

}



/**

 * i915_params_dump - dump i915 modparams

 * @params: i915 modparams

 * @p: the &drm_printer

 *

 * Pretty printer for i915 modparams.

 */

void i915_params_dump(const struct i915_params *params, struct drm_printer *p)

{

#define PRINT(T, x, ...) _print_param(p, #x, #T, &params->x);

	I915_PARAMS_FOR_EACH(PRINT);

#undef PRINT

}

drivers/gpu/drm/i915/i915_params.h

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/bitops.h>

#include <linux/cache.h> /* for __read_mostly */



struct drm_printer;



#define ENABLE_GUC_SUBMISSION		BIT(0)

#define ENABLE_GUC_LOAD_HUC		BIT(1)
@@ -77,5 +79,7 @@ struct i915_params { 


extern struct i915_params i915_modparams __read_mostly;



void i915_params_dump(const struct i915_params *params, struct drm_printer *p);



#endif