dri-devel May 2022

dri-devel@lists.freedesktop.org

344 participants
736 discussions

[PATCH] drm/amdgpu: fix a missing break in gfx_v11_0_handle_priv_fault
by sunliming 31 May '22

31 May '22

Fixes the following w1 warning: drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:5873:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]. Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: sunliming <sunliming(a)kylinos.cn> --- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c index cb581cfc7464..628d3536938e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c @@ -6028,6 +6028,7 @@ static void gfx_v11_0_handle_priv_fault(struct amdgpu_device *adev, break; default: BUG(); + break; } } -- 2.25.1

2 1

[PATCH] drm/msm: Ensure mmap offset is initialized
by Rob Clark 31 May '22

31 May '22

From: Rob Clark <robdclark(a)chromium.org> If a GEM object is allocated, and then exported as a dma-buf fd which is mmap'd before or without the GEM buffer being directly mmap'd, the vma_node could be unitialized. This leads to a situation where the CPU mapping is not correctly torn down in drm_vma_node_unmap(). Fixes: e5516553999f ("drm: call drm_gem_object_funcs.mmap with fake offset") Signed-off-by: Rob Clark <robdclark(a)chromium.org> --- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 44485363f37a..14ab9a627d8b 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -964,7 +964,7 @@ static const struct drm_driver msm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_mmap = drm_gem_prime_mmap, + .gem_prime_mmap = msm_gem_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init, #endif diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index bb052071b16d..090b8074fec7 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -275,6 +275,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_t void msm_gem_shrinker_init(struct drm_device *dev); void msm_gem_shrinker_cleanup(struct drm_device *dev); +int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj); int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map); void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map); diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c index 94ab705e9b8a..dcc8a573bc76 100644 --- a/drivers/gpu/drm/msm/msm_gem_prime.c +++ b/drivers/gpu/drm/msm/msm_gem_prime.c @@ -11,6 +11,21 @@ #include "msm_drv.h" #include "msm_gem.h" +int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) +{ + int ret; + + /* Ensure the mmap offset is initialized. We lazily initialize it, + * so if it has not been first mmap'd directly as a GEM object, the + * mmap offset will not be already initialized. + */ + ret = drm_gem_create_mmap_offset(obj); + if (ret) + return ret; + + return drm_gem_prime_mmap(obj, vma); +} + struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj = to_msm_bo(obj); -- 2.36.1

2 3

Re: [PATCH 14/14] dt-bindings: mfd: Add Mediatek MT6370 binding documentation
by Krzysztof Kozlowski 31 May '22

31 May '22

On 31/05/2022 12:28, ChiaEn Wu wrote: > From: ChiYuan Huang <cy_huang(a)richtek.com> > > Add Mediatek MT6370 binding documentation. Subject: same as previous patches. > > Signed-off-by: ChiYuan Huang <cy_huang(a)richtek.com> > --- > .../bindings/mfd/mediatek,mt6370.yaml | 282 ++++++++++++++++++ > .../dt-bindings/iio/adc/mediatek,mt6370_adc.h | 18 ++ > include/dt-bindings/mfd/mediatek,mt6370.h | 83 ++++++ > 3 files changed, 383 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml > create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6370_adc.h > create mode 100644 include/dt-bindings/mfd/mediatek,mt6370.h > > diff --git a/Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml b/Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml > new file mode 100644 > index 000000000000..96a12dce0108 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml > @@ -0,0 +1,282 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mfd/mediatek,mt6370.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Mediatek MT6370 SubPMIC > + > +maintainers: > + - ChiYuan Huang <cy_huang(a)richtek.com> > + > +description: | > + MT6370 is a highly-integrated smart power management IC, which includes a > + single cell Li-Ion/Li-Polymer switching battery charger, a USB Type-C & > + Power Delivery (PD) controller, dual flash LED current sources, a RGB LED > + driver, a backlight WLED driver, a display bias driver and a general LDO for > + portable devices. > + > +properties: > + compatible: > + const: mediatek,mt6370 > + > + reg: > + maxItems: 1 > + > + wakeup-source: true > + > + interrupts: > + maxItems: 1 > + > + interrupt-controller: true > + > + '#interrupt-cells': > + const: 1 > + > + adc: > + type: object > + description: | > + List the compatible configurations of MT6370 ADC. This sentence does not make any sense. The "description" field is to describe, explain the meaning behind given property. > + > + properties: > + compatible: > + const: mediatek,mt6370-adc > + > + "#io-channel-cells": > + const: 1 > + > + required: > + - compatible > + - '#io-channel-cells' > + > + backlight: > + type: object > + $ref: /schemas/leds/backlight/mediatek,mt6370-backlight.yaml# > + > + charger: > + type: object > + $ref: /schemas/power/supply/mediatek,mt6370-charger.yaml# > + > + tcpc: > + type: object > + $ref: /schemas/usb/mediatek,mt6370-tcpc.yaml# > + > + indicator: > + type: object > + $ref: /schemas/leds/mediatek,mt6370-indicator.yaml# > + > + flashlight: > + type: object > + $ref: /schemas/leds/mediatek,mt6370-flashlight.yaml# > + > + regulators: > + type: object > + description: | > + List all supported regulators Ditto > + > + patternProperties: > + "^(dsvbst|vibldo)$": > + $ref: /schemas/regulator/regulator.yaml# > + type: object > + unevaluatedProperties: false > + > + "^(dsvpos|dsvneg)$": > + $ref: /schemas/regulator/regulator.yaml# > + type: object > + unevaluatedProperties: false > + > + properties: > + enable-gpio: > + maxItems: 1 > + description: | > + Specify a valid 'enable' gpio for the regulator and it's optional Same comment as your patch #10. > + > +required: > + - compatible > + - reg > + - interrupts > + - interrupt-controller > + - '#interrupt-cells' > + - regulators > + - adc > + - backlight > + - indicator > + - tcpc > + - charger > + - flashlight > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + #include <dt-bindings/leds/common.h> > + #include <dt-bindings/mfd/mediatek,mt6370.h> > + #include <dt-bindings/iio/adc/mediatek,mt6370_adc.h> > + #include <dt-bindings/usb/pd.h> > + i2c { > + #address-cells = <1>; > + #size-cells = <0>; > + > + mt6370@34 { Generic node name, so "pmic". > + compatible = "mediatek,mt6370"; > + reg = <0x34>; > + wakeup-source; > + interrupts-extended = <&gpio26 3 IRQ_TYPE_LEVEL_LOW>; > + interrupt-controller; > + #interrupt-cells = <1>; > + > + mt6370_adc: adc { > + compatible = "mediatek,mt6370-adc"; > + #io-channel-cells = <1>; > + }; > + > + backlight { > + compatible = "mediatek,mt6370-backlight"; > + mediatek,bled-channel-use = /bits/ 8 <15>; > + }; > + > + charger { > + compatible = "mediatek,mt6370-charger"; > + interrupts = <MT6370_IRQ_ATTACH>, <MT6370_IRQ_OVPCTRL_UVP_D>, > + <MT6370_IRQ_CHG_MIVR>; > + interrupt-names = "attach_i", "uvp_d_evt", "mivr"; > + io-channels = <&mt6370_adc MT6370_CHAN_IBUS>; > + > + mt6370_otg_vbus: usb-otg-vbus { > + regulator-compatible = "mt6370,otg-vbus"; > + regulator-name = "usb-otg-vbus"; > + regulator-min-microvolt = <4350000>; > + regulator-max-microvolt = <5800000>; > + regulator-min-microamp = <500000>; > + regulator-max-microamp = <3000000>; > + }; > + }; > + > + indicator { > + compatible = "mediatek,mt6370-indicator"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + multi-led@0 { > + reg = <0>; > + function = LED_FUNCTION_INDICATOR; > + color = <LED_COLOR_ID_RGB>; > + led-max-microamp = <24000>; > + #address-cells = <1>; > + #size-cells = <0>; > + mediatek,soft-start = <3>; > + led@0 { Messed up indentation. > + reg = <0>; > + color = <LED_COLOR_ID_RED>; > + }; > + led@1 { > + reg = <1>; > + color = <LED_COLOR_ID_GREEN>; > + }; > + led@2 { > + reg = <2>; > + color = <LED_COLOR_ID_BLUE>; > + }; > + }; > + led@3 { > + reg = <3>; > + function = LED_FUNCTION_INDICATOR; > + color = <LED_COLOR_ID_WHITE>; > + led-max-microamp = <6000>; > + }; > + }; > + > + flashlight { > + compatible = "mediatek,mt6370-flashlight"; > + #address-cells = <1>; > + #size-cells = <0>; > + led@0 { > + reg = <0>; > + led-sources = <0>; > + function = LED_FUNCTION_FLASH; > + color = <LED_COLOR_ID_WHITE>; > + function-enumerator = <1>; > + led-max-microamp = <200000>; > + flash-max-microamp = <500000>; > + flash-max-timeout-us = <1248000>; > + }; > + led@1 { > + reg = <1>; > + led-sources = <1>; > + function = LED_FUNCTION_FLASH; > + color = <LED_COLOR_ID_WHITE>; > + function-enumerator = <2>; > + led-max-microamp = <200000>; > + flash-max-microamp = <500000>; > + flash-max-timeout-us = <1248000>; > + }; > + }; > + > + tcpc { > + compatible = "mediatek,mt6370-tcpc"; > + interrupts-extended = <&gpio26 4 IRQ_TYPE_LEVEL_LOW>; > + > + connector { > + compatible = "usb-c-connector"; > + label = "USB-C"; > + vbus-supply = <&mt6370_otg_vbus>; > + data-role = "dual"; > + power-role = "dual"; > + try-power-role = "sink"; > + source-pdos = <PDO_FIXED(5000, 1000, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>; > + sink-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>; > + op-sink-microwatt = <10000000>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + endpoint { > + remote-endpoint = <&usb_hs>; > + }; > + }; > + port@1 { > + reg = <1>; > + endpoint { > + remote-endpoint = <&usb_ss>; > + }; > + }; > + port@2 { > + reg = <2>; > + endpoint { > + remote-endpoint = <&dp_aux>; > + }; > + }; > + }; > + }; > + }; > + > + regulators { > + dsvbst { > + regulator-name = "mt6370-dsv-vbst"; > + regulator-min-microvolt = <4000000>; > + regulator-max-microvolt = <6200000>; > + }; > + dsvpos { > + regulator-name = "mt6370-dsv-vpos"; > + regulator-min-microvolt = <4000000>; > + regulator-max-microvolt = <6000000>; > + regulator-boot-on; > + }; > + dsvneg { > + regulator-name = "mt6370-dsv-vneg"; > + regulator-min-microvolt = <4000000>; > + regulator-max-microvolt = <6000000>; > + regulator-boot-on; > + }; > + vibldo { > + regulator-name = "mt6370-vib-ldo"; > + regulator-min-microvolt = <1600000>; > + regulator-max-microvolt = <4000000>; > + }; > + }; > + }; > + }; > diff --git a/include/dt-bindings/iio/adc/mediatek,mt6370_adc.h b/include/dt-bindings/iio/adc/mediatek,mt6370_adc.h > new file mode 100644 > index 000000000000..18ce2fef8f9e > --- /dev/null > +++ b/include/dt-bindings/iio/adc/mediatek,mt6370_adc.h > @@ -0,0 +1,18 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ Same license as bindings, please. > + > +#ifndef __DT_BINDINGS_MEDIATEK_MT6370_ADC_H__ > +#define __DT_BINDINGS_MEDIATEK_MT6370_ADC_H__ > + > +/* ADC Channel Index */ > +#define MT6370_CHAN_VBUSDIV5 0 > +#define MT6370_CHAN_VBUSDIV2 1 > +#define MT6370_CHAN_VSYS 2 > +#define MT6370_CHAN_VBAT 3 > +#define MT6370_CHAN_TS_BAT 4 > +#define MT6370_CHAN_IBUS 5 > +#define MT6370_CHAN_IBAT 6 > +#define MT6370_CHAN_CHG_VDDP 7 > +#define MT6370_CHAN_TEMP_JC 8 > +#define MT6370_CHAN_MAX 9 > + > +#endif > diff --git a/include/dt-bindings/mfd/mediatek,mt6370.h b/include/dt-bindings/mfd/mediatek,mt6370.h > new file mode 100644 > index 000000000000..df641e5d651f > --- /dev/null > +++ b/include/dt-bindings/mfd/mediatek,mt6370.h > @@ -0,0 +1,83 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ Same license as bindings, please. > + > +#ifndef __DT_BINDINGS_MEDIATEK_MT6370_H__ > +#define __DT_BINDINGS_MEDIATEK_MT6370_H__ > + > +/* IRQ definitions */ > +#define MT6370_IRQ_DIRCHGON 0 > +#define MT6370_IRQ_CHG_TREG 4 These should be IDs, so numbers incremented by one. Holes are not accepted. There is no point in encoding actual hardware numbers which are directly passed to implementation. Just pass the number, not define. Therefore remove entire file. > +#define MT6370_IRQ_CHG_AICR 5 > +#define MT6370_IRQ_CHG_MIVR 6 > +#define MT6370_IRQ_PWR_RDY 7 > +#define MT6370_IRQ_FL_CHG_VINOVP 11 Best regards, Krzysztof

1 0

Re: [PATCH 12/14] dt-bindings: leds: Add Mediatek MT6370 flashlight binding documentation
by Krzysztof Kozlowski 31 May '22

31 May '22

On 31/05/2022 12:42, ChiaEn Wu wrote: > From: Alice Chen <alice_chen(a)richtek.com> > Subject - same comment as previous #10 patch. > Add Mediatek MT6370 flashlight binding documentation > > Signed-off-by: Alice Chen <alice_chen(a)richtek.com> > --- > .../leds/mediatek,mt6370-flashlight.yaml | 48 +++++++++++++++++++ > 1 file changed, 48 insertions(+) > create mode 100644 Documentation/devicetree/bindings/leds/mediatek,mt6370-flashlight.yaml > > diff --git a/Documentation/devicetree/bindings/leds/mediatek,mt6370-flashlight.yaml b/Documentation/devicetree/bindings/leds/mediatek,mt6370-flashlight.yaml > new file mode 100644 > index 000000000000..b1b11bd3d410 > --- /dev/null > +++ b/Documentation/devicetree/bindings/leds/mediatek,mt6370-flashlight.yaml > @@ -0,0 +1,48 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/leds/leds-mt6370-flashlight.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Flash LED driver for MT6370 PMIC from MediaTek Integrated. > + > +maintainers: > + - Alice Chen <alice_chen(a)richtek.com> > + > +description: | > + This module is part of the MT6370 MFD device. > + see Documentation/devicetree/bindings/mfd/mt6370.yaml > + Add MT6370 flash LED driver include 2-channel flash LED support Torch/Strobe Mode. > + > +properties: > + compatible: > + const: mediatek,mt6370-flashlight > + > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 0 > + > +patternProperties: > + "^led@[0-1]$": > + type: object > + $ref: common.yaml# > + description: > + Properties for a single flash LED. Same as patch #11. > + > + properties: > + reg: > + description: Index of the flash LED. As well. > + enum: > + - 0 #Address of LED1 > + - 1 #Address of LED2 '#' starts a comment, so there is always a space after '#' > + > + unevaluatedProperties: false > + > +required: > + - compatible > + - "#address-cells" > + - "#size-cells" > + > +additionalProperties: false Best regards, Krzysztof

1 0

Re: [PATCH 11/14] dt-bindings: leds: mt6370: Add Mediatek mt6370 indicator documentation
by Krzysztof Kozlowski 31 May '22

31 May '22

On 31/05/2022 12:42, ChiaEn Wu wrote: > From: ChiYuan Huang <cy_huang(a)richtek.com> > > Add Mediatek mt6370 indicator documentation. > > Signed-off-by: ChiYuan Huang <cy_huang(a)richtek.com> > --- > .../leds/mediatek,mt6370-indicator.yaml | 57 +++++++++++++++++++ > 1 file changed, 57 insertions(+) > create mode 100644 Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml > > diff --git a/Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml b/Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml > new file mode 100644 > index 000000000000..823be3add097 > --- /dev/null > +++ b/Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml > @@ -0,0 +1,57 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/leds/mediatek,mt6370-indicator.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: LED driver for MT6370 PMIC from MediaTek Integrated. > + > +maintainers: > + - Alice Chen <alice_chen(a)richtek.com> > + > +description: | > + This module is part of the MT6370 MFD device. > + see Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml > + Add MT6370 LED driver include 4-channel RGB LED support Register/PWM/Breath Mode > + > +properties: > + compatible: > + const: mediatek,mt6370-indicator > + > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 0 > + > +patternProperties: > + "^(multi-)?led@[0-3]$": > + description: | > + Properties for a single LED. Not useful description. Just skip it, I think schema allows it. > + $ref: common.yaml# > + type: object > + > + properties: > + reg: > + description: | > + Index of the LED. The same, regs are usually not described. > + enum: > + - 0 # LED output ISINK1 > + - 1 # LED output ISINK2 > + - 2 # LED output ISINK3 > + - 3 # LED output ISINK4 > + > + mediatek,soft-start: > + description: | > + soft start step control, support /0.5ms/1ms/1.5ms/2ms. Why here you start sentence lower-case? > + $ref: /schemas/types.yaml#/definitions/uint32 > + enum: [0, 1, 2, 3] This has to be in logical values, so in ms, not in some register values. Use proper unit suffix and enumerate the actual values. > + > + unevaluatedProperties: false > + > +required: > + - compatible > + - "#address-cells" > + - "#size-cells" > + > +additionalProperties: false Best regards, Krzysztof

1 0

[PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
by Haowen Bai 31 May '22

31 May '22

The ctx->hw is dereferencing before null checking, so move it after checking. Signed-off-by: Haowen Bai <baihaowen(a)meizu.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c index bcccce292937..e59680cdd0ce 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c @@ -155,11 +155,13 @@ static void dpu_hw_wb_roi(struct dpu_hw_wb *ctx, struct dpu_hw_wb_cfg *wb) static void dpu_hw_wb_setup_qos_lut(struct dpu_hw_wb *ctx, struct dpu_hw_wb_qos_cfg *cfg) { - struct dpu_hw_blk_reg_map *c = &ctx->hw; + struct dpu_hw_blk_reg_map *c; u32 qos_ctrl = 0; if (!ctx || !cfg) return; + + c = &ctx->hw; DPU_REG_WRITE(c, WB_DANGER_LUT, cfg->danger_lut); DPU_REG_WRITE(c, WB_SAFE_LUT, cfg->safe_lut); -- 2.7.4

5 5

[PATCH 1/2] drm/meson: encoder_cvbs: Fix refcount leak in meson_encoder_cvbs_init
by Miaoqian Lin 31 May '22

31 May '22

of_graph_get_remote_node() returns remote device nodepointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak. Fixes: 318ba02cd8a8 ("drm/meson: encoder_cvbs: switch to bridge with ATTACH_NO_CONNECTOR") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- drivers/gpu/drm/meson/meson_encoder_cvbs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c index fd8db97ba8ba..8110a6e39320 100644 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c @@ -238,6 +238,7 @@ int meson_encoder_cvbs_init(struct meson_drm *priv) } meson_encoder_cvbs->next_bridge = of_drm_find_bridge(remote); + of_node_put(remote); if (!meson_encoder_cvbs->next_bridge) { dev_err(priv->dev, "Failed to find CVBS Connector bridge\n"); return -EPROBE_DEFER; -- 2.25.1

2 3

[PATCH v4 00/13] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping
by Alex Sierra 31 May '22

31 May '22

This is our MEMORY_DEVICE_COHERENT patch series rebased and updated for current 5.18.0 Changes since the last version: - Fixed problems with migration during long-term pinning in get_user_pages - Open coded vm_normal_lru_pages as suggested in previous code review - Update hmm_gup_test with more get_user_pages calls, include hmm_cow_in_device in hmm-test. This patch series introduces MEMORY_DEVICE_COHERENT, a type of memory owned by a device that can be mapped into CPU page tables like MEMORY_DEVICE_GENERIC and can also be migrated like MEMORY_DEVICE_PRIVATE. This patch series is mostly self-contained except for a few places where it needs to update other subsystems to handle the new memory type. System stability and performance are not affected according to our ongoing testing, including xfstests. How it works: The system BIOS advertises the GPU device memory (aka VRAM) as SPM (special purpose memory) in the UEFI system address map. The amdgpu driver registers the memory with devmap as MEMORY_DEVICE_COHERENT using devm_memremap_pages. The initial user for this hardware page migration capability is the Frontier supercomputer project. This functionality is not AMD-specific. We expect other GPU vendors to find this functionality useful, and possibly other hardware types in the future. Our test nodes in the lab are similar to the Frontier configuration, with .5 TB of system memory plus 256 GB of device memory split across 4 GPUs, all in a single coherent address space. Page migration is expected to improve application efficiency significantly. We will report empirical results as they become available. Coherent device type pages at gup are now migrated back to system memory if they are being pinned long-term (FOLL_LONGTERM). The reason is, that long-term pinning would interfere with the device memory manager owning the device-coherent pages (e.g. evictions in TTM). These series incorporate Alistair Popple patches to do this migration from pin_user_pages() calls. hmm_gup_test has been added to hmm-test to test different get user pages calls. This series includes handling of device-managed anonymous pages returned by vm_normal_pages. Although they behave like normal pages for purposes of mapping in CPU page tables and for COW, they do not support LRU lists, NUMA migration or THP. We also introduced a FOLL_LRU flag that adds the same behaviour to follow_page and related APIs, to allow callers to specify that they expect to put pages on an LRU list. v2: - Rebase to latest 5.18-rc7. - Drop patch "mm: add device coherent checker to remove migration pte" and modify try_to_migrate_one, to let DEVICE_COHERENT pages fall through to normal page path. Based on Alistair Popple's comment. - Fix comment formatting. - Reword comment in vm_normal_page about pte_devmap(). - Merge "drm/amdkfd: coherent type as sys mem on migration to ram" to "drm/amdkfd: add SPM support for SVM". v3: - Rebase to latest 5.18.0. - Patch "mm: handling Non-LRU pages returned by vm_normal_pages" reordered. - Add WARN_ON_ONCE for thp device coherent case. v4: - Rebase to latest 5.18.0 - Fix consitency between pages with FOLL_LRU flag set and pte_devmap at follow_page_pte. Alex Sierra (11): mm: add zone device coherent type memory support mm: handling Non-LRU pages returned by vm_normal_pages mm: add device coherent vma selection for memory migration drm/amdkfd: add SPM support for SVM lib: test_hmm add ioctl to get zone device type lib: test_hmm add module param for zone device type lib: add support for device coherent type in test_hmm tools: update hmm-test to support device coherent type tools: update test_hmm script to support SP config tools: add hmm gup tests for device coherent type tools: add selftests to hmm for COW in device memory Alistair Popple (2): mm: remove the vma check in migrate_vma_setup() mm/gup: migrate device coherent pages when pinning instead of failing drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 34 ++- fs/proc/task_mmu.c | 2 +- include/linux/memremap.h | 19 ++ include/linux/migrate.h | 1 + include/linux/mm.h | 3 +- lib/test_hmm.c | 349 +++++++++++++++++------ lib/test_hmm_uapi.h | 22 +- mm/gup.c | 53 +++- mm/huge_memory.c | 2 +- mm/internal.h | 1 + mm/khugepaged.c | 9 +- mm/ksm.c | 6 +- mm/madvise.c | 4 +- mm/memcontrol.c | 7 +- mm/memory-failure.c | 8 +- mm/memory.c | 9 +- mm/mempolicy.c | 2 +- mm/memremap.c | 10 + mm/migrate.c | 4 +- mm/migrate_device.c | 115 ++++++-- mm/mlock.c | 2 +- mm/mprotect.c | 2 +- mm/rmap.c | 5 +- tools/testing/selftests/vm/hmm-tests.c | 308 ++++++++++++++++++-- tools/testing/selftests/vm/test_hmm.sh | 24 +- 25 files changed, 817 insertions(+), 184 deletions(-) -- 2.32.0

3 15

[PATCH] drm/nouveau/fifo/gv100-: set gv100_fifo_runlist storage-class to static
by Tom Rix 31 May '22

31 May '22

sparse reports drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c:56:1: warning: symbol 'gv100_fifo_runlist' was not declared. Should it be static? gv100_fifo_runlist is only used in gv100.c, so change it to static. Signed-off-by: Tom Rix <trix(a)redhat.com> --- drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c index 70e16a91ac12..faf0fe9f704c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c @@ -52,7 +52,7 @@ gv100_fifo_runlist_cgrp(struct nvkm_fifo_cgrp *cgrp, nvkm_wo32(memory, offset + 0xc, 0x00000000); } -const struct gk104_fifo_runlist_func +static const struct gk104_fifo_runlist_func gv100_fifo_runlist = { .size = 16, .cgrp = gv100_fifo_runlist_cgrp, -- 2.27.0

2 1

[PATCH v3] dma-buf: Add a capabilities directory
by Simon Ser 31 May '22

31 May '22

To discover support for new DMA-BUF IOCTLs, user-space has no choice but to try to perform the IOCTL on an existing DMA-BUF. However, user-space may want to figure out whether or not the IOCTL is available before it has a DMA-BUF at hand, e.g. at initialization time in a Wayland compositor. Add a /sys/kernel/dmabuf/caps directory which allows the DMA-BUF subsystem to advertise supported features. Add a sync_file_import_export entry which indicates that importing and exporting sync_files from/to DMA-BUFs is supported. v2: Add missing files lost in a rebase v3: - Create separate file in Documentation/ABI/testing/, add it to MAINTAINERS - Fix kernel version (Daniel) - Remove unnecessary brackets (Jason) - Fix SPDX comment style Signed-off-by: Simon Ser <contact(a)emersion.fr> Reviewed-by: Jason Ekstrand <jason.ekstrand(a)collabora.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> Cc: Christian König <christian.koenig(a)amd.com> Cc: Greg KH <greg(a)kroah.com> --- .../ABI/testing/sysfs-kernel-dmabuf-caps | 13 +++++ MAINTAINERS | 1 + drivers/dma-buf/Makefile | 2 +- drivers/dma-buf/dma-buf-sysfs-caps.c | 51 +++++++++++++++++++ drivers/dma-buf/dma-buf-sysfs-caps.h | 16 ++++++ drivers/dma-buf/dma-buf-sysfs-stats.c | 16 ++---- drivers/dma-buf/dma-buf-sysfs-stats.h | 6 ++- drivers/dma-buf/dma-buf.c | 43 ++++++++++++++-- include/uapi/linux/dma-buf.h | 6 +++ 9 files changed, 134 insertions(+), 20 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-dmabuf-caps create mode 100644 drivers/dma-buf/dma-buf-sysfs-caps.c create mode 100644 drivers/dma-buf/dma-buf-sysfs-caps.h diff --git a/Documentation/ABI/testing/sysfs-kernel-dmabuf-caps b/Documentation/ABI/testing/sysfs-kernel-dmabuf-caps new file mode 100644 index 000000000000..f83af422fd18 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-kernel-dmabuf-caps @@ -0,0 +1,13 @@ +What: /sys/kernel/dmabuf/caps +Date: May 2022 +KernelVersion: v5.20 +Contact: Simon Ser <contact(a)emersion.fr> +Description: This directory advertises DMA-BUF capabilities supported by the + kernel. + +What: /sys/kernel/dmabuf/caps/sync_file_import_export +Date: May 2022 +KernelVersion: v5.20 +Contact: Simon Ser <contact(a)emersion.fr> +Description: This file is read-only and advertises support for importing and + exporting sync_files from/to DMA-BUFs. diff --git a/MAINTAINERS b/MAINTAINERS index 11da16bfa123..8966686f7231 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5871,6 +5871,7 @@ L: dri-devel(a)lists.freedesktop.org L: linaro-mm-sig(a)lists.linaro.org (moderated for non-subscribers) S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc +F: Documentation/ABI/testing/sysfs-kernel-dmabuf-caps F: Documentation/driver-api/dma-buf.rst F: drivers/dma-buf/ F: include/linux/*fence.h diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile index 4c9eb53ba3f8..afc874272710 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ - dma-resv.o + dma-resv.o dma-buf-sysfs-caps.o obj-$(CONFIG_DMABUF_HEAPS) += dma-heap.o obj-$(CONFIG_DMABUF_HEAPS) += heaps/ obj-$(CONFIG_SYNC_FILE) += sync_file.o diff --git a/drivers/dma-buf/dma-buf-sysfs-caps.c b/drivers/dma-buf/dma-buf-sysfs-caps.c new file mode 100644 index 000000000000..82b91eb874a9 --- /dev/null +++ b/drivers/dma-buf/dma-buf-sysfs-caps.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * DMA-BUF sysfs capabilities. + * + * Copyright (C) 2022 Simon Ser + */ + +#include <linux/kobject.h> +#include <linux/sysfs.h> + +#include "dma-buf-sysfs-caps.h" + +static ssize_t sync_file_import_export_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sysfs_emit(buf, "1\n"); +} + +static struct kobj_attribute dma_buf_sync_file_import_export_attr = + __ATTR_RO(sync_file_import_export); + +static struct attribute *dma_buf_caps_attrs[] = { + &dma_buf_sync_file_import_export_attr.attr, + NULL, +}; + +static const struct attribute_group dma_buf_caps_attr_group = { + .attrs = dma_buf_caps_attrs, +}; + +static struct kobject *dma_buf_caps_kobj; + +int dma_buf_init_sysfs_capabilities(struct kset *kset) +{ + int ret; + + dma_buf_caps_kobj = kobject_create_and_add("caps", &kset->kobj); + if (!dma_buf_caps_kobj) + return -ENOMEM; + + ret = sysfs_create_group(dma_buf_caps_kobj, &dma_buf_caps_attr_group); + if (ret) + kobject_put(dma_buf_caps_kobj); + return ret; +} + +void dma_buf_uninit_sysfs_capabilities(void) +{ + kobject_put(dma_buf_caps_kobj); +} diff --git a/drivers/dma-buf/dma-buf-sysfs-caps.h b/drivers/dma-buf/dma-buf-sysfs-caps.h new file mode 100644 index 000000000000..d7bcef490b31 --- /dev/null +++ b/drivers/dma-buf/dma-buf-sysfs-caps.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * DMA-BUF sysfs capabilities. + * + * Copyright (C) 2022 Simon Ser + */ + +#ifndef _DMA_BUF_SYSFS_CAPS_H +#define _DMA_BUF_SYSFS_CAPS_H + +struct kset; + +int dma_buf_init_sysfs_capabilities(struct kset *kset); +void dma_buf_uninit_sysfs_capabilities(void); + +#endif // _DMA_BUF_SYSFS_CAPS_H diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.c b/drivers/dma-buf/dma-buf-sysfs-stats.c index 2bba0babcb62..e2e62f83ce18 100644 --- a/drivers/dma-buf/dma-buf-sysfs-stats.c +++ b/drivers/dma-buf/dma-buf-sysfs-stats.c @@ -141,23 +141,14 @@ static const struct kset_uevent_ops dmabuf_sysfs_no_uevent_ops = { .filter = dmabuf_sysfs_uevent_filter, }; -static struct kset *dma_buf_stats_kset; static struct kset *dma_buf_per_buffer_stats_kset; -int dma_buf_init_sysfs_statistics(void) +int dma_buf_init_sysfs_statistics(struct kset *kset) { - dma_buf_stats_kset = kset_create_and_add("dmabuf", - &dmabuf_sysfs_no_uevent_ops, - kernel_kobj); - if (!dma_buf_stats_kset) - return -ENOMEM; - dma_buf_per_buffer_stats_kset = kset_create_and_add("buffers", &dmabuf_sysfs_no_uevent_ops, - &dma_buf_stats_kset->kobj); - if (!dma_buf_per_buffer_stats_kset) { - kset_unregister(dma_buf_stats_kset); + &kset->kobj); + if (!dma_buf_per_buffer_stats_kset) return -ENOMEM; - } return 0; } @@ -165,7 +156,6 @@ int dma_buf_init_sysfs_statistics(void) void dma_buf_uninit_sysfs_statistics(void) { kset_unregister(dma_buf_per_buffer_stats_kset); - kset_unregister(dma_buf_stats_kset); } int dma_buf_stats_setup(struct dma_buf *dmabuf) diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.h b/drivers/dma-buf/dma-buf-sysfs-stats.h index a49c6e2650cc..798c54fb8ee3 100644 --- a/drivers/dma-buf/dma-buf-sysfs-stats.h +++ b/drivers/dma-buf/dma-buf-sysfs-stats.h @@ -8,9 +8,11 @@ #ifndef _DMA_BUF_SYSFS_STATS_H #define _DMA_BUF_SYSFS_STATS_H +struct kset; + #ifdef CONFIG_DMABUF_SYSFS_STATS -int dma_buf_init_sysfs_statistics(void); +int dma_buf_init_sysfs_statistics(struct kset *kset); void dma_buf_uninit_sysfs_statistics(void); int dma_buf_stats_setup(struct dma_buf *dmabuf); @@ -18,7 +20,7 @@ int dma_buf_stats_setup(struct dma_buf *dmabuf); void dma_buf_stats_teardown(struct dma_buf *dmabuf); #else -static inline int dma_buf_init_sysfs_statistics(void) +static inline int dma_buf_init_sysfs_statistics(struct kset *kset) { return 0; } diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 5e1b0534b3ce..b5c5a5050508 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -30,6 +30,7 @@ #include <uapi/linux/dma-buf.h> #include <uapi/linux/magic.h> +#include "dma-buf-sysfs-caps.h" #include "dma-buf-sysfs-stats.h" static inline int is_dma_buf_file(struct file *); @@ -1546,22 +1547,54 @@ static inline void dma_buf_uninit_debugfs(void) } #endif +/* Capabilities and statistics files do not need to send uevents. */ +static int dmabuf_sysfs_uevent_filter(struct kobject *kobj) +{ + return 0; +} + +static const struct kset_uevent_ops dmabuf_sysfs_no_uevent_ops = { + .filter = dmabuf_sysfs_uevent_filter, +}; + +static struct kset *dma_buf_kset; + static int __init dma_buf_init(void) { int ret; - ret = dma_buf_init_sysfs_statistics(); + dma_buf_kset = kset_create_and_add("dmabuf", + &dmabuf_sysfs_no_uevent_ops, + kernel_kobj); + if (!dma_buf_kset) + return -ENOMEM; + + ret = dma_buf_init_sysfs_capabilities(dma_buf_kset); if (ret) - return ret; + goto err_kset; + + ret = dma_buf_init_sysfs_statistics(dma_buf_kset); + if (ret) + goto err_sysfs_caps; dma_buf_mnt = kern_mount(&dma_buf_fs_type); - if (IS_ERR(dma_buf_mnt)) - return PTR_ERR(dma_buf_mnt); + if (IS_ERR(dma_buf_mnt)) { + ret = PTR_ERR(dma_buf_mnt); + goto err_sysfs_stats; + } mutex_init(&db_list.lock); INIT_LIST_HEAD(&db_list.head); dma_buf_init_debugfs(); return 0; + +err_sysfs_stats: + dma_buf_uninit_sysfs_statistics(); +err_sysfs_caps: + dma_buf_uninit_sysfs_capabilities(); +err_kset: + kset_unregister(dma_buf_kset); + return ret; } subsys_initcall(dma_buf_init); @@ -1570,5 +1603,7 @@ static void __exit dma_buf_deinit(void) dma_buf_uninit_debugfs(); kern_unmount(dma_buf_mnt); dma_buf_uninit_sysfs_statistics(); + dma_buf_uninit_sysfs_capabilities(); + kset_unregister(dma_buf_kset); } __exitcall(dma_buf_deinit); diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index 70e213a0d7d9..ab3afd5da75a 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -114,6 +114,9 @@ struct dma_buf_sync { * ordering via these fences, it is the respnosibility of userspace to use * locks or other mechanisms to ensure that no other context adds fences or * submits work between steps 1 and 3 above. + * + * Userspace can check the availability of this API via + * /sys/kernel/dmabuf/caps/sync_file_import_export. */ struct dma_buf_export_sync_file { /** @@ -146,6 +149,9 @@ struct dma_buf_export_sync_file { * synchronized APIs such as Vulkan to inter-op with dma-buf consumers * which expect implicit synchronization such as OpenGL or most media * drivers/video. + * + * Userspace can check the availability of this API via + * /sys/kernel/dmabuf/caps/sync_file_import_export. */ struct dma_buf_import_sync_file { /** -- 2.36.1

4 7

← Newer
1
...
11
12
13
14
15
16
17
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2022