| Message ID | 20190617123915.926526-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: include missing linux/delay.h | expand |
Hi Arnd. On Mon, Jun 17, 2019 at 02:38:55PM +0200, Arnd Bergmann wrote: > Some randconfig builds fail to compile the dcn10 code because of > a missing declaration: > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c: In function 'dcn10_apply_ctx_for_surface': > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:2378:3: error: implicit declaration of function 'udelay' [-Werror=implicit-function-declaration] > > Include the appropriate kernel header. > > Fixes: 9ed43ef84d9d ("drm/amd/display: Add Underflow Asserts to dc") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c > index 1ac9a4f03990..d87ddc7de9c6 100644 > --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c > +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c > @@ -22,6 +22,7 @@ > * Authors: AMD > * > */ > +#include <linux/delay.h> > > #include <linux/delay.h> > #include "dm_services.h" Something has gone wrong here, as you add a second include of linux/delay.h. We had this problem before, which Alex fixed by applying a patch to include linux/delay.h Sam
On Mon, Jun 17, 2019 at 4:41 PM Sam Ravnborg <sam@ravnborg.org> wrote: > On Mon, Jun 17, 2019 at 02:38:55PM +0200, Arnd Bergmann wrote: > > Some randconfig builds fail to compile the dcn10 code because of > > a missing declaration: > > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c: In function 'dcn10_apply_ctx_for_surface': > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:2378:3: error: implicit declaration of function 'udelay' [-Werror=implicit-function-declaration] > > > > Include the appropriate kernel header. > > > > Fixes: 9ed43ef84d9d ("drm/amd/display: Add Underflow Asserts to dc") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c > > index 1ac9a4f03990..d87ddc7de9c6 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c > > +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c > > @@ -22,6 +22,7 @@ > > * Authors: AMD > > * > > */ > > +#include <linux/delay.h> > > > > #include <linux/delay.h> > > #include "dm_services.h" > > Something has gone wrong here, as you add a second include of linux/delay.h. > > We had this problem before, which Alex fixed by applying a patch to > include linux/delay.h My mistake, sorry about that. I had written and tested the patch on last week's linux-next ernel and sent it out today after rebasing it, but did not closely look at the resulting patch after the rebase. Arnd
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index 1ac9a4f03990..d87ddc7de9c6 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -22,6 +22,7 @@ * Authors: AMD * */ +#include <linux/delay.h> #include <linux/delay.h> #include "dm_services.h"
Some randconfig builds fail to compile the dcn10 code because of a missing declaration: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c: In function 'dcn10_apply_ctx_for_surface': drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:2378:3: error: implicit declaration of function 'udelay' [-Werror=implicit-function-declaration] Include the appropriate kernel header. Fixes: 9ed43ef84d9d ("drm/amd/display: Add Underflow Asserts to dc") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + 1 file changed, 1 insertion(+)