On Thu, 22 Aug 2024, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote:
> On Thu, Aug 22, 2024 at 07:04:55PM +0300, Jani Nikula wrote:
>> Going forward, struct intel_display shall replace struct
>> drm_i915_private as the main display device data pointer type. Convert
>> intel_display_params.[ch] and intel_display_debugfs_params.[ch] to
>> struct intel_display.
>>
>> Some stragglers are left behind where needed.
>
> ^ just noticed the extra tab on this, but
> likely present in the other commit messages where you had
> left some cases behind...
Thanks, fixed while applying.
BR,
Jani.
>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>
>> ---
>> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 2 +-
>> .../gpu/drm/i915/display/intel_display_debugfs_params.c | 8 ++++----
>> .../gpu/drm/i915/display/intel_display_debugfs_params.h | 4 ++--
>> drivers/gpu/drm/i915/display/intel_display_params.c | 6 +++---
>> drivers/gpu/drm/i915/display/intel_display_params.h | 4 ++--
>> drivers/gpu/drm/i915/i915_debugfs.c | 3 ++-
>> drivers/gpu/drm/i915/i915_gpu_error.c | 3 ++-
>> 7 files changed, 16 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> index 0cf0b4223513..74f527647aa9 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> @@ -1073,7 +1073,7 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)
>> intel_opregion_debugfs_register(display);
>> intel_psr_debugfs_register(i915);
>> intel_wm_debugfs_register(i915);
>> - intel_display_debugfs_params(i915);
>> + intel_display_debugfs_params(display);
>> }
>>
>> static int i915_hdcp_sink_capability_show(struct seq_file *m, void *data)
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
>> index f35718748555..ec3ed29a83c9 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
>> @@ -151,13 +151,13 @@ intel_display_debugfs_create_uint(const char *name, umode_t mode,
>> } while (0)
>>
>> /* add a subdirectory with files for each intel display param */
>> -void intel_display_debugfs_params(struct drm_i915_private *i915)
>> +void intel_display_debugfs_params(struct intel_display *display)
>> {
>> - struct drm_minor *minor = i915->drm.primary;
>> + struct drm_minor *minor = display->drm->primary;
>> struct dentry *dir;
>> char dirname[16];
>>
>> - snprintf(dirname, sizeof(dirname), "%s_params", i915->drm.driver->name);
>> + snprintf(dirname, sizeof(dirname), "%s_params", display->drm->driver->name);
>> dir = debugfs_lookup(dirname, minor->debugfs_root);
>> if (!dir)
>> dir = debugfs_create_dir(dirname, minor->debugfs_root);
>> @@ -171,7 +171,7 @@ void intel_display_debugfs_params(struct drm_i915_private *i915)
>> */
>>
>> #define REGISTER(T, x, unused, mode, ...) _intel_display_param_create_file( \
>> - dir, #x, mode, &i915->display.params.x);
>> + dir, #x, mode, &display->params.x);
>> INTEL_DISPLAY_PARAMS_FOR_EACH(REGISTER);
>> #undef REGISTER
>> }
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.h b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.h
>> index 1e9945a4044c..a1120915a5a8 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.h
>> @@ -6,8 +6,8 @@
>> #ifndef __INTEL_DISPLAY_DEBUGFS_PARAMS__
>> #define __INTEL_DISPLAY_DEBUGFS_PARAMS__
>>
>> -struct drm_i915_private;
>> +struct intel_display;
>>
>> -void intel_display_debugfs_params(struct drm_i915_private *i915);
>> +void intel_display_debugfs_params(struct intel_display *display);
>>
>> #endif /* __INTEL_DISPLAY_DEBUGFS_PARAMS__ */
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
>> index e82bd72d32fa..1a45d300b6f0 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
>> @@ -173,14 +173,14 @@ static void _param_print_charp(struct drm_printer *p, const char *driver_name,
>>
>> /**
>> * intel_display_params_dump - dump intel display modparams
>> - * @i915: i915 device
>> + * @display: display device
>> * @p: the &drm_printer
>> *
>> * Pretty printer for i915 modparams.
>> */
>> -void intel_display_params_dump(struct drm_i915_private *i915, struct drm_printer *p)
>> +void intel_display_params_dump(struct intel_display *display, struct drm_printer *p)
>> {
>> -#define PRINT(T, x, ...) _param_print(p, i915->drm.driver->name, #x, i915->display.params.x);
>> +#define PRINT(T, x, ...) _param_print(p, display->drm->driver->name, #x, display->params.x);
>> INTEL_DISPLAY_PARAMS_FOR_EACH(PRINT);
>> #undef PRINT
>> }
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
>> index 48c29c55c939..da8dc943234b 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
>> @@ -9,7 +9,7 @@
>> #include <linux/types.h>
>>
>> struct drm_printer;
>> -struct drm_i915_private;
>> +struct intel_display;
>>
>> /*
>> * Invoke param, a function-like macro, for each intel display param, with
>> @@ -56,7 +56,7 @@ struct intel_display_params {
>> };
>> #undef MEMBER
>>
>> -void intel_display_params_dump(struct drm_i915_private *i915,
>> +void intel_display_params_dump(struct intel_display *display,
>> struct drm_printer *p);
>> void intel_display_params_copy(struct intel_display_params *dest);
>> void intel_display_params_free(struct intel_display_params *params);
>> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>> index bc717cf544e4..f969f585d07b 100644
>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> @@ -66,6 +66,7 @@ static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
>> static int i915_capabilities(struct seq_file *m, void *data)
>> {
>> struct drm_i915_private *i915 = node_to_i915(m->private);
>> + struct intel_display *display = &i915->display;
>> struct drm_printer p = drm_seq_file_printer(m);
>>
>> seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(i915));
>> @@ -77,7 +78,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
>>
>> kernel_param_lock(THIS_MODULE);
>> i915_params_dump(&i915->params, &p);
>> - intel_display_params_dump(i915, &p);
>> + intel_display_params_dump(display, &p);
>> kernel_param_unlock(THIS_MODULE);
>>
>> return 0;
>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>> index 96c6cafd5b9e..6469b9bcf2ec 100644
>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>> @@ -660,9 +660,10 @@ static void err_print_params(struct drm_i915_error_state_buf *m,
>> const struct i915_params *params)
>> {
>> struct drm_printer p = i915_error_printer(m);
>> + struct intel_display *display = &m->i915->display;
>>
>> i915_params_dump(params, &p);
>> - intel_display_params_dump(m->i915, &p);
>> + intel_display_params_dump(display, &p);
>> }
>>
>> static void err_print_pciid(struct drm_i915_error_state_buf *m,
>> --
>> 2.39.2
>>
--
Jani Nikula, Intel
