dri-devel September 2019

dri-devel@lists.freedesktop.org

315 participants
2278 discussions

[PATCH 0/6] drm/nouveau: Preparatory work for GV11B support
by Thierry Reding 20 Sep '19

20 Sep '19

From: Thierry Reding <treding(a)nvidia.com> Hi Ben, these are a couple of patches that are in preparation for adding GV11B support. The fundamental issue that these are trying to solve is that the GV11B is the first Tegra incarnation of the GPU where the aperture really matters. All prior generations would accept any of them. For dGPUs we usually allocate memory in VRAM, so the default aperture (0) is correct. However, on Tegra the buffers are allocated in system memory, and since the GPU actually cares about the aperture, we need to ensure that the aperture field is written in all the necessary places. This series of patches does three things: the first two patches make it easier to debug aperture related faults by actually reading the aperture information from the fault information registers. The second patch is actually only a small cleanup. Patches 3-5 unify the aperture values. All generations have the same definitions for these, so there's little use in separating them out into callbacks. Finally, patch 6 writes the aperture field in the places where required. I've used these patches to test my initial support for GV11B. This is enough to get me through the driver probe without any faults, but I have not made much progress on secboot support yet, so I can't use the GV11B to do anything very interesting yet. I should also note that this is completely untested on dGPU because I don't currently have a way of testing them. I'm working on that, but in the meantime it'd be great if somebody could give this set a quick spin on a dGPU to confirm that these don't break. Thierry Thierry Reding (6): drm/nouveau: fault: Store aperture in fault information drm/nouveau: fault: Widen engine field drm/nouveau: Remove bogus gk20a aperture callback drm/nouveau: Implement nvkm_memory_aperture() drm/nouveau: Remove unused nvkm_vmm_func->aper() implementations drm/nouveau: Program aperture field where necessary .../drm/nouveau/include/nvkm/core/memory.h | 28 +++++++++++++++++++ .../drm/nouveau/include/nvkm/subdev/fault.h | 1 + .../gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 3 +- .../nouveau/nvkm/engine/fifo/gpfifogk104.c | 7 +++-- .../nouveau/nvkm/engine/fifo/gpfifogv100.c | 5 ++-- .../gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 7 ++++- .../gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 3 +- .../gpu/drm/nouveau/nvkm/subdev/fault/gv100.c | 3 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 3 -- .../drm/nouveau/nvkm/subdev/mmu/vmmgf100.c | 21 ++------------ .../drm/nouveau/nvkm/subdev/mmu/vmmgk104.c | 2 -- .../drm/nouveau/nvkm/subdev/mmu/vmmgk20a.c | 12 -------- .../drm/nouveau/nvkm/subdev/mmu/vmmgm200.c | 2 -- .../drm/nouveau/nvkm/subdev/mmu/vmmgm20b.c | 2 -- .../drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 8 ++---- .../drm/nouveau/nvkm/subdev/mmu/vmmgp10b.c | 1 - .../drm/nouveau/nvkm/subdev/mmu/vmmgv100.c | 1 - .../drm/nouveau/nvkm/subdev/mmu/vmmtu102.c | 1 - 18 files changed, 55 insertions(+), 55 deletions(-) -- 2.23.0

2 13

[PATCH] drm: tweak drm_print_bits()
by Gerd Hoffmann 20 Sep '19

20 Sep '19

There is little reason for the from/to logic, printing a subset of the bits can be done by simply shifting/masking value if needed. Also use for_each_set_bit(). Suggested-by: Jani Nikula <jani.nikula(a)linux.intel.com> Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- include/drm/drm_print.h | 5 ++--- drivers/gpu/drm/drm_gem_ttm_helper.c | 4 ++-- drivers/gpu/drm/drm_print.c | 20 +++++++++----------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 12d4916254b4..5b9947d157f4 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -89,9 +89,8 @@ __printf(2, 3) void drm_printf(struct drm_printer *p, const char *f, ...); void drm_puts(struct drm_printer *p, const char *str); void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset); -void drm_print_bits(struct drm_printer *p, - unsigned long value, const char *bits[], - unsigned int from, unsigned int to); +void drm_print_bits(struct drm_printer *p, unsigned long value, + const char * const bits[], int nbits); __printf(2, 0) /** diff --git a/drivers/gpu/drm/drm_gem_ttm_helper.c b/drivers/gpu/drm/drm_gem_ttm_helper.c index 9a4bafcf20df..a534104d8bee 100644 --- a/drivers/gpu/drm/drm_gem_ttm_helper.c +++ b/drivers/gpu/drm/drm_gem_ttm_helper.c @@ -23,7 +23,7 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent, const struct drm_gem_object *gem) { - static const char const *plname[] = { + static const char * const plname[] = { [ TTM_PL_SYSTEM ] = "system", [ TTM_PL_TT ] = "tt", [ TTM_PL_VRAM ] = "vram", @@ -40,7 +40,7 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent, const struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gem); drm_printf_indent(p, indent, "placement="); - drm_print_bits(p, bo->mem.placement, plname, 0, ARRAY_SIZE(plname)); + drm_print_bits(p, bo->mem.placement, plname, ARRAY_SIZE(plname)); drm_printf(p, "\n"); if (bo->mem.bus.is_iomem) { diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index dfa27367ebb8..a495fe3ad909 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -189,28 +189,26 @@ EXPORT_SYMBOL(drm_printf); * drm_print_bits - print bits to a &drm_printer stream * * Print bits (in flag fields for example) in human readable form. - * The first name in the @bits array is for the bit indexed by @from. * * @p: the &drm_printer * @value: field value. * @bits: Array with bit names. - * @from: start of bit range to print (inclusive). - * @to: end of bit range to print (exclusive). + * @nbits: Size of bit names array. */ -void drm_print_bits(struct drm_printer *p, - unsigned long value, const char *bits[], - unsigned int from, unsigned int to) +void drm_print_bits(struct drm_printer *p, unsigned long value, + const char * const bits[], int nbits) { bool first = true; unsigned int i; - for (i = from; i < to; i++) { - if (!(value & (1 << i))) - continue; - if (WARN_ON_ONCE(!bits[i-from])) + if (WARN_ON_ONCE(nbits > sizeof(unsigned long) * 8)) + nbits = sizeof(unsigned long) * 8; + + for_each_set_bit(i, &value, nbits) { + if (WARN_ON_ONCE(!bits[i])) continue; drm_printf(p, "%s%s", first ? "" : ",", - bits[i-from]); + bits[i]); first = false; } if (first) -- 2.18.1

3 2

[PATCH 3.16 053/132] PCI: Reset Lenovo ThinkPad P50 nvgpu at boot if necessary
by Ben Hutchings 20 Sep '19

20 Sep '19

3.16.74-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Lyude Paul <lyude(a)redhat.com> commit e0547c81bfcfad01cbbfa93a5e66bb98ab932f80 upstream. On ThinkPad P50 SKUs with an Nvidia Quadro M1000M instead of the M2000M variant, the BIOS does not always reset the secondary Nvidia GPU during reboot if the laptop is configured in Hybrid Graphics mode. The reason is unknown, but the following steps and possibly a good bit of patience will reproduce the issue: 1. Boot up the laptop normally in Hybrid Graphics mode 2. Make sure nouveau is loaded and that the GPU is awake 3. Allow the Nvidia GPU to runtime suspend itself after being idle 4. Reboot the machine, the more sudden the better (e.g. sysrq-b may help) 5. If nouveau loads up properly, reboot the machine again and go back to step 2 until you reproduce the issue This results in some very strange behavior: the GPU will be left in exactly the same state it was in when the previously booted kernel started the reboot. This has all sorts of bad side effects: for starters, this completely breaks nouveau starting with a mysterious EVO channel failure that happens well before we've actually used the EVO channel for anything: nouveau 0000:01:00.0: disp: chid 0 mthd 0000 data 00000400 00001000 00000002 This causes a timeout trying to bring up the GR ctx: nouveau 0000:01:00.0: timeout WARNING: CPU: 0 PID: 12 at drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c:1547 gf100_grctx_generate+0x7b2/0x850 [nouveau] Hardware name: LENOVO 20EQS64N0B/20EQS64N0B, BIOS N1EET82W (1.55 ) 12/18/2018 Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] ... nouveau 0000:01:00.0: gr: wait for idle timeout (en: 1, ctxsw: 0, busy: 1) nouveau 0000:01:00.0: gr: wait for idle timeout (en: 1, ctxsw: 0, busy: 1) nouveau 0000:01:00.0: fifo: fault 01 [WRITE] at 0000000000008000 engine 00 [GR] client 15 [HUB/SCC_NB] reason c4 [] on channel -1 [0000000000 unknown] The GPU never manages to recover. Booting without loading nouveau causes issues as well, since the GPU starts sending spurious interrupts that cause other device's IRQs to get disabled by the kernel: irq 16: nobody cared (try booting with the "irqpoll" option) ... handlers: [<000000007faa9e99>] i801_isr [i2c_i801] Disabling IRQ #16 ... serio: RMI4 PS/2 pass-through port at rmi4-00.fn03 i801_smbus 0000:00:1f.4: Timeout waiting for interrupt! i801_smbus 0000:00:1f.4: Transaction timeout rmi4_f03 rmi4-00.fn03: rmi_f03_pt_write: Failed to write to F03 TX register (-110). i801_smbus 0000:00:1f.4: Timeout waiting for interrupt! i801_smbus 0000:00:1f.4: Transaction timeout rmi4_physical rmi4-00: rmi_driver_set_irq_bits: Failed to change enabled interrupts! This causes the touchpad and sometimes other things to get disabled. Since this happens without nouveau, we can't fix this problem from nouveau itself. Add a PCI quirk for the specific P50 variant of this GPU. Make sure the GPU is advertising NoReset- so we don't reset the GPU when the machine is in Dedicated graphics mode (where the GPU being initialized by the BIOS is normal and expected). Map the GPU MMIO space and read the magic 0x2240c register, which will have bit 1 set if the device was POSTed during a previous boot. Once we've confirmed all of this, reset the GPU and re-disable it - bringing it back to a healthy state. Link: https://bugzilla.kernel.org/show_bug.cgi?id=203003 Link: https://lore.kernel.org/lkml/20190212220230.1568-1-lyude@redhat.com Signed-off-by: Lyude Paul <lyude(a)redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> Cc: nouveau(a)lists.freedesktop.org Cc: dri-devel(a)lists.freedesktop.org Cc: Karol Herbst <kherbst(a)redhat.com> Cc: Ben Skeggs <skeggsb(a)gmail.com> [bwh: Backported to 3.16: - Use dev_{err,info}() instead of pci_{err,info}() - Adjust context] Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk> --- drivers/pci/quirks.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3900,3 +3900,61 @@ void pci_dev_specific_enable_acs(struct } } } + +/* + * On Lenovo Thinkpad P50 SKUs with a Nvidia Quadro M1000M, the BIOS does + * not always reset the secondary Nvidia GPU between reboots if the system + * is configured to use Hybrid Graphics mode. This results in the GPU + * being left in whatever state it was in during the *previous* boot, which + * causes spurious interrupts from the GPU, which in turn causes us to + * disable the wrong IRQ and end up breaking the touchpad. Unsurprisingly, + * this also completely breaks nouveau. + * + * Luckily, it seems a simple reset of the Nvidia GPU brings it back to a + * clean state and fixes all these issues. + * + * When the machine is configured in Dedicated display mode, the issue + * doesn't occur. Fortunately the GPU advertises NoReset+ when in this + * mode, so we can detect that and avoid resetting it. + */ +static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev) +{ + void __iomem *map; + int ret; + + if (pdev->subsystem_vendor != PCI_VENDOR_ID_LENOVO || + pdev->subsystem_device != 0x222e || + !pdev->reset_fn) + return; + + if (pci_enable_device_mem(pdev)) + return; + + /* + * Based on nvkm_device_ctor() in + * drivers/gpu/drm/nouveau/nvkm/engine/device/base.c + */ + map = pci_iomap(pdev, 0, 0x23000); + if (!map) { + dev_err(&pdev->dev, "Can't map MMIO space\n"); + goto out_disable; + } + + /* + * Make sure the GPU looks like it's been POSTed before resetting + * it. + */ + if (ioread32(map + 0x2240c) & 0x2) { + dev_info(&pdev->dev, FW_BUG "GPU left initialized by EFI, resetting\n"); + ret = pci_reset_function(pdev); + if (ret < 0) + dev_err(&pdev->dev, "Failed to reset GPU: %d\n", ret); + } + + iounmap(map); +out_disable: + pci_disable_device(pdev); +} +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, 0x13b1, + PCI_CLASS_DISPLAY_VGA, 8, + quirk_reset_lenovo_thinkpad_p50_nvgpu);

1 0

Re: [PATCH -next] treewide: remove unused argument in lock_release()
by Will Deacon 20 Sep '19

20 Sep '19

On Fri, Sep 20, 2019 at 08:50:36AM -0400, Qian Cai wrote: > On Fri, 2019-09-20 at 10:38 +0100, Will Deacon wrote: > > On Thu, Sep 19, 2019 at 12:09:40PM -0400, Qian Cai wrote: > > > Since the commit b4adfe8e05f1 ("locking/lockdep: Remove unused argument > > > in __lock_release"), @nested is no longer used in lock_release(), so > > > remove it from all lock_release() calls and friends. > > > > > > Signed-off-by: Qian Cai <cai(a)lca.pw> > > > --- > > > > Although this looks fine to me at a first glance, it might be slightly > > easier to manage if you hit {spin,rwlock,seqcount,mutex,rwsem}_release() > > first with coccinelle scripts, and then hack lock_release() as a final > > patch. That way it's easy to regenerate things if needed. > > I am not sure if it worth the extra efforts where I have to retest it on all > architectures, and the patch is really simple, but I can certainly do that if > you insist. I'm not insisting, just thought it might be easier to get it merged that way. If you prefer to go with the big diff, Acked-by: Will Deacon <will(a)kernel.org> Will

1 0

[PATCH v7 0/4] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 20 Sep '19

20 Sep '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. The dependent change on hdmi-codec.c https://patchwork.kernel.org/patch/11047447 has been picked up by Mark Brown in ASoC tree for-5.4 branch. Changes from v6 to v7: 1. rockchip_max98090: Use phandle of HDMI from DTS to find codec_dai. With this we don't need to set fixed id for the created hdmi-audio-codec device. Cheng-Yi Chiang (4): drm: bridge: dw-hdmi: Report connector status using callback ASoC: rockchip-max98090: Add description for rockchip,hdmi-codec ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip_max98090: Add HDMI jack support .../bindings/sound/rockchip-max98090.txt | 2 + .../boot/dts/rk3288-veyron-analog-audio.dtsi | 1 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 ++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 ++++- include/drm/bridge/dw_hdmi.h | 4 + sound/soc/rockchip/Kconfig | 3 +- sound/soc/rockchip/rockchip_max98090.c | 149 ++++++++++++++---- 7 files changed, 182 insertions(+), 29 deletions(-) -- 2.23.0.237.gc6a4ce50a0-goog

3 6

status of the " CRTC background color" series
by Jean-Jacques Hiblot 20 Sep '19

20 Sep '19

Hi all, Any update on this series ? Last time I looked, everything looked ready and waiting to be merged. JJ

1 0

[PATCH v2] drm/bridge: analogix-anx78xx: add support for 7808 addresses
by Brian Masney 20 Sep '19

20 Sep '19

According to the downstream Android sources, the anx7808 variants use address 0x78 for TX_P0 and the anx781x variants use address 0x70. Since the datasheets aren't available for these devices, and we only have the downstream kernel sources to look at, let's assume that these addresses are fixed based on the model, and pass the i2c addresses to the data pointer in the driver's of_match_table. Signed-off-by: Brian Masney <masneyb(a)onstation.org> --- V1 of this patch with some discussion: https://lore.kernel.org/lkml/20190815004854.19860-6-masneyb@onstation.org/ drivers/gpu/drm/bridge/analogix-anx78xx.c | 36 +++++++++++++++-------- drivers/gpu/drm/bridge/analogix-anx78xx.h | 7 ----- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c index 48adf010816c..e25fae36dbe1 100644 --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c @@ -38,12 +38,20 @@ #define AUX_CH_BUFFER_SIZE 16 #define AUX_WAIT_TIMEOUT_MS 15 -static const u8 anx78xx_i2c_addresses[] = { - [I2C_IDX_TX_P0] = TX_P0, - [I2C_IDX_TX_P1] = TX_P1, - [I2C_IDX_TX_P2] = TX_P2, - [I2C_IDX_RX_P0] = RX_P0, - [I2C_IDX_RX_P1] = RX_P1, +static const u8 anx7808_i2c_addresses[] = { + [I2C_IDX_TX_P0] = 0x78, + [I2C_IDX_TX_P1] = 0x7a, + [I2C_IDX_TX_P2] = 0x72, + [I2C_IDX_RX_P0] = 0x7e, + [I2C_IDX_RX_P1] = 0x80, +}; + +static const u8 anx781x_i2c_addresses[] = { + [I2C_IDX_TX_P0] = 0x70, + [I2C_IDX_TX_P1] = 0x7a, + [I2C_IDX_TX_P2] = 0x72, + [I2C_IDX_RX_P0] = 0x7e, + [I2C_IDX_RX_P1] = 0x80, }; struct anx78xx_platform_data { @@ -1348,6 +1356,7 @@ static int anx78xx_i2c_probe(struct i2c_client *client, struct anx78xx *anx78xx; struct anx78xx_platform_data *pdata; unsigned int i, idl, idh, version; + const u8 *i2c_addresses; bool found = false; int err; @@ -1387,15 +1396,16 @@ static int anx78xx_i2c_probe(struct i2c_client *client, } /* Map slave addresses of ANX7814 */ + i2c_addresses = device_get_match_data(&client->dev); for (i = 0; i < I2C_NUM_ADDRESSES; i++) { struct i2c_client *i2c_dummy; i2c_dummy = i2c_new_dummy_device(client->adapter, - anx78xx_i2c_addresses[i] >> 1); + i2c_addresses[i] >> 1); if (IS_ERR(i2c_dummy)) { err = PTR_ERR(i2c_dummy); DRM_ERROR("Failed to reserve I2C bus %02x: %d\n", - anx78xx_i2c_addresses[i], err); + i2c_addresses[i], err); goto err_unregister_i2c; } @@ -1405,7 +1415,7 @@ static int anx78xx_i2c_probe(struct i2c_client *client, if (IS_ERR(anx78xx->map[i])) { err = PTR_ERR(anx78xx->map[i]); DRM_ERROR("Failed regmap initialization %02x\n", - anx78xx_i2c_addresses[i]); + i2c_addresses[i]); goto err_unregister_i2c; } } @@ -1504,10 +1514,10 @@ MODULE_DEVICE_TABLE(i2c, anx78xx_id); #if IS_ENABLED(CONFIG_OF) static const struct of_device_id anx78xx_match_table[] = { - { .compatible = "analogix,anx7808", }, - { .compatible = "analogix,anx7812", }, - { .compatible = "analogix,anx7814", }, - { .compatible = "analogix,anx7818", }, + { .compatible = "analogix,anx7808", .data = anx7808_i2c_addresses }, + { .compatible = "analogix,anx7812", .data = anx781x_i2c_addresses }, + { .compatible = "analogix,anx7814", .data = anx781x_i2c_addresses }, + { .compatible = "analogix,anx7818", .data = anx781x_i2c_addresses }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, anx78xx_match_table); diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.h b/drivers/gpu/drm/bridge/analogix-anx78xx.h index 25e063bcecbc..8697647709f7 100644 --- a/drivers/gpu/drm/bridge/analogix-anx78xx.h +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.h @@ -6,13 +6,6 @@ #ifndef __ANX78xx_H #define __ANX78xx_H -#define TX_P0 0x70 -#define TX_P1 0x7a -#define TX_P2 0x72 - -#define RX_P0 0x7e -#define RX_P1 0x80 - /***************************************************************/ /* Register definition of device address 0x7e */ /***************************************************************/ -- 2.21.0

2 3

[PATCH 0/9] drm/print: add and use drm_debug_enabled()
by Jani Nikula 20 Sep '19

20 Sep '19

Hi all, just a little refactoring around drm_debug access to abstract it better. There shouldn't be any functional changes. I'd appreciate acks for merging the lot via drm-misc. If there are any objections to that, we'll need to postpone the last patch until everything has been merged and converted in drm-next. BR, Jani. Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Christian König <christian.koenig(a)amd.com> Cc: David (ChunMing) Zhou <David1.Zhou(a)amd.com> Cc: amd-gfx(a)lists.freedesktop.org Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: nouveau(a)lists.freedesktop.org Cc: Rob Clark <robdclark(a)gmail.com> Cc: Sean Paul <sean(a)poorly.run> Cc: linux-arm-msm(a)vger.kernel.org Cc: freedreno(a)lists.freedesktop.org Cc: Francisco Jerez <currojerez(a)riseup.net> Cc: Lucas Stach <l.stach(a)pengutronix.de> Cc: Russell King <linux+etnaviv(a)armlinux.org.uk> Cc: Christian Gmeiner <christian.gmeiner(a)gmail.com> Cc: etnaviv(a)lists.freedesktop.org Jani Nikula (9): drm/print: move drm_debug variable to drm_print.[ch] drm/print: add drm_debug_enabled() drm/etnaviv: use drm_debug_enabled() to check for debug categories drm/i2c/sil164: use drm_debug_enabled() to check for debug categories drm/i915: use drm_debug_enabled() to check for debug categories drm/msm: use drm_debug_enabled() to check for debug categories drm/nouveau: use drm_debug_enabled() to check for debug categories drm/amdgpu: use drm_debug_enabled() to check for debug categories drm/print: rename drm_debug to __drm_debug to discourage use drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 ++-- drivers/gpu/drm/drm_atomic_uapi.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 6 ++--- drivers/gpu/drm/drm_drv.c | 17 --------------- drivers/gpu/drm/drm_edid.c | 2 +- drivers/gpu/drm/drm_edid_load.c | 2 +- drivers/gpu/drm/drm_mipi_dbi.c | 4 ++-- drivers/gpu/drm/drm_print.c | 23 ++++++++++++++++++-- drivers/gpu/drm/drm_vblank.c | 6 ++--- drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +++---- drivers/gpu/drm/i2c/sil164_drv.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem.h | 2 +- drivers/gpu/drm/i915/i915_utils.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++-- drivers/gpu/drm/nouveau/dispnv50/disp.h | 4 ++-- drivers/gpu/drm/nouveau/nouveau_drv.h | 4 ++-- include/drm/drm_drv.h | 2 -- include/drm/drm_print.h | 8 +++++++ 22 files changed, 60 insertions(+), 52 deletions(-) -- 2.20.1

4 16

[radeon-alex:amd-mainline-dkms-5.0 3711/3724] drivers/gpu//drm/ttm/ttm_bo_vm.c:137:44: error: 'struct vm_fault' has no member named 'virtual_address'
by kbuild test robot 20 Sep '19

20 Sep '19

Hi Flora, FYI, the error/warning still remains. tree: git://people.freedesktop.org/~agd5f/linux.git amd-mainline-dkms-5.0 head: a51a5ad4b8daf0dd0a437d51a19c2baa98953675 commit: 5165cd1453625e59650a1ed9b0f269b41529e421 [3711/3724] Revert "Revert "drm/amd/autoconf: Test whether vm_fault->{address/vma} is available"" config: i386-allyesconfig (attached as .config) compiler: gcc-7 (Debian 7.4.0-13) 7.4.0 reproduce: git checkout 5165cd1453625e59650a1ed9b0f269b41529e421 # save the attached .config to linux build tree make ARCH=i386 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): from <command-line>:0: include/linux/sched/mm.h:234:20: note: previous definition of 'memalloc_nofs_restore' was here static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu//drm/ttm/backport/backport.h:11:0, from <command-line>:0: include/kcl/kcl_mm.h:61:21: error: redefinition of 'kvmalloc' static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/linux/scatterlist.h:8:0, from include/linux/dma-mapping.h:11, from include/drm/drmP.h:37, from include/kcl/kcl_drm.h:6, from drivers/gpu//drm/ttm/backport/backport.h:6, from <command-line>:0: include/linux/mm.h:602:21: note: previous definition of 'kvmalloc' was here static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu//drm/ttm/backport/backport.h:11:0, from <command-line>:0: include/kcl/kcl_mm.h:71:21: error: redefinition of 'kvzalloc' static inline void *kvzalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/linux/scatterlist.h:8:0, from include/linux/dma-mapping.h:11, from include/drm/drmP.h:37, from include/kcl/kcl_drm.h:6, from drivers/gpu//drm/ttm/backport/backport.h:6, from <command-line>:0: include/linux/mm.h:610:21: note: previous definition of 'kvzalloc' was here static inline void *kvzalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu//drm/ttm/backport/backport.h:11:0, from <command-line>:0: include/kcl/kcl_mm.h:81:20: error: static declaration of 'kvfree' follows non-static declaration static inline void kvfree(const void *addr) ^~~~~~ In file included from include/linux/scatterlist.h:8:0, from include/linux/dma-mapping.h:11, from include/drm/drmP.h:37, from include/kcl/kcl_drm.h:6, from drivers/gpu//drm/ttm/backport/backport.h:6, from <command-line>:0: include/linux/mm.h:630:13: note: previous declaration of 'kvfree' was here extern void kvfree(const void *addr); ^~~~~~ In file included from drivers/gpu//drm/ttm/backport/backport.h:11:0, from <command-line>:0: include/kcl/kcl_mm.h:101:21: error: redefinition of 'kvmalloc_array' static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) ^~~~~~~~~~~~~~ In file included from include/linux/scatterlist.h:8:0, from include/linux/dma-mapping.h:11, from include/drm/drmP.h:37, from include/kcl/kcl_drm.h:6, from drivers/gpu//drm/ttm/backport/backport.h:6, from <command-line>:0: include/linux/mm.h:615:21: note: previous definition of 'kvmalloc_array' was here static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) ^~~~~~~~~~~~~~ In file included from drivers/gpu//drm/ttm/backport/backport.h:11:0, from <command-line>:0: include/kcl/kcl_mm.h:114:21: error: redefinition of 'kvcalloc' static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) ^~~~~~~~ In file included from include/linux/scatterlist.h:8:0, from include/linux/dma-mapping.h:11, from include/drm/drmP.h:37, from include/kcl/kcl_drm.h:6, from drivers/gpu//drm/ttm/backport/backport.h:6, from <command-line>:0: include/linux/mm.h:625:21: note: previous definition of 'kvcalloc' was here static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu//drm/ttm/backport/backport.h:11:0, from <command-line>:0: include/kcl/kcl_mm.h:121:20: error: redefinition of 'mmgrab' static inline void mmgrab(struct mm_struct *mm) ^~~~~~ In file included from include/kcl/kcl_mm.h:6:0, from drivers/gpu//drm/ttm/backport/backport.h:11, from <command-line>:0: include/linux/sched/mm.h:34:20: note: previous definition of 'mmgrab' was here static inline void mmgrab(struct mm_struct *mm) ^~~~~~ In file included from drivers/gpu//drm/ttm/backport/backport.h:12:0, from <command-line>:0: include/kcl/kcl_list.h:6:20: error: redefinition of 'list_bulk_move_tail' static inline void list_bulk_move_tail(struct list_head *head, ^~~~~~~~~~~~~~~~~~~ In file included from include/linux/preempt.h:11:0, from include/linux/rcupdate.h:40, from include/kcl/kcl_rcupdate.h:4, from include/kcl/kcl_fence.h:5, from drivers/gpu//drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/list.h:195:20: note: previous definition of 'list_bulk_move_tail' was here static inline void list_bulk_move_tail(struct list_head *head, ^~~~~~~~~~~~~~~~~~~ drivers/gpu//drm/ttm/ttm_bo_vm.c: In function 'ttm_bo_vm_fault': >> drivers/gpu//drm/ttm/ttm_bo_vm.c:137:44: error: 'struct vm_fault' has no member named 'virtual_address' unsigned long address = (unsigned long)vmf->virtual_address; ^~ cc1: some warnings being treated as errors vim +137 drivers/gpu//drm/ttm/ttm_bo_vm.c cbe12e74ee4e29 Thomas Hellstrom 2013-10-09 104 c67fa6edc8b11a Tan Xiaojun 2017-12-25 105 static unsigned long ttm_bo_io_mem_pfn(struct ttm_buffer_object *bo, c67fa6edc8b11a Tan Xiaojun 2017-12-25 106 unsigned long page_offset) c67fa6edc8b11a Tan Xiaojun 2017-12-25 107 { c67fa6edc8b11a Tan Xiaojun 2017-12-25 108 struct ttm_bo_device *bdev = bo->bdev; c67fa6edc8b11a Tan Xiaojun 2017-12-25 109 c67fa6edc8b11a Tan Xiaojun 2017-12-25 110 if (bdev->driver->io_mem_pfn) c67fa6edc8b11a Tan Xiaojun 2017-12-25 111 return bdev->driver->io_mem_pfn(bo, page_offset); c67fa6edc8b11a Tan Xiaojun 2017-12-25 112 e83bf4adf54ad3 Tan Xiaojun 2017-12-25 113 return ((bo->mem.bus.base + bo->mem.bus.offset) >> PAGE_SHIFT) e83bf4adf54ad3 Tan Xiaojun 2017-12-25 114 + page_offset; c67fa6edc8b11a Tan Xiaojun 2017-12-25 115 } d37fb8b746a5e8 Anatoli Antonovitch 2019-06-26 116 #if defined(HAVE_2ARGS_VIRTUAL_MM_FAULT_FUNCTION) 1eb7eed2b3f8a5 Evan Quan 2017-05-12 117 static vm_fault_t ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 1eb7eed2b3f8a5 Evan Quan 2017-05-12 118 #else 4daa4fba3a3899 Souptick Joarder 2018-06-02 119 static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf) 1eb7eed2b3f8a5 Evan Quan 2017-05-12 120 #endif ba4e7d973dd09b Thomas Hellstrom 2009-06-10 121 { fadbbdd244af97 Flora Cui 2019-09-06 122 #if !defined(HAVE_2ARGS_VIRTUAL_MM_FAULT_FUNCTION) 11bac80004499e Dave Jiang 2017-02-24 123 struct vm_area_struct *vma = vmf->vma; 1eb7eed2b3f8a5 Evan Quan 2017-05-12 124 #endif ba4e7d973dd09b Thomas Hellstrom 2009-06-10 125 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) ba4e7d973dd09b Thomas Hellstrom 2009-06-10 126 vma->vm_private_data; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 127 struct ttm_bo_device *bdev = bo->bdev; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 128 unsigned long page_offset; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 129 unsigned long page_last; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 130 unsigned long pfn; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 131 struct ttm_tt *ttm = NULL; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 132 struct page *page; 4daa4fba3a3899 Souptick Joarder 2018-06-02 133 int err; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 134 int i; 4daa4fba3a3899 Souptick Joarder 2018-06-02 135 vm_fault_t ret = VM_FAULT_NOPAGE; 5165cd1453625e Flora Cui 2019-09-11 136 #ifndef HAVE_VM_FAULT_ADDRESS_VMA 1eb7eed2b3f8a5 Evan Quan 2017-05-12 @137 unsigned long address = (unsigned long)vmf->virtual_address; 1eb7eed2b3f8a5 Evan Quan 2017-05-12 138 #else 1a29d85eb0f19b Jan Kara 2016-12-14 139 unsigned long address = vmf->address; 1eb7eed2b3f8a5 Evan Quan 2017-05-12 140 #endif eba67093f53532 Thomas Hellstrom 2010-11-11 141 struct ttm_mem_type_manager *man = eba67093f53532 Thomas Hellstrom 2010-11-11 142 &bdev->man[bo->mem.mem_type]; 3943875e7b73fd Thomas Hellstrom 2013-11-06 143 struct vm_area_struct cvma; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 144 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 145 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 146 * Work around locking order reversal in fault / nopfn ba4e7d973dd09b Thomas Hellstrom 2009-06-10 147 * between mmap_sem and bo_reserve: Perform a trylock operation c58f009e01c918 Thomas Hellstrom 2013-11-14 148 * for reserve, and if it fails, retry the fault after waiting c58f009e01c918 Thomas Hellstrom 2013-11-14 149 * for the buffer to become unreserved. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 150 */ 1bebc270578bf8 Evan Quan 2019-02-18 151 if (unlikely(!kcl_reservation_object_trylock(bo->resv))) { c58f009e01c918 Thomas Hellstrom 2013-11-14 152 if (vmf->flags & FAULT_FLAG_ALLOW_RETRY) { e6b6346419c9f5 Chengming Gui 2019-08-28 153 #ifdef FAULT_FLAG_RETRY_NOWAIT c58f009e01c918 Thomas Hellstrom 2013-11-14 154 if (!(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) { 8129fdad387ae3 Thomas Zimmermann 2018-06-21 155 ttm_bo_get(bo); 9bd71d59838222 changzhu 2018-09-30 156 up_read(&vma->vm_mm->mmap_sem); c58f009e01c918 Thomas Hellstrom 2013-11-14 157 (void) ttm_bo_wait_unreserved(bo); f44907593d746d Thomas Zimmermann 2018-06-21 158 ttm_bo_put(bo); c58f009e01c918 Thomas Hellstrom 2013-11-14 159 } 1eb7eed2b3f8a5 Evan Quan 2017-05-12 160 #else 1eb7eed2b3f8a5 Evan Quan 2017-05-12 161 up_read(&vma->vm_mm->mmap_sem); 1eb7eed2b3f8a5 Evan Quan 2017-05-12 162 #endif c58f009e01c918 Thomas Hellstrom 2013-11-14 163 c58f009e01c918 Thomas Hellstrom 2013-11-14 164 return VM_FAULT_RETRY; c58f009e01c918 Thomas Hellstrom 2013-11-14 165 } c58f009e01c918 Thomas Hellstrom 2013-11-14 166 c58f009e01c918 Thomas Hellstrom 2013-11-14 167 /* c58f009e01c918 Thomas Hellstrom 2013-11-14 168 * If we'd want to change locking order to c58f009e01c918 Thomas Hellstrom 2013-11-14 169 * mmap_sem -> bo::reserve, we'd use a blocking reserve here c58f009e01c918 Thomas Hellstrom 2013-11-14 170 * instead of retrying the fault... c58f009e01c918 Thomas Hellstrom 2013-11-14 171 */ ba4e7d973dd09b Thomas Hellstrom 2009-06-10 172 return VM_FAULT_NOPAGE; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 173 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 174 667a50db0477d4 Thomas Hellstrom 2014-01-03 175 /* 667a50db0477d4 Thomas Hellstrom 2014-01-03 176 * Refuse to fault imported pages. This should be handled 667a50db0477d4 Thomas Hellstrom 2014-01-03 177 * (if at all) by redirecting mmap to the exporter. 667a50db0477d4 Thomas Hellstrom 2014-01-03 178 */ 667a50db0477d4 Thomas Hellstrom 2014-01-03 179 if (bo->ttm && (bo->ttm->page_flags & TTM_PAGE_FLAG_SG)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 180 ret = VM_FAULT_SIGBUS; 667a50db0477d4 Thomas Hellstrom 2014-01-03 181 goto out_unlock; 667a50db0477d4 Thomas Hellstrom 2014-01-03 182 } 667a50db0477d4 Thomas Hellstrom 2014-01-03 183 82c5da6bf8b55a Jerome Glisse 2010-04-09 184 if (bdev->driver->fault_reserve_notify) { 5d50fcbda7b0ac Christian König 2019-01-11 185 struct dma_fence *moving = dma_fence_get(bo->moving); 5d50fcbda7b0ac Christian König 2019-01-11 186 4daa4fba3a3899 Souptick Joarder 2018-06-02 187 err = bdev->driver->fault_reserve_notify(bo); 4daa4fba3a3899 Souptick Joarder 2018-06-02 188 switch (err) { 82c5da6bf8b55a Jerome Glisse 2010-04-09 189 case 0: 82c5da6bf8b55a Jerome Glisse 2010-04-09 190 break; 82c5da6bf8b55a Jerome Glisse 2010-04-09 191 case -EBUSY: 82c5da6bf8b55a Jerome Glisse 2010-04-09 192 case -ERESTARTSYS: de8dfb8e3449c7 Tom St Denis 2018-01-26 193 ret = VM_FAULT_NOPAGE; 82c5da6bf8b55a Jerome Glisse 2010-04-09 194 goto out_unlock; 82c5da6bf8b55a Jerome Glisse 2010-04-09 195 default: de8dfb8e3449c7 Tom St Denis 2018-01-26 196 ret = VM_FAULT_SIGBUS; 82c5da6bf8b55a Jerome Glisse 2010-04-09 197 goto out_unlock; 82c5da6bf8b55a Jerome Glisse 2010-04-09 198 } 5d50fcbda7b0ac Christian König 2019-01-11 199 5d50fcbda7b0ac Christian König 2019-01-11 200 if (bo->moving != moving) { 5d50fcbda7b0ac Christian König 2019-01-11 201 spin_lock(&bdev->glob->lru_lock); 5d50fcbda7b0ac Christian König 2019-01-11 202 ttm_bo_move_to_lru_tail(bo, NULL); 5d50fcbda7b0ac Christian König 2019-01-11 203 spin_unlock(&bdev->glob->lru_lock); 5d50fcbda7b0ac Christian König 2019-01-11 204 } 5d50fcbda7b0ac Christian König 2019-01-11 205 dma_fence_put(moving); 82c5da6bf8b55a Jerome Glisse 2010-04-09 206 } e024e11070a0a0 Dave Airlie 2009-06-24 207 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 208 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 209 * Wait for buffer data in transit, due to a pipelined ba4e7d973dd09b Thomas Hellstrom 2009-06-10 210 * move. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 211 */ 1eb7eed2b3f8a5 Evan Quan 2017-05-12 212 ret = ttm_bo_vm_fault_idle(bo, vma, vmf); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 213 if (unlikely(ret != 0)) { e6b6346419c9f5 Chengming Gui 2019-08-28 214 #ifdef FAULT_FLAG_RETRY_NOWAIT de8dfb8e3449c7 Tom St Denis 2018-01-26 215 if (ret == VM_FAULT_RETRY && 3089c1df10e293 Nicolai Hähnle 2017-02-18 216 !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) { 1eb7eed2b3f8a5 Evan Quan 2017-05-12 217 #else 1eb7eed2b3f8a5 Evan Quan 2017-05-12 218 if (ret == VM_FAULT_RETRY) { 1eb7eed2b3f8a5 Evan Quan 2017-05-12 219 #endif 3089c1df10e293 Nicolai Hähnle 2017-02-18 220 /* The BO has already been unreserved. */ de8dfb8e3449c7 Tom St Denis 2018-01-26 221 return ret; 3089c1df10e293 Nicolai Hähnle 2017-02-18 222 } 3089c1df10e293 Nicolai Hähnle 2017-02-18 223 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 224 goto out_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 225 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 226 4daa4fba3a3899 Souptick Joarder 2018-06-02 227 err = ttm_mem_io_lock(man, true); 4daa4fba3a3899 Souptick Joarder 2018-06-02 228 if (unlikely(err != 0)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 229 ret = VM_FAULT_NOPAGE; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 230 goto out_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 231 } 4daa4fba3a3899 Souptick Joarder 2018-06-02 232 err = ttm_mem_io_reserve_vm(bo); 4daa4fba3a3899 Souptick Joarder 2018-06-02 233 if (unlikely(err != 0)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 234 ret = VM_FAULT_SIGBUS; eba67093f53532 Thomas Hellstrom 2010-11-11 235 goto out_io_unlock; eba67093f53532 Thomas Hellstrom 2010-11-11 236 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 237 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 238 page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) + d386735588c3e2 Thomas Hellstrom 2013-12-08 239 vma->vm_pgoff - drm_vma_node_start(&bo->vma_node); d386735588c3e2 Thomas Hellstrom 2013-12-08 240 page_last = vma_pages(vma) + vma->vm_pgoff - d386735588c3e2 Thomas Hellstrom 2013-12-08 241 drm_vma_node_start(&bo->vma_node); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 242 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 243 if (unlikely(page_offset >= bo->num_pages)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 244 ret = VM_FAULT_SIGBUS; eba67093f53532 Thomas Hellstrom 2010-11-11 245 goto out_io_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 246 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 247 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 248 /* 3943875e7b73fd Thomas Hellstrom 2013-11-06 249 * Make a local vma copy to modify the page_prot member 3943875e7b73fd Thomas Hellstrom 2013-11-06 250 * and vm_flags if necessary. The vma parameter is protected 3943875e7b73fd Thomas Hellstrom 2013-11-06 251 * by mmap_sem in write mode. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 252 */ 3943875e7b73fd Thomas Hellstrom 2013-11-06 253 cvma = *vma; 3943875e7b73fd Thomas Hellstrom 2013-11-06 254 cvma.vm_page_prot = vm_get_page_prot(cvma.vm_flags); 3943875e7b73fd Thomas Hellstrom 2013-11-06 255 82c5da6bf8b55a Jerome Glisse 2010-04-09 256 if (bo->mem.bus.is_iomem) { 3943875e7b73fd Thomas Hellstrom 2013-11-06 257 cvma.vm_page_prot = ttm_io_prot(bo->mem.placement, 3943875e7b73fd Thomas Hellstrom 2013-11-06 258 cvma.vm_page_prot); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 259 } else { d0cef9fa4411eb Roger He 2017-12-21 260 struct ttm_operation_ctx ctx = { d0cef9fa4411eb Roger He 2017-12-21 261 .interruptible = false, aa7662b67bf6f5 Roger He 2018-01-17 262 .no_wait_gpu = false, aa7662b67bf6f5 Roger He 2018-01-17 263 .flags = TTM_OPT_FLAG_FORCE_ALLOC aa7662b67bf6f5 Roger He 2018-01-17 264 d0cef9fa4411eb Roger He 2017-12-21 265 }; d0cef9fa4411eb Roger He 2017-12-21 266 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 267 ttm = bo->ttm; 3943875e7b73fd Thomas Hellstrom 2013-11-06 268 cvma.vm_page_prot = ttm_io_prot(bo->mem.placement, 3943875e7b73fd Thomas Hellstrom 2013-11-06 269 cvma.vm_page_prot); b1e5f172325547 Jerome Glisse 2011-11-02 270 b1e5f172325547 Jerome Glisse 2011-11-02 271 /* Allocate all page at once, most common usage */ 25893a14c938d5 Christian König 2018-02-01 272 if (ttm_tt_populate(ttm, &ctx)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 273 ret = VM_FAULT_OOM; b1e5f172325547 Jerome Glisse 2011-11-02 274 goto out_io_unlock; b1e5f172325547 Jerome Glisse 2011-11-02 275 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 276 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 277 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 278 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 279 * Speculatively prefault a number of pages. Only error on ba4e7d973dd09b Thomas Hellstrom 2009-06-10 280 * first page. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 281 */ ba4e7d973dd09b Thomas Hellstrom 2009-06-10 282 for (i = 0; i < TTM_BO_VM_NUM_PREFAULT; ++i) { 95cf9264d5f36c Tom Lendacky 2017-07-17 283 if (bo->mem.bus.is_iomem) { 18e2e6b7e2735e Anatoli Antonovitch 2019-06-28 284 #ifdef pgprot_decrypted 95cf9264d5f36c Tom Lendacky 2017-07-17 285 /* Iomem should not be marked encrypted */ 95cf9264d5f36c Tom Lendacky 2017-07-17 286 cvma.vm_page_prot = pgprot_decrypted(cvma.vm_page_prot); 1eb7eed2b3f8a5 Evan Quan 2017-05-12 287 #endif c67fa6edc8b11a Tan Xiaojun 2017-12-25 288 pfn = ttm_bo_io_mem_pfn(bo, page_offset); 95cf9264d5f36c Tom Lendacky 2017-07-17 289 } else { b1e5f172325547 Jerome Glisse 2011-11-02 290 page = ttm->pages[page_offset]; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 291 if (unlikely(!page && i == 0)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 292 ret = VM_FAULT_OOM; eba67093f53532 Thomas Hellstrom 2010-11-11 293 goto out_io_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 294 } else if (unlikely(!page)) { ba4e7d973dd09b Thomas Hellstrom 2009-06-10 295 break; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 296 } 58aa6622d32af7 Thomas Hellstrom 2014-01-03 297 page->index = drm_vma_node_start(&bo->vma_node) + 58aa6622d32af7 Thomas Hellstrom 2014-01-03 298 page_offset; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 299 pfn = page_to_pfn(page); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 300 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 301 7dfe8b6187f43d Thomas Hellstrom 2014-01-03 302 if (vma->vm_flags & VM_MIXEDMAP) 1eb7eed2b3f8a5 Evan Quan 2017-05-12 303 ret = vmf_insert_mixed(&cvma, address, bb02f27489fe44 Junwei Zhang 2018-08-22 304 __pfn_to_pfn_t(pfn, PFN_DEV | (bo->ssg_can_map ? PFN_MAP : 0))); 7dfe8b6187f43d Thomas Hellstrom 2014-01-03 305 else 4daa4fba3a3899 Souptick Joarder 2018-06-02 306 ret = vmf_insert_pfn(&cvma, address, pfn); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 307 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 308 * Somebody beat us to this PTE or prefaulting to ba4e7d973dd09b Thomas Hellstrom 2009-06-10 309 * an already populated PTE, or prefaulting error. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 310 */ ba4e7d973dd09b Thomas Hellstrom 2009-06-10 311 4daa4fba3a3899 Souptick Joarder 2018-06-02 312 if (unlikely((ret == VM_FAULT_NOPAGE && i > 0))) ba4e7d973dd09b Thomas Hellstrom 2009-06-10 313 break; 4daa4fba3a3899 Souptick Joarder 2018-06-02 314 else if (unlikely(ret & VM_FAULT_ERROR)) eba67093f53532 Thomas Hellstrom 2010-11-11 315 goto out_io_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 316 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 317 address += PAGE_SIZE; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 318 if (unlikely(++page_offset >= page_last)) ba4e7d973dd09b Thomas Hellstrom 2009-06-10 319 break; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 320 } de8dfb8e3449c7 Tom St Denis 2018-01-26 321 ret = VM_FAULT_NOPAGE; eba67093f53532 Thomas Hellstrom 2010-11-11 322 out_io_unlock: eba67093f53532 Thomas Hellstrom 2010-11-11 323 ttm_mem_io_unlock(man); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 324 out_unlock: 1bebc270578bf8 Evan Quan 2019-02-18 325 kcl_reservation_object_unlock(bo->resv); de8dfb8e3449c7 Tom St Denis 2018-01-26 326 return ret; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 327 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 328 :::::: The code at line 137 was first introduced by commit :::::: 1eb7eed2b3f8a53b8f348b415501f1ba07cc383c drm/amdkcl: [4.11] fix for uapi/linux/sched/types.h :::::: TO: Evan Quan <evan.quan(a)amd.com> :::::: CC: tianci yin <tianci.yin(a)amd.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[PATCH v5 0/2] drm: bridge: Add NWL MIPI DSI host controller support
by Guido Günther 20 Sep '19

20 Sep '19

This adds initial support for the NWL MIPI DSI host controller found on i.MX8 SoCs. It adds support for the i.MX8MQ but the same IP core can also be found on e.g. i.MX8QXP. I added the necessary hooks to support other imx8 variants but since I only have imx8mq boards to test I omitted the platform data for other SoCs. The code is based on NXPs BSP so I added Robert Chiras as Co-authored-by. The most notable changes over the BSP driver are - Calculate HS mode timing from phy_configure_opts_mipi_dphy - Perform all clock setup via DT - Merge nwl-imx and nwl drivers - Add B0 silion revision quirk - become a bridge driver to hook into mxsfb (from what I read[0] DCSS, which also can drive the nwl on the imx8mq will likely not become part of imx-display-subsystem so it makes sense to make it drive a bridge for dsi as well). - Use panel_bridge to attach the panel - Use multiplex framework instead of accessing syscon directly This has been tested on a Librem 5 devkit using mxsfb with Robert's patches[1] and the rocktech-jh057n00900 panel driver on next-20190807. The DCSS can later on also act as input source too. Changes from v4: - Collect Reviewed-by: from Rob Herring, thanks! https://lists.freedesktop.org/archives/dri-devel/2019-September/233979.html - Spotted by kbuild test robot <lkp(a)intel.com> https://lists.freedesktop.org/archives/dri-devel/2019-September/233860.html https://lists.freedesktop.org/archives/dri-devel/2019-September/233863.html - fix format string for size_t - Use DIV64_U64_ROUND_UP to fix build on 32 bit architectures We can't use simple shift sind d and n are similar in size and we need full precision - Fix debug cfg_t_post debug print out - Avoid PSEC_PER_SEC - Move timeout / overflow handling out of nwl_dsi_finish_transmission, it would never end up being reported since the call to the function was guarded by flags. - Drop 'support for' from KConfig title to make it match the other drivers in that submenu Changes from v3: - Per review comments by Robert Chiras https://lists.freedesktop.org/archives/dri-devel/2019-August/232580.html - Add Robert's {Signed-off,Tested}-by: - Respect number of lanes when calculting bandwidth limits - Drop duplicate NWL_DSI_ENABLE_MULT_PKTS setup - Per testing by Rober Chiras https://lists.freedesktop.org/archives/dri-devel/2019-August/233688.html - Drop duplicate (and too early) drm_bridge_add() in nwl_dir_probe() that made mxsfb fail to connect to the bridge since the panel_bridge was not up yet. drm_bridge_add() happens in nwl_dsi_host_attach() where after the panel_bridge was set up. - Per review comments by Rob Herring on bindings https://lists.freedesktop.org/archives/dri-devel/2019-August/233196.html - drop description from power-domains and resets - allow BSD 2 clause license as well - make ports more specific - add #address-cells, #size-cells as required - use additionalProperties - panel is of type object Changes from v2: - Per review comments by Rob Herring https://lists.freedesktop.org/archives/dri-devel/2019-August/230448.html - bindings: - Simplify by restricting to fsl,imx8mq-nwl-dsi - document reset lines - add port@{0,1} - use a real compatible string for the panel - resets are required - Per review comments by Arnd Bergmann https://lists.freedesktop.org/archives/dri-devel/2019-August/230868.html - Don't access iomuxc_gpr regs directly. This allows us to drop the first patch in the series with the iomuxc_gpr field defines. - Per review comments by Laurent Pinchart Fix wording in bindings - Add mux-controls to bindings - Don't print error message on dphy probe deferral Changes from v1: - Per review comments by Sam Ravnborg https://lists.freedesktop.org/archives/dri-devel/2019-July/228130.html - Change binding docs to YAML - build: Don't always visit imx-nwl/ - build: Add header-test-y - Sort headers according to DRM convention - Use drm_display_mode instead of videmode - Per review comments by Fabio Estevam https://lists.freedesktop.org/archives/dri-devel/2019-July/228299.html - Don't restrict build to ARCH_MXC - Drop unused includes - Drop unreachable code in imx_nwl_dsi_bridge_mode_fixup() - Drop remaining calls of dev_err() and use DRM_DEV_ERR() consistently. - Use devm_platform_ioremap_resource() - Drop devm_free_irq() in probe() error path - Use single line comments where sufficient - Use <linux/time64.h> instead of defining USEC_PER_SEC - Make input source select imx8 specific - Drop <asm/unaligned.h> inclusion (after removal of get_unaligned_le32) - Drop all EXPORT_SYMBOL_GPL() for functions used in the same module but different source files. - Drop nwl_dsi_enable_{rx,tx}_clock() by invoking clk_prepare_enable() directly - Remove pointless comment - Laurent Pinchart https://lists.freedesktop.org/archives/dri-devel/2019-July/228313.html https://lists.freedesktop.org/archives/dri-devel/2019-July/228308.html - Drop (on iMX8MQ) unused csr regmap - Use NWL_MAX_PLATFORM_CLOCKS everywhere - Drop get_unaligned_le32() usage - remove duplicate 'for the' in binding docs - Don't include unused <linux/clk-provider.h> - Don't include unused <linux/component.h> - Drop dpms_mode for tracking state, trust the drm layer on that - Use pm_runtime_put() instead of pm_runtime_put_sync() - Don't overwrite encoder type - Make imx_nwl_platform_data const - Use the reset controller API instead of open coding that platform specific part - Use <linux/bitfield.h> intead of making up our own defines - name mipi_dsi_transfer less generic: nwl_dsi_transfer - ensure clean in .remove by calling mipi_dsi_host_unregister. - prefix constants by NWL_DSI_ - properly format transfer_direction enum - simplify platform clock handling - Don't modify state in mode_fixup() and use mode_set() instead - Drop bridge detach(), already handle by nwl_dsi_host_detach() - Drop USE_*_QUIRK() macros - Drop (for now) unused clock defnitions. 'pixel' and 'bypass' clock will be used for i.MX8 SoCs but since they're unused atm drop the definitions - but keep the logic to enable/disable several clocks in place since we know we'll need it in the future. Changes from v0: - Add quirk for IMQ8MQ silicon B0 revision to not mess with the system reset controller on power down since enable() won't work otherwise. - Drop devm_free_irq() handled by the device driver core - Disable tx esc clock after the phy power down to unbreak disable/enable (unblank/blank) - Add ports to dt binding docs - Select GENERIC_PHY_MIPI_DPHY instead of GENERIC_PHY for phy_mipi_dphy_get_default_config - Select DRM_MIPI_DSI - Include drm_print.h to fix build on next-20190408 - Drop some debugging messages - Newline terminate all DRM_ printouts - Turn component driver into a drm bridge [0]: https://lists.freedesktop.org/archives/dri-devel/2019-May/219484.html [1]: https://patchwork.freedesktop.org/series/62822/ Guido Günther (2): dt-bindings: display/bridge: Add binding for NWL mipi dsi host controller drm/bridge: Add NWL MIPI DSI host controller support .../bindings/display/bridge/nwl-dsi.yaml | 176 +++++ drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/nwl-dsi/Kconfig | 16 + drivers/gpu/drm/bridge/nwl-dsi/Makefile | 4 + drivers/gpu/drm/bridge/nwl-dsi/nwl-drv.c | 499 +++++++++++++ drivers/gpu/drm/bridge/nwl-dsi/nwl-drv.h | 65 ++ drivers/gpu/drm/bridge/nwl-dsi/nwl-dsi.c | 696 ++++++++++++++++++ drivers/gpu/drm/bridge/nwl-dsi/nwl-dsi.h | 112 +++ 9 files changed, 1571 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml create mode 100644 drivers/gpu/drm/bridge/nwl-dsi/Kconfig create mode 100644 drivers/gpu/drm/bridge/nwl-dsi/Makefile create mode 100644 drivers/gpu/drm/bridge/nwl-dsi/nwl-drv.c create mode 100644 drivers/gpu/drm/bridge/nwl-dsi/nwl-drv.h create mode 100644 drivers/gpu/drm/bridge/nwl-dsi/nwl-dsi.c create mode 100644 drivers/gpu/drm/bridge/nwl-dsi/nwl-dsi.h -- 2.23.0.rc1

2 7

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2019