2022-06-15 20:01:35

by Randy Dunlap

[permalink] [raw]
Subject: Re: linux-next: Tree for Jun 15 (drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c)



On 6/15/22 12:28, Alex Deucher wrote:
> On Wed, Jun 15, 2022 at 3:01 PM Randy Dunlap <[email protected]> wrote:
>>
>>
>>
>> On 6/14/22 23:01, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20220614:
>>>
>>
>> on i386:
>> # CONFIG_DEBUG_FS is not set
>>
>>
>> ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_crtc_late_register’:
>> ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:6599:2: error: implicit declaration of function ‘crtc_debugfs_init’; did you mean ‘amdgpu_debugfs_init’? [-Werror=implicit-function-declaration]
>> crtc_debugfs_init(crtc);
>> ^~~~~~~~~~~~~~~~~
>> amdgpu_debugfs_init
>>
>>
>> Full randconfig file is attached.
>
> I tried building with your config and I can't repro this. As Harry
> noted, that function and the whole secure display feature depend on
> debugfs. It should never be built without CONFIG_DEBUG_FS. See
> drivers/gpu/drm/amd/display/Kconfig:

Did you try building with today's linux-next tree?
(whatever is in it)

I have seen this build error multiple times so it shouldn't
be so difficult to repro it.


>> config DRM_AMD_SECURE_DISPLAY
>> bool "Enable secure display support"
>> default n
>> depends on DEBUG_FS
>> depends on DRM_AMD_DC_DCN
>> help
>> Choose this option if you want to
>> support secure display
>>
>> This option enables the calculation
>> of crc of specific region via debugfs.
>> Cooperate with specific DMCU FW.
>
> amdgpu_dm_crtc_late_register is guarded by
> CONIG_DRM_AMD_SECURE_DISPLAY. It's not clear to me how we could hit
> this.


--
~Randy


2022-06-15 20:41:10

by Alex Deucher

[permalink] [raw]
Subject: Re: linux-next: Tree for Jun 15 (drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c)

On Wed, Jun 15, 2022 at 3:44 PM Randy Dunlap <[email protected]> wrote:
>
>
>
> On 6/15/22 12:28, Alex Deucher wrote:
> > On Wed, Jun 15, 2022 at 3:01 PM Randy Dunlap <[email protected]> wrote:
> >>
> >>
> >>
> >> On 6/14/22 23:01, Stephen Rothwell wrote:
> >>> Hi all,
> >>>
> >>> Changes since 20220614:
> >>>
> >>
> >> on i386:
> >> # CONFIG_DEBUG_FS is not set
> >>
> >>
> >> ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_crtc_late_register’:
> >> ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:6599:2: error: implicit declaration of function ‘crtc_debugfs_init’; did you mean ‘amdgpu_debugfs_init’? [-Werror=implicit-function-declaration]
> >> crtc_debugfs_init(crtc);
> >> ^~~~~~~~~~~~~~~~~
> >> amdgpu_debugfs_init
> >>
> >>
> >> Full randconfig file is attached.
> >
> > I tried building with your config and I can't repro this. As Harry
> > noted, that function and the whole secure display feature depend on
> > debugfs. It should never be built without CONFIG_DEBUG_FS. See
> > drivers/gpu/drm/amd/display/Kconfig:
>
> Did you try building with today's linux-next tree?
> (whatever is in it)
>
> I have seen this build error multiple times so it shouldn't
> be so difficult to repro it.
>
>
> >> config DRM_AMD_SECURE_DISPLAY
> >> bool "Enable secure display support"
> >> default n
> >> depends on DEBUG_FS
> >> depends on DRM_AMD_DC_DCN
> >> help
> >> Choose this option if you want to
> >> support secure display
> >>
> >> This option enables the calculation
> >> of crc of specific region via debugfs.
> >> Cooperate with specific DMCU FW.
> >
> > amdgpu_dm_crtc_late_register is guarded by
> > CONIG_DRM_AMD_SECURE_DISPLAY. It's not clear to me how we could hit
> > this.

I was able to repro it. In linux-next the
CONFIG_DRM_AMD_SECURE_DISPLAY ifdefs in
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c seem to be missing.
I guess they were lost when the amdgpu branch was merged into
linux-next. The attached patch restores the
CONFIG_DRM_AMD_SECURE_DISPLAY protections.

Thanks,

Alex

>
>
> --
> ~Randy


Attachments:
0001-drm-amdgpu-fix-merge-of-amdgpu-next-branch.patch (1.40 kB)

2022-06-15 20:46:09

by Randy Dunlap

[permalink] [raw]
Subject: Re: linux-next: Tree for Jun 15 (drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c)

Hi--

On 6/15/22 13:13, Alex Deucher wrote:
> On Wed, Jun 15, 2022 at 3:44 PM Randy Dunlap <[email protected]> wrote:
>>
>>
>>
>> On 6/15/22 12:28, Alex Deucher wrote:
>>> On Wed, Jun 15, 2022 at 3:01 PM Randy Dunlap <[email protected]> wrote:
>>>>
>>>>
>>>>
>>>> On 6/14/22 23:01, Stephen Rothwell wrote:
>>>>> Hi all,
>>>>>
>>>>> Changes since 20220614:
>>>>>
>>>>
>>>> on i386:
>>>> # CONFIG_DEBUG_FS is not set
>>>>
>>>>
>>>> ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_crtc_late_register’:
>>>> ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:6599:2: error: implicit declaration of function ‘crtc_debugfs_init’; did you mean ‘amdgpu_debugfs_init’? [-Werror=implicit-function-declaration]
>>>> crtc_debugfs_init(crtc);
>>>> ^~~~~~~~~~~~~~~~~
>>>> amdgpu_debugfs_init
>>>>
>>>>
>>>> Full randconfig file is attached.
>>>
>>> I tried building with your config and I can't repro this. As Harry
>>> noted, that function and the whole secure display feature depend on
>>> debugfs. It should never be built without CONFIG_DEBUG_FS. See
>>> drivers/gpu/drm/amd/display/Kconfig:
>>
>> Did you try building with today's linux-next tree?
>> (whatever is in it)
>>
>> I have seen this build error multiple times so it shouldn't
>> be so difficult to repro it.
>>
>>
>>>> config DRM_AMD_SECURE_DISPLAY
>>>> bool "Enable secure display support"
>>>> default n
>>>> depends on DEBUG_FS
>>>> depends on DRM_AMD_DC_DCN
>>>> help
>>>> Choose this option if you want to
>>>> support secure display
>>>>
>>>> This option enables the calculation
>>>> of crc of specific region via debugfs.
>>>> Cooperate with specific DMCU FW.
>>>
>>> amdgpu_dm_crtc_late_register is guarded by
>>> CONIG_DRM_AMD_SECURE_DISPLAY. It's not clear to me how we could hit
>>> this.
>

I was just about to ask what the paragraph above means.
It was confusing to say the least.

> I was able to repro it. In linux-next the
> CONFIG_DRM_AMD_SECURE_DISPLAY ifdefs in
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c seem to be missing.
> I guess they were lost when the amdgpu branch was merged into
> linux-next. The attached patch restores the
> CONFIG_DRM_AMD_SECURE_DISPLAY protections.

OK, that builds for me.

Thanks.

--
~Randy