linux-next: build failure after merge of the amdgpu tree

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c: In function 'amdgpu_ctx_init':
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c:348:26: error: 'fpriv' undeclared (first use in this function)
  348 |         ctx->ctx_mgr = &(fpriv->ctx_mgr);
      |                          ^~~~~

Caused by commit

  2458393a4e98 ("drm/amdgpu: keep amdgpu_ctx_mgr in ctx structure")

I have used the amdgpu tree from next-20230518 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the amdgpu tree

[James Zhu]

Hi Stephen,

I saw 
https://gitlab.freedesktop.org/agd5f/linux/-/blob/amd-staging-drm-next/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c#349

should not have this error.

Thanks!

James Zhu

On 2023-05-18 20:06, Stephen Rothwell wrote:
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c: In function 'amdgpu_ctx_init':
> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c:348:26: error: 'fpriv' undeclared (first use in this function)
>    348 |         ctx->ctx_mgr = &(fpriv->ctx_mgr);
>        |                          ^~~~~
>
> Caused by commit
>
>    2458393a4e98 ("drm/amdgpu: keep amdgpu_ctx_mgr in ctx structure")
>
> I have used the amdgpu tree from next-20230518 for today.
>

Re: linux-next: build failure after merge of the amdgpu tree

[Alex Deucher]

On Thu, May 18, 2023 at 8:06 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c: In function 'amdgpu_ctx_init':
> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c:348:26: error: 'fpriv' undeclared (first use in this function)
>   348 |         ctx->ctx_mgr = &(fpriv->ctx_mgr);
>       |                          ^~~~~
>
> Caused by commit
>
>   2458393a4e98 ("drm/amdgpu: keep amdgpu_ctx_mgr in ctx structure")
>
> I have used the amdgpu tree from next-20230518 for today.

Lost part of that patch in a rebase.  Fixed now.

Alex

>
> --
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2148 bytes --]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_job.c: In function 'amdgpu_job_timedout':
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c:90:33: error: too many arguments to function 'drm_sched_start'
   90 |                                 drm_sched_start(&ring->sched, true);
      |                                 ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h:28,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h:29,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu.h:43,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_job.c:30:
include/drm/gpu_scheduler.h:582:6: note: declared here
  582 | void drm_sched_start(struct drm_gpu_scheduler *sched);
      |      ^~~~~~~~~~~~~~~

Caused by commit

  15789fa0f0e2 ("drm/amdgpu: add per ring reset support (v5)")

interacting with commit

  83b501c1799a ("drm/scheduler: remove full_recover from drm_sched_start")

from the drm tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Aug 2024 11:46:24 +1000
Subject: [PATCH] fixup for "drm/amdgpu: add per ring reset support (v5)"

interacting with "drm/scheduler: remove full_recover from drm_sched_start"
from the drm tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index c6a1783fc9ef..597489dea114 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -87,7 +87,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job)
 			atomic_inc(&ring->adev->gpu_reset_counter);
 			amdgpu_fence_driver_force_completion(ring);
 			if (amdgpu_ring_sched_ready(ring))
-				drm_sched_start(&ring->sched, true);
+				drm_sched_start(&ring->sched);
 			goto exit;
 		}
 	}
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]

Hi all,

On Tue, 10 Oct 2023 12:43:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c: In function 'dml_core_mode_support':
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c:8229:1: error: the frame size of 2736 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>  8229 | } // dml_core_mode_support
>       | ^
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   7966f319c66d ("drm/amd/display: Introduce DML2")
> 
> (or maybe something later that changed storage size).
> 
> I have used the amdgpu tree from next-20231009 for today.

This build failure now (presumably) exists in the drm tree.  I am still
applying the 2 patches from Rodrigo to my tree as a work around.

I would have expected that this was fixed in the amdgpu tree before
Dave was asked to merge it ...
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

Hi all,

On Thu, 19 Oct 2023 12:06:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 10 Oct 2023 12:43:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the amdgpu tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c: In function 'dml_core_mode_support':
> > drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c:8229:1: error: the frame size of 2736 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> >  8229 | } // dml_core_mode_support
> >       | ^
> > cc1: all warnings being treated as errors
> > 
> > Caused by commit
> > 
> >   7966f319c66d ("drm/amd/display: Introduce DML2")
> > 
> > (or maybe something later that changed storage size).
> > 
> > I have used the amdgpu tree from next-20231009 for today.  
> 
> This build failure now (presumably) exists in the drm tree.  I am still
> applying the 2 patches from Rodrigo to my tree as a work around.
> 
> I would have expected that this was fixed in the amdgpu tree before
> Dave was asked to merge it ...

Any progress here?  I am still applying the 2 patches.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the amdgpu tree

[Alex Deucher]

On Mon, Oct 23, 2023 at 8:59 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Thu, 19 Oct 2023 12:06:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 10 Oct 2023 12:43:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the amdgpu tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c: In function 'dml_core_mode_support':
> > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c:8229:1: error: the frame size of 2736 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> > >  8229 | } // dml_core_mode_support
> > >       | ^
> > > cc1: all warnings being treated as errors
> > >
> > > Caused by commit
> > >
> > >   7966f319c66d ("drm/amd/display: Introduce DML2")
> > >
> > > (or maybe something later that changed storage size).
> > >
> > > I have used the amdgpu tree from next-20231009 for today.
> >
> > This build failure now (presumably) exists in the drm tree.  I am still
> > applying the 2 patches from Rodrigo to my tree as a work around.
> >
> > I would have expected that this was fixed in the amdgpu tree before
> > Dave was asked to merge it ...
>
> Any progress here?  I am still applying the 2 patches.

The two patches are in my -next tree and in the PR I sent last week.

Alex

Re: linux-next: build failure after merge of the amdgpu tree

[Alex Deucher]

On Tue, Oct 24, 2023 at 8:57 AM Alex Deucher <alexdeucher@gmail.com> wrote:
>
> On Mon, Oct 23, 2023 at 8:59 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > On Thu, 19 Oct 2023 12:06:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Tue, 10 Oct 2023 12:43:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > After merging the amdgpu tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > >
> > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c: In function 'dml_core_mode_support':
> > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_core.c:8229:1: error: the frame size of 2736 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> > > >  8229 | } // dml_core_mode_support
> > > >       | ^
> > > > cc1: all warnings being treated as errors
> > > >
> > > > Caused by commit
> > > >
> > > >   7966f319c66d ("drm/amd/display: Introduce DML2")
> > > >
> > > > (or maybe something later that changed storage size).
> > > >
> > > > I have used the amdgpu tree from next-20231009 for today.
> > >
> > > This build failure now (presumably) exists in the drm tree.  I am still
> > > applying the 2 patches from Rodrigo to my tree as a work around.
> > >
> > > I would have expected that this was fixed in the amdgpu tree before
> > > Dave was asked to merge it ...
> >
> > Any progress here?  I am still applying the 2 patches.
>
> The two patches are in my -next tree and in the PR I sent last week.

Looks like the gitlab migration over the weekend lost some history.
I've fixed it up.

Alex

Re: linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

Hi Alex,

On Tue, 24 Oct 2023 08:57:16 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> The two patches are in my -next tree and in the PR I sent last week.

Thanks.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the amdgpu tree

[Noralf Trønnes]

Hi drm-misc maintainers,

I don't know who has act on this but the driver came through
drm-misc-next so it's most likely not amd.

The initial post can be found here:
https://lore.kernel.org/linux-next/YiYC2fQgf7d%2FQPSM@sirena.org.uk/T/

Noralf.

Den 07.03.2022 14.04, skrev Mark Brown:
> On Mon, Mar 07, 2022 at 11:13:42AM +1100, Stephen Rothwell wrote:
> 
>> Caused by commit
>>
>>   0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")
>>
>> interacting with commit
>>
>>   a0386bba7093 ("spi: make remove callback a void function")
>>
>> from the spi trees.
> 
> The amdgpu tree can pull this tag and apply Stephen's fix as part of
> that:
> 
> The following changes since commit 26291c54e111ff6ba87a164d85d4a4e134b7315c:
> 
>   Linux 5.17-rc2 (2022-01-30 15:37:07 +0200)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-remove-void
> 
> for you to fetch changes up to a0386bba70934d42f586eaf68b21d5eeaffa7bd0:
> 
>   spi: make remove callback a void function (2022-02-09 13:00:45 +0000)
> 
> ----------------------------------------------------------------
> spi: Make remove() return void
> 
> This series from Uwe Kleine-König converts the spi remove function to
> return void since there is nothing useful that we can do with a failure
> and it as more buses are converted it'll enable further work on the
> driver core.
> 
> ----------------------------------------------------------------
> Uwe Kleine-König (5):
>       staging: fbtft: Fix error path in fbtft_driver_module_init()
>       staging: fbtft: Deduplicate driver registration macros
>       tpm: st33zp24: Make st33zp24_remove() a void function
>       platform/chrome: cros_ec: Make cros_ec_unregister() return void
>       spi: make remove callback a void function
> 
>  drivers/bus/moxtet.c                               |  4 +-
>  drivers/char/tpm/st33zp24/i2c.c                    |  5 +-
>  drivers/char/tpm/st33zp24/spi.c                    |  9 +-
>  drivers/char/tpm/st33zp24/st33zp24.c               |  3 +-
>  drivers/char/tpm/st33zp24/st33zp24.h               |  2 +-
>  drivers/char/tpm/tpm_tis_spi_main.c                |  3 +-
>  drivers/clk/clk-lmk04832.c                         |  4 +-
>  drivers/gpio/gpio-74x164.c                         |  4 +-
>  drivers/gpio/gpio-max3191x.c                       |  4 +-
>  drivers/gpio/gpio-max7301.c                        |  4 +-
>  drivers/gpio/gpio-mc33880.c                        |  4 +-
>  drivers/gpio/gpio-pisosr.c                         |  4 +-
>  drivers/gpu/drm/panel/panel-abt-y030xx067a.c       |  4 +-
>  drivers/gpu/drm/panel/panel-ilitek-ili9322.c       |  4 +-
>  drivers/gpu/drm/panel/panel-ilitek-ili9341.c       |  3 +-
>  drivers/gpu/drm/panel/panel-innolux-ej030na.c      |  4 +-
>  drivers/gpu/drm/panel/panel-lg-lb035q02.c          |  4 +-
>  drivers/gpu/drm/panel/panel-lg-lg4573.c            |  4 +-
>  drivers/gpu/drm/panel/panel-nec-nl8048hl11.c       |  4 +-
>  drivers/gpu/drm/panel/panel-novatek-nt39016.c      |  4 +-
>  drivers/gpu/drm/panel/panel-samsung-db7430.c       |  3 +-
>  drivers/gpu/drm/panel/panel-samsung-ld9040.c       |  4 +-
>  drivers/gpu/drm/panel/panel-samsung-s6d27a1.c      |  3 +-
>  drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c  |  3 +-
>  drivers/gpu/drm/panel/panel-sitronix-st7789v.c     |  4 +-
>  drivers/gpu/drm/panel/panel-sony-acx565akm.c       |  4 +-
>  drivers/gpu/drm/panel/panel-tpo-td028ttec1.c       |  4 +-
>  drivers/gpu/drm/panel/panel-tpo-td043mtea1.c       |  4 +-
>  drivers/gpu/drm/panel/panel-tpo-tpg110.c           |  3 +-
>  drivers/gpu/drm/panel/panel-widechips-ws2401.c     |  3 +-
>  drivers/gpu/drm/tiny/hx8357d.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9163.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9225.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9341.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9486.c                     |  4 +-
>  drivers/gpu/drm/tiny/mi0283qt.c                    |  4 +-
>  drivers/gpu/drm/tiny/repaper.c                     |  4 +-
>  drivers/gpu/drm/tiny/st7586.c                      |  4 +-
>  drivers/gpu/drm/tiny/st7735r.c                     |  4 +-
>  drivers/hwmon/adcxx.c                              |  4 +-
>  drivers/hwmon/adt7310.c                            |  3 +-
>  drivers/hwmon/max1111.c                            |  3 +-
>  drivers/hwmon/max31722.c                           |  4 +-
>  drivers/iio/accel/bma400_spi.c                     |  4 +-
>  drivers/iio/accel/bmc150-accel-spi.c               |  4 +-
>  drivers/iio/accel/bmi088-accel-spi.c               |  4 +-
>  drivers/iio/accel/kxsd9-spi.c                      |  4 +-
>  drivers/iio/accel/mma7455_spi.c                    |  4 +-
>  drivers/iio/accel/sca3000.c                        |  4 +-
>  drivers/iio/adc/ad7266.c                           |  4 +-
>  drivers/iio/adc/ltc2496.c                          |  4 +-
>  drivers/iio/adc/mcp320x.c                          |  4 +-
>  drivers/iio/adc/mcp3911.c                          |  4 +-
>  drivers/iio/adc/ti-adc12138.c                      |  4 +-
>  drivers/iio/adc/ti-ads7950.c                       |  4 +-
>  drivers/iio/adc/ti-ads8688.c                       |  4 +-
>  drivers/iio/adc/ti-tlc4541.c                       |  4 +-
>  drivers/iio/amplifiers/ad8366.c                    |  4 +-
>  drivers/iio/common/ssp_sensors/ssp_dev.c           |  4 +-
>  drivers/iio/dac/ad5360.c                           |  4 +-
>  drivers/iio/dac/ad5380.c                           |  4 +-
>  drivers/iio/dac/ad5446.c                           |  4 +-
>  drivers/iio/dac/ad5449.c                           |  4 +-
>  drivers/iio/dac/ad5504.c                           |  4 +-
>  drivers/iio/dac/ad5592r.c                          |  4 +-
>  drivers/iio/dac/ad5624r_spi.c                      |  4 +-
>  drivers/iio/dac/ad5686-spi.c                       |  4 +-
>  drivers/iio/dac/ad5761.c                           |  4 +-
>  drivers/iio/dac/ad5764.c                           |  4 +-
>  drivers/iio/dac/ad5791.c                           |  4 +-
>  drivers/iio/dac/ad8801.c                           |  4 +-
>  drivers/iio/dac/ltc1660.c                          |  4 +-
>  drivers/iio/dac/ltc2632.c                          |  4 +-
>  drivers/iio/dac/mcp4922.c                          |  4 +-
>  drivers/iio/dac/ti-dac082s085.c                    |  4 +-
>  drivers/iio/dac/ti-dac7311.c                       |  3 +-
>  drivers/iio/frequency/adf4350.c                    |  4 +-
>  drivers/iio/gyro/bmg160_spi.c                      |  4 +-
>  drivers/iio/gyro/fxas21002c_spi.c                  |  4 +-
>  drivers/iio/health/afe4403.c                       |  4 +-
>  drivers/iio/magnetometer/bmc150_magn_spi.c         |  4 +-
>  drivers/iio/magnetometer/hmc5843_spi.c             |  4 +-
>  drivers/iio/potentiometer/max5487.c                |  4 +-
>  drivers/iio/pressure/ms5611_spi.c                  |  4 +-
>  drivers/iio/pressure/zpa2326_spi.c                 |  4 +-
>  drivers/input/keyboard/applespi.c                  |  4 +-
>  drivers/input/misc/adxl34x-spi.c                   |  4 +-
>  drivers/input/touchscreen/ads7846.c                |  4 +-
>  drivers/input/touchscreen/cyttsp4_spi.c            |  4 +-
>  drivers/input/touchscreen/tsc2005.c                |  4 +-
>  drivers/leds/leds-cr0014114.c                      |  4 +-
>  drivers/leds/leds-dac124s085.c                     |  4 +-
>  drivers/leds/leds-el15203000.c                     |  4 +-
>  drivers/leds/leds-spi-byte.c                       |  4 +-
>  drivers/media/spi/cxd2880-spi.c                    |  4 +-
>  drivers/media/spi/gs1662.c                         |  4 +-
>  drivers/media/tuners/msi001.c                      |  3 +-
>  drivers/mfd/arizona-spi.c                          |  4 +-
>  drivers/mfd/da9052-spi.c                           |  3 +-
>  drivers/mfd/ezx-pcap.c                             |  4 +-
>  drivers/mfd/madera-spi.c                           |  4 +-
>  drivers/mfd/mc13xxx-spi.c                          |  3 +-
>  drivers/mfd/rsmu_spi.c                             |  4 +-
>  drivers/mfd/stmpe-spi.c                            |  4 +-
>  drivers/mfd/tps65912-spi.c                         |  4 +-
>  drivers/misc/ad525x_dpot-spi.c                     |  3 +-
>  drivers/misc/eeprom/eeprom_93xx46.c                |  4 +-
>  drivers/misc/lattice-ecp3-config.c                 |  4 +-
>  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |  4 +-
>  drivers/mmc/host/mmc_spi.c                         |  3 +-
>  drivers/mtd/devices/mchp23k256.c                   |  4 +-
>  drivers/mtd/devices/mchp48l640.c                   |  4 +-
>  drivers/mtd/devices/mtd_dataflash.c                |  4 +-
>  drivers/mtd/devices/sst25l.c                       |  4 +-
>  drivers/net/can/m_can/tcan4x5x-core.c              |  4 +-
>  drivers/net/can/spi/hi311x.c                       |  4 +-
>  drivers/net/can/spi/mcp251x.c                      |  4 +-
>  drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c     |  4 +-
>  drivers/net/dsa/b53/b53_spi.c                      |  4 +-
>  drivers/net/dsa/microchip/ksz8795_spi.c            |  4 +-
>  drivers/net/dsa/microchip/ksz9477_spi.c            |  4 +-
>  drivers/net/dsa/sja1105/sja1105_main.c             |  6 +-
>  drivers/net/dsa/vitesse-vsc73xx-spi.c              |  6 +-
>  drivers/net/ethernet/asix/ax88796c_main.c          |  4 +-
>  drivers/net/ethernet/micrel/ks8851_spi.c           |  4 +-
>  drivers/net/ethernet/microchip/enc28j60.c          |  4 +-
>  drivers/net/ethernet/microchip/encx24j600.c        |  4 +-
>  drivers/net/ethernet/qualcomm/qca_spi.c            |  4 +-
>  drivers/net/ethernet/vertexcom/mse102x.c           |  4 +-
>  drivers/net/ethernet/wiznet/w5100-spi.c            |  4 +-
>  drivers/net/ieee802154/adf7242.c                   |  4 +-
>  drivers/net/ieee802154/at86rf230.c                 |  4 +-
>  drivers/net/ieee802154/ca8210.c                    |  6 +-
>  drivers/net/ieee802154/cc2520.c                    |  4 +-
>  drivers/net/ieee802154/mcr20a.c                    |  4 +-
>  drivers/net/ieee802154/mrf24j40.c                  |  4 +-
>  drivers/net/phy/spi_ks8995.c                       |  4 +-
>  drivers/net/wan/slic_ds26522.c                     |  3 +-
>  drivers/net/wireless/intersil/p54/p54spi.c         |  4 +-
>  drivers/net/wireless/marvell/libertas/if_spi.c     |  4 +-
>  drivers/net/wireless/microchip/wilc1000/spi.c      |  4 +-
>  drivers/net/wireless/st/cw1200/cw1200_spi.c        |  4 +-
>  drivers/net/wireless/ti/wl1251/spi.c               |  4 +-
>  drivers/net/wireless/ti/wlcore/spi.c               |  4 +-
>  drivers/nfc/nfcmrvl/spi.c                          |  3 +-
>  drivers/nfc/st-nci/spi.c                           |  4 +-
>  drivers/nfc/st95hf/core.c                          |  4 +-
>  drivers/nfc/trf7970a.c                             |  4 +-
>  drivers/platform/chrome/cros_ec.c                  |  4 +-
>  drivers/platform/chrome/cros_ec.h                  |  2 +-
>  drivers/platform/chrome/cros_ec_i2c.c              |  4 +-
>  drivers/platform/chrome/cros_ec_lpc.c              |  4 +-
>  drivers/platform/chrome/cros_ec_spi.c              |  4 +-
>  drivers/platform/olpc/olpc-xo175-ec.c              |  4 +-
>  drivers/rtc/rtc-ds1302.c                           |  3 +-
>  drivers/rtc/rtc-ds1305.c                           |  4 +-
>  drivers/rtc/rtc-ds1343.c                           |  4 +-
>  drivers/spi/spi-mem.c                              |  6 +-
>  drivers/spi/spi-slave-system-control.c             |  3 +-
>  drivers/spi/spi-slave-time.c                       |  3 +-
>  drivers/spi/spi-tle62x0.c                          |  3 +-
>  drivers/spi/spi.c                                  | 11 +--
>  drivers/spi/spidev.c                               |  4 +-
>  drivers/staging/fbtft/fbtft.h                      | 97 +++++++++-------------
>  drivers/staging/pi433/pi433_if.c                   |  4 +-
>  drivers/staging/wfx/bus_spi.c                      |  3 +-
>  drivers/tty/serial/max3100.c                       |  5 +-
>  drivers/tty/serial/max310x.c                       |  3 +-
>  drivers/tty/serial/sc16is7xx.c                     |  4 +-
>  drivers/usb/gadget/udc/max3420_udc.c               |  4 +-
>  drivers/usb/host/max3421-hcd.c                     |  3 +-
>  drivers/video/backlight/ams369fg06.c               |  3 +-
>  drivers/video/backlight/corgi_lcd.c                |  3 +-
>  drivers/video/backlight/ili922x.c                  |  3 +-
>  drivers/video/backlight/l4f00242t03.c              |  3 +-
>  drivers/video/backlight/lms501kf03.c               |  3 +-
>  drivers/video/backlight/ltv350qv.c                 |  3 +-
>  drivers/video/backlight/tdo24m.c                   |  3 +-
>  drivers/video/backlight/tosa_lcd.c                 |  4 +-
>  drivers/video/backlight/vgg2432a4.c                |  4 +-
>  drivers/video/fbdev/omap/lcd_mipid.c               |  4 +-
>  .../omapfb/displays/panel-lgphilips-lb035q02.c     |  4 +-
>  .../omap2/omapfb/displays/panel-nec-nl8048hl11.c   |  4 +-
>  .../omap2/omapfb/displays/panel-sony-acx565akm.c   |  4 +-
>  .../omap2/omapfb/displays/panel-tpo-td028ttec1.c   |  4 +-
>  .../omap2/omapfb/displays/panel-tpo-td043mtea1.c   |  4 +-
>  include/linux/spi/spi.h                            |  2 +-
>  sound/pci/hda/cs35l41_hda_spi.c                    |  4 +-
>  sound/soc/codecs/adau1761-spi.c                    |  3 +-
>  sound/soc/codecs/adau1781-spi.c                    |  3 +-
>  sound/soc/codecs/cs35l41-spi.c                     |  4 +-
>  sound/soc/codecs/pcm3168a-spi.c                    |  4 +-
>  sound/soc/codecs/pcm512x-spi.c                     |  3 +-
>  sound/soc/codecs/tlv320aic32x4-spi.c               |  4 +-
>  sound/soc/codecs/tlv320aic3x-spi.c                 |  4 +-
>  sound/soc/codecs/wm0010.c                          |  4 +-
>  sound/soc/codecs/wm8804-spi.c                      |  3 +-
>  sound/spi/at73c213.c                               |  4 +-
>  198 files changed, 248 insertions(+), 617 deletions(-)

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2206 bytes --]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c: In function 'amdgpu_vkms_sw_fini':
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:521:34: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  521 |   if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
      |                                  ^
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:522:47: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  522 |    hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
      |                                               ^

Caused by commit

  deefd07eedb7 ("drm/amdgpu: fix vkms crtc settings")

interacting with commit

  3e467e478ed3 ("drm/amdgpu: cancel the correct hrtimer on exit")

from the drm-fixes tree.  The problem is that this latter patch also
appears in the amdgpu tree as a different commit and git resolves it
incorrectly in the presence of the former commit :-(

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Dec 2021 12:06:57 +1100
Subject: [PATCH] fix up for "drm/amdgpu: cancel the correct hrtimer on exit"

interacting with "drm/amdgpu: fix vkms crtc settings"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index e07fc64b655e..6c62c45e3e3e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -518,8 +518,8 @@ static int amdgpu_vkms_sw_fini(void *handle)
 	int i = 0;
 
 	for (i = 0; i < adev->mode_info.num_crtc; i++)
-		if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
-			hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
+		if (adev->mode_info.crtcs[i])
+			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);
 
 	kfree(adev->mode_info.bios_hardcoded_edid);
 	kfree(adev->amdgpu_vkms_output);
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 727 bytes --]

Hi all,

After merging the amdgpu tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from include/drm/ttm/ttm_bo_driver.h:40,
                 from include/drm/drm_gem_ttm_helper.h:11,
                 from drivers/gpu/drm/drm_gem_ttm_helper.c:5:
include/drm/ttm/ttm_device.h:274:19: error: duplicate member 'pinned'
  274 |  struct list_head pinned;
      |                   ^~~~~~

Caused by commit

  59084e464297 ("drm/ttm: Create pinned list")

interacting with commit

  32eadf52d449 ("drm/ttm: Create pinned list")

from the drm-misc tree.

The automatic merge proved incorrect, so I have removed one of the
insertions.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the amdgpu tree

[Mark Brown]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86
allmodconfig) failed like this:

ERROR: modpost: "dc_dsc_stream_bandwidth_in_kbps" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

Probably caused by commit

  b6b76b0315ed7b ("drm/amd/display: Fixed EdidUtility build errors")

I've reverted to Monday's tree.

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 391 bytes --]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:


Caused by commit

  13a75af50484 ("drm/amd/display: Fix unused variable warning")

interacting with commit

  4c3a3292730c ("drm/amd/display: fix unused variable warning")

from the drm tree.

I reverted the drm tree commit for now.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 2046 bytes --]

Hi all,

On Fri, 12 Jun 2020 10:25:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c: In function 'kfd_sdma_activity_worker':
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:118:2: error: implicit declaration of function 'use_mm' [-Werror=implicit-function-declaration]
>   118 |  use_mm(mm);
>       |  ^~~~~~
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:145:2: error: implicit declaration of function 'unuse_mm' [-Werror=implicit-function-declaration]
>   145 |  unuse_mm(mm);
>       |  ^~~~~~~~
> 
> Caused by commit
> 
>   32cb59f31362 ("drm/amdkfd: Track SDMA utilization per process")
> 
> interacting with commit
> 
>   f5678e7f2ac3 ("kernel: better document the use_mm/unuse_mm API contract")
> 
> from Linus' tree.
> 
> I have applied the following merge fix for today (that was previously
> part of the akpm tree).

The merge fix patch now looks like:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 May 2020 20:15:34 +1000
Subject: [PATCH] drm/amdkfd: fix up for {un}use_mm() rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 013c2b018edc..40695d52e9a8 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -184,7 +184,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
 	if (!mm)
 		goto cleanup;
 
-	use_mm(mm);
+	kthread_use_mm(mm);
 
 	list_for_each_entry(sdma_q, &sdma_q_list.list, list) {
 		val = 0;
@@ -198,7 +198,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
 		}
 	}
 
-	unuse_mm(mm);
+	kthread_unuse_mm(mm);
 	mmput(mm);
 
 	/*

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2710 bytes --]

Hi Dave,

On Wed, 26 Jun 2019 21:22:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Alex,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:25:
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c: In function 'gfx_v10_0_cp_gfx_resume':
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_RB_CNTL__BUF_SWAP_MASK'?
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>                            ^~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
>  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
>                                     ^~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>         ^~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: note: each undeclared identifier is reported only once for each function it appears in
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>                            ^~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
>  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
>                                     ^~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>         ^~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_RB0_CNTL__BUF_SWAP__SHIFT'?
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>                            ^~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1066:37: note: in definition of macro 'REG_FIELD_SHIFT'
>  #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
>                                      ^~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>         ^~~~~~~~~~~~~
> 
> Caused by commit
> 
>   a644d85a5cd4 ("drm/amdgpu: add gfx v10 implementation (v10)")
> 
> I have disabled that driver for today.  Please let me know when it is
> fixed so that I can enable it again.

I assume that this has now been inherited by the drm tree (since there
has been no fix).  So the AMD_GPU driver will still be disabled in
linux-next today as of the drm tree merge.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the amdgpu tree

[Alex Deucher]

On Wed, Jun 26, 2019 at 11:35 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Dave,
>
> On Wed, 26 Jun 2019 21:22:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi Alex,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > In file included from drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:25:
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c: In function 'gfx_v10_0_cp_gfx_resume':
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_RB_CNTL__BUF_SWAP_MASK'?
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >                            ^~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
> >  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
> >                                     ^~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >         ^~~~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: note: each undeclared identifier is reported only once for each function it appears in
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >                            ^~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
> >  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
> >                                     ^~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >         ^~~~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_RB0_CNTL__BUF_SWAP__SHIFT'?
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >                            ^~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h:1066:37: note: in definition of macro 'REG_FIELD_SHIFT'
> >  #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
> >                                      ^~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >         ^~~~~~~~~~~~~
> >
> > Caused by commit
> >
> >   a644d85a5cd4 ("drm/amdgpu: add gfx v10 implementation (v10)")
> >
> > I have disabled that driver for today.  Please let me know when it is
> > fixed so that I can enable it again.
>
> I assume that this has now been inherited by the drm tree (since there
> has been no fix).  So the AMD_GPU driver will still be disabled in
> linux-next today as of the drm tree merge.

Fixed in this patch:
https://patchwork.freedesktop.org/patch/314527/?series=62866&rev=1

Alex

>
> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

Hi Alex,

On Thu, 27 Jun 2019 10:18:38 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> Fixed in this patch:
> https://patchwork.freedesktop.org/patch/314527/?series=62866&rev=1

Thanks.  I will manually apply that to the drm tree merge until it is
no longer necessary there.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]