[PATCH] drm/amdgpu/vcn: remove unnecessary included headers

Leo Liu leo.liu at amd.com
Mon Dec 16 20:10:48 UTC 2019


Hi Alex,

I searched and found why it get built okay:

amdgpu.h includes amdgpu_mode.h, and that include linux/i2c.h.

And linux/i2c.h includes linux/acpi.h and that includes linux/modules.h.

Tested it by commenting out linux/modules.h from linux/acpi.h, then the 
build for amdgpu.ko would fail at the MODULE_FIRMWARE for VCN.

So in order to keep it consistent, and I will send v2 to keep 
<linux/modules.h>

Regards,

Leo


On 2019-12-16 11:50 a.m., Leo Liu wrote:
>
> On 2019-12-16 11:36 a.m., Alex Deucher wrote:
>> On Mon, Dec 16, 2019 at 11:06 AM Leo Liu <leo.liu at amd.com> wrote:
>>> Esp. VCN1.0 headers should not be here
>>>
>>> Signed-off-by: Leo Liu <leo.liu at amd.com>
>>> ---
>>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 7 -------
>>>   1 file changed, 7 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>> index e522025430c7..371f55de42dc 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>> @@ -25,19 +25,12 @@
>>>    */
>>>
>>>   #include <linux/firmware.h>
>>> -#include <linux/module.h>
>> Don't we still need module.h for MODULE_FIRMWARE()?
>
> It's got built okay by removing it. I will keep it anyway.
>
> Regards,
> Leo
>
>
>
>>
>> Alex
>>
>>>   #include <linux/pci.h>
>>>
>>> -#include <drm/drm.h>
>>> -
>>>   #include "amdgpu.h"
>>>   #include "amdgpu_pm.h"
>>>   #include "amdgpu_vcn.h"
>>>   #include "soc15d.h"
>>> -#include "soc15_common.h"
>>> -
>>> -#include "vcn/vcn_1_0_offset.h"
>>> -#include "vcn/vcn_1_0_sh_mask.h"
>>>
>>>   /* Firmware Names */
>>>   #define FIRMWARE_RAVEN         "amdgpu/raven_vcn.bin"
>>> -- 
>>> 2.17.1
>>>
>>> _______________________________________________
>>> amd-gfx mailing list
>>> amd-gfx at lists.freedesktop.org
>>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cleo.liu%40amd.com%7C041e573a661b498216ea08d782481d8e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637121119112744072&sdata=TtjVEgl%2BB2sprSvHOJvCpZsxXD5jw9WSreusaDoeKmU%3D&reserved=0 
>>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cleo.liu%40amd.com%7C041e573a661b498216ea08d782481d8e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637121119112744072&sdata=TtjVEgl%2BB2sprSvHOJvCpZsxXD5jw9WSreusaDoeKmU%3D&reserved=0 
>


More information about the amd-gfx mailing list