On Tue, 12 Sep 2023, Rodrigo Vivi <[email protected]> wrote:
> On Tue, Sep 12, 2023 at 03:05:35PM +0300, Jani Nikula wrote:
>> Initializing i915->display.info.__device_info and DISPLAY_RUNTIME_INFO()
>> really belongs in display code. Move them there.
>>
>> Cc: Matt Roper <[email protected]>
>> Signed-off-by: Jani Nikula <[email protected]>
>
> Reviewed-by: Rodrigo Vivi <[email protected]>
Thanks, pushed the series.
BR,
Jani.
>
>> ---
>> .../drm/i915/display/intel_display_device.c | 24 ++++++++++++++++---
>> .../drm/i915/display/intel_display_device.h | 4 +---
>> drivers/gpu/drm/i915/intel_device_info.c | 14 +----------
>> 3 files changed, 23 insertions(+), 19 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c
>> b/drivers/gpu/drm/i915/display/intel_display_device.c
>> index c39f8a15d8aa..ed564566e31b 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
>> @@ -850,9 +850,9 @@ probe_gmdid_display(struct drm_i915_private *i915, u16
>> *ver, u16 *rel, u16 *step
>> return &no_display;
>> }
>>
>> -const struct intel_display_device_info *
>> -intel_display_device_probe(struct drm_i915_private *i915, bool has_gmdid,
>> - u16 *gmdid_ver, u16 *gmdid_rel, u16 *gmdid_step)
>> +static const struct intel_display_device_info *
>> +probe_display(struct drm_i915_private *i915, bool has_gmdid,
>> + u16 *gmdid_ver, u16 *gmdid_rel, u16 *gmdid_step)
>> {
>> struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
>> int i;
>> @@ -876,6 +876,24 @@ intel_display_device_probe(struct drm_i915_private
>> *i915, bool has_gmdid,
>> return &no_display;
>> }
>>
>> +void intel_display_device_probe(struct drm_i915_private *i915)
>> +{
>> + u16 ver, rel, step;
>> +
>> + /* Probe display support */
>> + i915->display.info.__device_info = probe_display(i915, HAS_GMD_ID(i915),
>> + &ver, &rel, &step);
>> + memcpy(DISPLAY_RUNTIME_INFO(i915),
>> + &DISPLAY_INFO(i915)->__runtime_defaults,
>> + sizeof(*DISPLAY_RUNTIME_INFO(i915)));
>> +
>> + if (HAS_GMD_ID(i915)) {
>> + DISPLAY_RUNTIME_INFO(i915)->ip.ver = ver;
>> + DISPLAY_RUNTIME_INFO(i915)->ip.rel = rel;
>> + DISPLAY_RUNTIME_INFO(i915)->ip.step = step;
>> + }
>> +}
>> +
>> void intel_display_device_info_runtime_init(struct drm_i915_private *i915)
>> {
>> struct intel_display_runtime_info *display_runtime =
>> DISPLAY_RUNTIME_INFO(i915);
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h
>> b/drivers/gpu/drm/i915/display/intel_display_device.h
>> index 8198401aa5be..a7b6469b43a6 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
>> @@ -149,9 +149,7 @@ struct intel_display_device_info {
>> } color;
>> };
>>
>> -const struct intel_display_device_info *
>> -intel_display_device_probe(struct drm_i915_private *i915, bool has_gmdid,
>> - u16 *ver, u16 *rel, u16 *step);
>> +void intel_display_device_probe(struct drm_i915_private *i915);
>> void intel_display_device_info_runtime_init(struct drm_i915_private *i915);
>>
>> void intel_display_device_info_print(const struct intel_display_device_info
>> *info,
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.c
>> b/drivers/gpu/drm/i915/intel_device_info.c
>> index 9dfa680a4c62..b9b8b22540cb 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.c
>> +++ b/drivers/gpu/drm/i915/intel_device_info.c
>> @@ -410,7 +410,6 @@ void intel_device_info_driver_create(struct
>> drm_i915_private *i915,
>> const struct intel_device_info *match_info)
>> {
>> struct intel_runtime_info *runtime;
>> - u16 ver, rel, step;
>>
>> /* Setup INTEL_INFO() */
>> i915->__info = match_info;
>> @@ -419,18 +418,7 @@ void intel_device_info_driver_create(struct
>> drm_i915_private *i915,
>> runtime = RUNTIME_INFO(i915);
>> memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime));
>>
>> - /* Probe display support */
>> - i915->display.info.__device_info = intel_display_device_probe(i915,
>> HAS_GMD_ID(i915),
>> - &ver,
>> &rel, &step);
>> - memcpy(DISPLAY_RUNTIME_INFO(i915),
>> - &DISPLAY_INFO(i915)->__runtime_defaults,
>> - sizeof(*DISPLAY_RUNTIME_INFO(i915)));
>> -
>> - if (HAS_GMD_ID(i915)) {
>> - DISPLAY_RUNTIME_INFO(i915)->ip.ver = ver;
>> - DISPLAY_RUNTIME_INFO(i915)->ip.rel = rel;
>> - DISPLAY_RUNTIME_INFO(i915)->ip.step = step;
>> - }
>> + intel_display_device_probe(i915);
>>
>> runtime->device_id = device_id;
>> }
>> --
>> 2.39.2
>>
--
Jani Nikula, Intel
