On Wed, 01 Sep 2021, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote:
> On Mon, Aug 30, 2021 at 03:53:44PM +0300, Jani Nikula wrote:
>> Prefer the intel_ types. No functional changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
>> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++-
>> drivers/gpu/drm/i915/display/intel_display_debugfs.h | 4 ++--
>> 3 files changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
>> index 4f49d782eca2..c65f95a9a1ec 100644
>> --- a/drivers/gpu/drm/i915/display/intel_connector.c
>> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
>> @@ -124,7 +124,7 @@ int intel_connector_register(struct drm_connector *connector)
>
> oh, actually this is drm_connector
>
>> goto err_backlight;
>> }
>>
>> - intel_connector_debugfs_add(connector);
>> + intel_connector_debugfs_add(intel_connector);
>
> so this fails...
Hence the v2 :)
>
>>
>> return 0;
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> index 845e2dc76f87..82043a71e91f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> @@ -2444,8 +2444,9 @@ static const struct file_operations i915_dsc_bpp_fops = {
>> * Cleanup will be done by drm_connector_unregister() through a call to
>> * drm_debugfs_connector_remove().
>> */
>> -void intel_connector_debugfs_add(struct drm_connector *connector)
>> +void intel_connector_debugfs_add(struct intel_connector *intel_connector)
>> {
>> + struct drm_connector *connector = &intel_connector->base;
>> struct dentry *root = connector->debugfs_entry;
>> struct drm_i915_private *dev_priv = to_i915(connector->dev);
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> index c72e35ecba1f..9b89b707ffe6 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> @@ -6,9 +6,9 @@
>> #ifndef __INTEL_DISPLAY_DEBUGFS_H__
>> #define __INTEL_DISPLAY_DEBUGFS_H__
>>
>> -struct drm_connector;
>> struct drm_crtc;
>> struct drm_i915_private;
>> +struct intel_connector;
>>
>> #ifdef CONFIG_DEBUG_FS
>> void intel_display_debugfs_register(struct drm_i915_private *i915);
>> @@ -16,7 +16,7 @@ void intel_connector_debugfs_add(struct drm_connector *connector);
>> void intel_crtc_debugfs_add(struct drm_crtc *crtc);
>> #else
>> static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
>> -static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
>> +static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
>> static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
>> #endif
>>
>> --
>> 2.20.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
