dri-devel June 2022

dri-devel@lists.freedesktop.org

332 participants
697 discussions

[PATCH] drm/amdgpu/display: fix build when CONFIG_DEBUG_FS is not set
by Alex Deucher 15 Jun '22

15 Jun '22

amdgpu_dm_crtc_late_register is only used when CONFIG_DEBUG_FS so make it dependent on that. Fixes: 4cd79f614b50 ("drm/amd/display: Move connector debugfs to drm") Cc: Bhanuprakash Modem <bhanuprakash.modem(a)intel.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Arun R Murthy <arun.r.murthy(a)intel.com> Cc: Jani Nikula <jani.nikula(a)intel.com> Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Reported-by: Nathan Chancellor <nathan(a)kernel.org> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Tested-by: Nathan Chancellor <nathan(a)kernel.org> # build Link: https://lists.freedesktop.org/archives/dri-devel/2022-June/359496.html --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index c9004f7e700d..33cd7a3d4ecb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6594,12 +6594,14 @@ dm_crtc_duplicate_state(struct drm_crtc *crtc) return &state->base; } +#ifdef CONFIG_DEBUG_FS static int amdgpu_dm_crtc_late_register(struct drm_crtc *crtc) { crtc_debugfs_init(crtc); return 0; } +#endif static inline int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable) { @@ -6693,7 +6695,9 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { .enable_vblank = dm_enable_vblank, .disable_vblank = dm_disable_vblank, .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, +#if defined(CONFIG_DEBUG_FS) .late_register = amdgpu_dm_crtc_late_register, +#endif }; static enum drm_connector_status -- 2.35.3

2 1

[pull] amdgpu drm-fixes-5.19
by Alex Deucher 15 Jun '22

15 Jun '22

Hi Dave, Daniel, Fixes for 5.19. The following changes since commit 1f192b9e8d8a5c619b33a868fb1af063af65ce5d: Merge tag 'drm-misc-fixes-2022-06-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2022-06-10 13:29:22 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.19-2022-06-15 for you to fetch changes up to 4fd17f2ac0aa4e48823ac2ede5b050fb70300bf4: drm/amd/display: Cap OLED brightness per max frame-average luminance (2022-06-14 13:11:11 -0400) ---------------------------------------------------------------- amd-drm-fixes-5.19-2022-06-15: amdgpu: - Fix regression in GTT size reporting - OLED backlight fix ---------------------------------------------------------------- Michel Dänzer (1): drm/amdgpu: Fix GTT size reporting in amdgpu_ioctl Roman Li (1): drm/amd/display: Cap OLED brightness per max frame-average luminance drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 -- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-)

1 0

[PATCH] drm/dp/mst: Read the extended DPCD capabilities during system resume
by Imre Deak 15 Jun '22

15 Jun '22

The WD22TB4 Thunderbolt dock at least will revert its DP_MAX_LINK_RATE from HBR3 to HBR2 after system suspend/resume if the DP_DP13_DPCD_REV registers are not read subsequently also as required. Fix this by reading DP_DP13_DPCD_REV registers as well, matching what is done during connector detection. While at it also fix up the same call in drm_dp_mst_dump_topology(). Cc: Lyude Paul <lyude(a)redhat.com> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5292 Signed-off-by: Imre Deak <imre.deak(a)intel.com> --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 67b3b9697da7f..18f2b6075b780 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3860,9 +3860,7 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, if (!mgr->mst_primary) goto out_fail; - ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, mgr->dpcd, - DP_RECEIVER_CAP_SIZE); - if (ret != DP_RECEIVER_CAP_SIZE) { + if (drm_dp_read_dpcd_caps(mgr->aux, mgr->dpcd) < 0) { drm_dbg_kms(mgr->dev, "dpcd read failed - undocked during suspend?\n"); goto out_fail; } @@ -4911,8 +4909,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m, u8 buf[DP_PAYLOAD_TABLE_SIZE]; int ret; - ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, buf, DP_RECEIVER_CAP_SIZE); - if (ret) { + if (drm_dp_read_dpcd_caps(mgr->aux, buf) < 0) { seq_printf(m, "dpcd read failed\n"); goto out; } -- 2.30.2

3 5

[PATCH 0/8] drm: Clean up drm_crtc.h
by Ville Syrjala 15 Jun '22

15 Jun '22

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Eliminate unnecessary includes from drm_crtc.h to avoid pointless rebuilds of the entire universe when touching some random header. I didn't really feel like splitting this up per-driver since that would have ended up being metric ton of one liners. I'm thinking the conflicts (if any) should be trivial enough to deal with even with bigger patches. Also the cc list would have been massive so didn't do it. Hopefully enough people actually read dri-devel... Ville Syrjälä (8): drm: Drop drm_edid.h from drm_crtc.h drm: Drop drm_framebuffer.h from drm_crtc.h drm: Drop drm_blend.h from drm_crtc.h drm: Drop drm_connector.h from drm_crtc.h drm: Remove unnecessary junk from drm_crtc.h drm: Remove linux/fb.h from drm_crtc.h drm: Remove linux/media-bus-format.h from drm_crtc.h drm: Remove linux/i2c.h from drm_crtc.h drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 1 + .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 1 + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 + .../drm/arm/display/komeda/komeda_pipeline.c | 2 ++ .../gpu/drm/arm/display/komeda/komeda_plane.c | 1 + .../arm/display/komeda/komeda_wb_connector.c | 1 + drivers/gpu/drm/arm/hdlcd_crtc.c | 1 + drivers/gpu/drm/arm/malidp_crtc.c | 1 + drivers/gpu/drm/arm/malidp_mw.c | 2 ++ drivers/gpu/drm/arm/malidp_planes.c | 2 ++ drivers/gpu/drm/armada/armada_510.c | 1 + drivers/gpu/drm/armada/armada_fb.h | 2 ++ drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 1 + drivers/gpu/drm/aspeed/aspeed_gfx_out.c | 1 + drivers/gpu/drm/ast/ast_mode.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 + .../gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 ++ .../gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 ++ drivers/gpu/drm/bridge/chipone-icn6211.c | 1 + drivers/gpu/drm/bridge/chrontel-ch7033.c | 1 + drivers/gpu/drm/bridge/display-connector.c | 1 + drivers/gpu/drm/bridge/fsl-ldb.c | 1 + drivers/gpu/drm/bridge/ite-it66121.c | 1 + drivers/gpu/drm/bridge/lontium-lt8912b.c | 2 ++ drivers/gpu/drm/bridge/lontium-lt9211.c | 1 + drivers/gpu/drm/bridge/lontium-lt9611.c | 2 ++ drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 1 + drivers/gpu/drm/bridge/nwl-dsi.c | 1 + drivers/gpu/drm/bridge/parade-ps8640.c | 1 + drivers/gpu/drm/bridge/sii902x.c | 1 + drivers/gpu/drm/bridge/simple-bridge.c | 1 + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 + drivers/gpu/drm/bridge/tc358764.c | 1 + drivers/gpu/drm/bridge/tc358767.c | 1 + drivers/gpu/drm/bridge/tc358775.c | 1 + drivers/gpu/drm/bridge/ti-dlpc3433.c | 1 + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 + drivers/gpu/drm/bridge/ti-tfp410.c | 2 ++ drivers/gpu/drm/display/drm_dp_helper.c | 2 ++ drivers/gpu/drm/display/drm_dp_mst_topology.c | 1 + drivers/gpu/drm/drm_atomic.c | 2 ++ drivers/gpu/drm/drm_atomic_helper.c | 2 ++ drivers/gpu/drm/drm_atomic_state_helper.c | 2 ++ drivers/gpu/drm/drm_atomic_uapi.c | 1 + drivers/gpu/drm/drm_bridge.c | 1 + drivers/gpu/drm/drm_client_modeset.c | 1 + drivers/gpu/drm/drm_connector.c | 1 + drivers/gpu/drm/drm_crtc.c | 2 ++ drivers/gpu/drm/drm_crtc_helper.c | 1 + drivers/gpu/drm/drm_damage_helper.c | 1 + drivers/gpu/drm/drm_fb_helper.c | 1 + drivers/gpu/drm/drm_gem_atomic_helper.c | 1 + drivers/gpu/drm/drm_kms_helper_common.c | 1 + drivers/gpu/drm/drm_mipi_dbi.c | 2 ++ drivers/gpu/drm/drm_mode_config.c | 1 + drivers/gpu/drm/drm_modes.c | 2 ++ drivers/gpu/drm/drm_modeset_helper.c | 1 + drivers/gpu/drm/drm_of.c | 2 ++ drivers/gpu/drm/drm_writeback.c | 1 + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 ++ drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 + drivers/gpu/drm/exynos/exynos_dp.c | 1 + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 + drivers/gpu/drm/exynos/exynos_drm_fb.c | 1 + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 1 + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 ++ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 1 + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 ++ drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 + drivers/gpu/drm/exynos/exynos_mixer.c | 3 +++ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 1 + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 + drivers/gpu/drm/gma500/framebuffer.c | 1 + drivers/gpu/drm/gma500/gma_display.c | 1 + drivers/gpu/drm/gma500/oaktrail_crtc.c | 1 + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 + drivers/gpu/drm/gma500/psb_intel_modes.c | 2 ++ drivers/gpu/drm/gud/gud_connector.c | 1 + drivers/gpu/drm/gud/gud_drv.c | 1 + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 1 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 + drivers/gpu/drm/i2c/tda998x_drv.c | 1 + drivers/gpu/drm/i915/display/i9xx_plane.c | 1 + drivers/gpu/drm/i915/display/intel_backlight.c | 1 + drivers/gpu/drm/i915/display/intel_cursor.c | 1 + .../gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 1 + drivers/gpu/drm/i915/display/intel_fb.c | 1 + drivers/gpu/drm/i915/display/intel_fbc.c | 1 + drivers/gpu/drm/i915/display/intel_lspcon.c | 1 + drivers/gpu/drm/i915/display/intel_opregion.c | 2 ++ drivers/gpu/drm/i915/display/intel_sprite.c | 1 + .../gpu/drm/i915/display/skl_universal_plane.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 1 + drivers/gpu/drm/imx/dcss/dcss-drv.c | 1 + drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 ++ drivers/gpu/drm/imx/imx-ldb.c | 2 ++ drivers/gpu/drm/imx/imx-tve.c | 1 + drivers/gpu/drm/imx/ipuv3-plane.c | 2 ++ drivers/gpu/drm/imx/parallel-display.c | 2 ++ drivers/gpu/drm/kmb/kmb_dsi.c | 1 + drivers/gpu/drm/kmb/kmb_plane.c | 2 ++ drivers/gpu/drm/logicvc/logicvc_layer.c | 2 ++ drivers/gpu/drm/mcde/mcde_display.c | 1 + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 ++ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 ++ drivers/gpu/drm/mediatek/mtk_dpi.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 ++ drivers/gpu/drm/meson/meson_overlay.c | 2 ++ drivers/gpu/drm/meson/meson_plane.c | 2 ++ drivers/gpu/drm/mgag200/mgag200_mode.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp_format.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 1 + drivers/gpu/drm/msm/msm_debugfs.c | 1 + drivers/gpu/drm/msm/msm_fb.c | 1 + drivers/gpu/drm/msm/msm_fbdev.c | 1 + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 ++ drivers/gpu/drm/nouveau/dispnv50/wndw.c | 1 + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 + drivers/gpu/drm/omapdrm/omap_debugfs.c | 1 + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 + drivers/gpu/drm/omapdrm/omap_fb.c | 2 ++ drivers/gpu/drm/omapdrm/omap_fbdev.c | 1 + drivers/gpu/drm/omapdrm/omap_plane.c | 2 ++ drivers/gpu/drm/panel/panel-edp.c | 1 + .../drm/panel/panel-raspberrypi-touchscreen.c | 1 + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 1 + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 1 + drivers/gpu/drm/panel/panel-simple.c | 3 +++ drivers/gpu/drm/pl111/pl111_display.c | 2 ++ drivers/gpu/drm/pl111/pl111_drv.c | 1 + drivers/gpu/drm/pl111/pl111_versatile.c | 2 ++ drivers/gpu/drm/qxl/qxl_display.c | 2 ++ drivers/gpu/drm/qxl/qxl_draw.c | 1 + drivers/gpu/drm/radeon/atombios_crtc.c | 1 + drivers/gpu/drm/radeon/evergreen.c | 1 + drivers/gpu/drm/radeon/r100.c | 1 + drivers/gpu/drm/radeon/radeon_device.c | 1 + drivers/gpu/drm/radeon/radeon_display.c | 1 + drivers/gpu/drm/radeon/radeon_fb.c | 1 + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 + drivers/gpu/drm/radeon/rs600.c | 1 + drivers/gpu/drm/radeon/rv770.c | 1 + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 1 + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 1 + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_lvds.c | 1 + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 ++ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 3 +++ drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 + .../gpu/drm/selftests/test-drm_damage_helper.c | 1 + .../gpu/drm/selftests/test-drm_plane_helper.c | 1 + drivers/gpu/drm/solomon/ssd130x.c | 2 ++ drivers/gpu/drm/sprd/sprd_dpu.c | 2 ++ drivers/gpu/drm/sti/sti_compositor.c | 1 + drivers/gpu/drm/sti/sti_cursor.c | 1 + drivers/gpu/drm/sti/sti_gdp.c | 2 ++ drivers/gpu/drm/sti/sti_hda.c | 1 + drivers/gpu/drm/sti/sti_hdmi.c | 1 + drivers/gpu/drm/sti/sti_hqvdp.c | 2 ++ drivers/gpu/drm/sti/sti_plane.c | 2 ++ drivers/gpu/drm/stm/ltdc.c | 4 ++++ drivers/gpu/drm/sun4i/sun4i_backend.c | 2 ++ drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 1 + drivers/gpu/drm/sun4i/sun4i_layer.c | 1 + drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + drivers/gpu/drm/sun4i/sun4i_tcon.h | 1 + drivers/gpu/drm/sun4i/sun8i_mixer.c | 1 + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 ++ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 ++ drivers/gpu/drm/tegra/dc.c | 2 ++ drivers/gpu/drm/tegra/drm.c | 1 + drivers/gpu/drm/tegra/fb.c | 1 + drivers/gpu/drm/tegra/hub.c | 2 ++ drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tidss/tidss_dispc.c | 3 +++ drivers/gpu/drm/tidss/tidss_plane.c | 2 ++ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 1 + drivers/gpu/drm/tiny/arcpgu.c | 2 ++ drivers/gpu/drm/tiny/bochs.c | 2 ++ drivers/gpu/drm/tiny/cirrus.c | 2 ++ drivers/gpu/drm/tiny/gm12u320.c | 2 ++ drivers/gpu/drm/tiny/ili9225.c | 1 + drivers/gpu/drm/tiny/repaper.c | 1 + drivers/gpu/drm/tiny/st7586.c | 1 + drivers/gpu/drm/tve200/tve200_display.c | 1 + drivers/gpu/drm/udl/udl_connector.c | 1 + drivers/gpu/drm/vboxvideo/vbox_mode.c | 2 ++ drivers/gpu/drm/vc4/vc4_bo.c | 2 ++ drivers/gpu/drm/vc4/vc4_crtc.c | 1 + drivers/gpu/drm/vc4/vc4_dpi.c | 1 + drivers/gpu/drm/vc4/vc4_drv.h | 1 + drivers/gpu/drm/vc4/vc4_kms.c | 1 + drivers/gpu/drm/vc4/vc4_plane.c | 2 ++ drivers/gpu/drm/vc4/vc4_txp.c | 1 + drivers/gpu/drm/virtio/virtgpu_display.c | 1 + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_vq.c | 2 ++ drivers/gpu/drm/vkms/vkms_drv.h | 1 + drivers/gpu/drm/vkms/vkms_output.c | 1 + drivers/gpu/drm/vkms/vkms_writeback.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 + drivers/gpu/drm/xen/xen_drm_front_kms.c | 1 + include/drm/drm_crtc.h | 17 ++--------------- include/drm/drm_encoder_slave.h | 2 ++ include/drm/drm_fb_helper.h | 1 + 230 files changed, 309 insertions(+), 16 deletions(-) -- 2.35.1

4 21

[PATCH 00/19] drm/gma500: Unify most of the lvds code
by Patrik Jakobsson 15 Jun '22

15 Jun '22

Much of the lvds code for Poulsbo, Oaktrail and Cedarview are almost identical so there is no need to keep three copies of it. Unify as much as possible into one implementation. There are still things like the init code that can be unified but that requires unifying other parts of the driver first. Patrik Jakobsson (19): drm/gma500: Unify *_lvds_get_max_backlight() drm/gma500: Unify *_lvds_set_backlight() drm/gma500: Unify *_lvds_set_power() drm/gma500: Unify *_lvds_mode_valid() drm/gma500: Unify *_lvds_encoder_dpms() drm/gma500: Unify *_intel_lvds_save() drm/gma500: Unify struct *_intel_lvds_priv drm/gma500: Unify *_intel_lvds_restore() drm/gma500: Unify *_intel_lvds_mode_fixup() drm/gma500: Unify *_intel_lvds_prepare() drm/gma500: Unify *_intel_lvds_commit() drm/gma500: Unify *_intel_lvds_mode_set() drm/gma500: Unify struct *_intel_lvds_helper_funcs drm/gma500: Unify *_intel_lvds_get_modes() drm/gma500: Unify struct *_intel_lvds_connector_helper_funcs drm/gma500: Use i2c_bus in gma_encoder for PSB drm/gma500: Unify *_intel_lvds_destroy() drm/gma500: Unify *_intel_lvds_set_property() drm/gma500: Unify struct *_intel_lvds_connector_funcs drivers/gpu/drm/gma500/Makefile | 1 + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 390 +----------------- drivers/gpu/drm/gma500/gma_lvds.c | 462 +++++++++++++++++++++ drivers/gpu/drm/gma500/gma_lvds.h | 38 ++ drivers/gpu/drm/gma500/oaktrail_lvds.c | 112 +----- drivers/gpu/drm/gma500/psb_drv.h | 1 - drivers/gpu/drm/gma500/psb_intel_drv.h | 2 - drivers/gpu/drm/gma500/psb_intel_lvds.c | 507 +----------------------- 8 files changed, 530 insertions(+), 983 deletions(-) create mode 100644 drivers/gpu/drm/gma500/gma_lvds.c create mode 100644 drivers/gpu/drm/gma500/gma_lvds.h -- 2.36.1

3 29

[PATCH v7] drm/i915/display: disable HPD workers before display driver unregister
by Andrzej Hajda 15 Jun '22

15 Jun '22

Handling HPD during driver removal is pointless, and can cause different use-after-free/concurrency issues: 1. Setup of deferred fbdev after fbdev unregistration. 2. Access to DP-AUX after DP-AUX removal. Below stacktraces of both cases observed on CI: [272.634530] general protection fault, probably for non-canonical address 0x6b6b6b6b6b6b6b6b: 0000 [#1] PREEMPT SMP NOPTI [272.634536] CPU: 0 PID: 6030 Comm: i915_selftest Tainted: G U 5.18.0-rc5-CI_DRM_11603-g12dccf4f5eef+ #1 [272.634541] Hardware name: Intel Corporation Raptor Lake Client Platform/RPL-S ADP-S DDR5 UDIMM CRB, BIOS RPLSFWI1.R00.2397.A01.2109300731 09/30/2021 [272.634545] RIP: 0010:fb_do_apertures_overlap.part.14+0x26/0x60 ... [272.634582] Call Trace: [272.634583] <TASK> [272.634585] do_remove_conflicting_framebuffers+0x59/0xa0 [272.634589] remove_conflicting_framebuffers+0x2d/0xc0 [272.634592] remove_conflicting_pci_framebuffers+0xc8/0x110 [272.634595] drm_aperture_remove_conflicting_pci_framebuffers+0x52/0x70 [272.634604] i915_driver_probe+0x63a/0xdd0 [i915] [283.405824] cpu_latency_qos_update_request called for unknown object [283.405866] WARNING: CPU: 2 PID: 240 at kernel/power/qos.c:296 cpu_latency_qos_update_request+0x2d/0x100 [283.405912] CPU: 2 PID: 240 Comm: kworker/u64:9 Not tainted 5.18.0-rc6-Patchwork_103738v3-g1672d1c43e43+ #1 [283.405915] Hardware name: Intel Corporation Raptor Lake Client Platform/RPL-S ADP-S DDR5 UDIMM CRB, BIOS RPLSFWI1.R00.2397.A01.2109300731 09/30/2021 [283.405916] Workqueue: i915-dp i915_digport_work_func [i915] [283.406020] RIP: 0010:cpu_latency_qos_update_request+0x2d/0x100 ... [283.406040] Call Trace: [283.406041] <TASK> [283.406044] intel_dp_aux_xfer+0x60e/0x8e0 [i915] [283.406131] ? finish_swait+0x80/0x80 [283.406139] intel_dp_aux_transfer+0xc5/0x2b0 [i915] [283.406218] drm_dp_dpcd_access+0x79/0x130 [drm_display_helper] [283.406227] drm_dp_dpcd_read+0xe2/0xf0 [drm_display_helper] [283.406233] intel_dp_hpd_pulse+0x134/0x570 [i915] [283.406308] ? __down_killable+0x70/0x140 [283.406313] i915_digport_work_func+0xba/0x150 [i915] Signed-off-by: Andrzej Hajda <andrzej.hajda(a)intel.com> --- Hi All, I am not sure about changes in shutdown path, any comments welcome. I suspect suspend path have also some common bits, but I am little bit afraid of touching it. Changes: v1 - v6: - chasing the bug appearing only on public CI. v7: - shutdown path adjusted (suggested by Jani) Regards Andrzej --- drivers/gpu/drm/i915/display/intel_display.c | 11 ++++------- drivers/gpu/drm/i915/i915_driver.c | 5 ++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 186b37925d23f2..f9952ee8289fb2 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -10490,13 +10490,6 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915) */ intel_hpd_poll_fini(i915); - /* - * MST topology needs to be suspended so we don't have any calls to - * fbdev after it's finalized. MST will be destroyed later as part of - * drm_mode_config_cleanup() - */ - intel_dp_mst_suspend(i915); - /* poll work can call into fbdev, hence clean that up afterwards */ intel_fbdev_fini(i915); @@ -10588,6 +10581,10 @@ void intel_display_driver_unregister(struct drm_i915_private *i915) if (!HAS_DISPLAY(i915)) return; + intel_dp_mst_suspend(i915); + intel_hpd_cancel_work(i915); + drm_kms_helper_poll_disable(&i915->drm); + intel_fbdev_unregister(i915); intel_audio_deinit(i915); diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index d26dcca7e654aa..82cdccf072e2bc 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1070,15 +1070,14 @@ void i915_driver_shutdown(struct drm_i915_private *i915) i915_gem_suspend(i915); if (HAS_DISPLAY(i915)) { + intel_dp_mst_suspend(i915); + intel_hpd_cancel_work(i915); drm_kms_helper_poll_disable(&i915->drm); drm_atomic_helper_shutdown(&i915->drm); } - intel_dp_mst_suspend(i915); - intel_runtime_pm_disable_interrupts(i915); - intel_hpd_cancel_work(i915); intel_suspend_encoders(i915); intel_shutdown_encoders(i915); -- 2.25.1

2 3

[PULL] drm-misc-next
by Thomas Zimmermann 15 Jun '22

15 Jun '22

Hi Dave and Daniel, here's the first PR for drm-misc-next that will go into v5.20. Best regards Thomas drm-misc-next-2022-06-08: drm-misc-next for 5.20: UAPI Changes: * connector: export bpc limits in debugfs * dma-buf: Print buffer name in debugfs Cross-subsystem Changes: * dma-buf: Improve dma-fence handling; Cleanups * fbdev: Device-unregistering fixes Core Changes: * client: Only use driver-validated modes to avoid blank screen * dp-aux: Make probing more reliable; Small fixes * edit: CEA data-block iterators; Introduce struct drm_edid; Many cleanups * gem: Don't use framebuffer format's non-exising color planes * probe-helper: Use 640x480 as DisplayPort fallback; Refactoring * scheduler: Don't kill jobs in interrupt context Driver Changes: * amdgpu: Use atomic fence helpers in DM; Fix VRAM address calculation; Export CRTC bpc settings via debugfs * bridge: Add TI-DLPC3433; anx7625: Fixes; fy07024di26a30d: Optional GPIO reset; icn6211: Cleanups; ldb: Add reg and reg-name properties to bindings, Kconfig fixes; lt9611: Fix display sensing; lt9611uxc: Fixes; nwl-dsi: Fixes; ps8640: Cleanups; st7735r: Fixes; tc358767: DSI/DPI refactoring and DSI-to-eDP support, Fixes; ti-sn65dsi83: Fixes; * gma500: Cleanup connector I2C handling * hyperv: Unify VRAM allocation of Gen1 and Gen2 * i915: export CRTC bpc settings via debugfs * meson: Support YUV422 output; Refcount fixes * mgag200: Support damage clipping; Support gamma handling; Protect concurrent HW access; Fixes to connector; Store model-specific limits in device-info structure; Cleanups * nouveau: Fixes and Cleanups * panel: Kconfig fixes * panfrost: Valhall support * r128: Fix bit-shift overflow * rockchip: Locking fixes in error path; Minor cleanups * ssd130x: Fix built-in linkage * ttm: Cleanups * udl; Always advertize VGA connector * fbdev/vesa: Support COMPILE_TEST The following changes since commit 6071c4c2a319da360b0bf2bc397d4fefad10b2c8: drm/qxl: add drm_gem_plane_helper_prepare_fb (2022-05-05 12:30:10 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2022-06-08 for you to fetch changes up to dfa687bffc8a4a21ed929c7dececf01b8f1f52ee: drm/bridge: lt9611uxc: Cancel only driver's work (2022-06-07 14:57:47 +0200) ---------------------------------------------------------------- drm-misc-next for 5.20: UAPI Changes: * connector: export bpc limits in debugfs * dma-buf: Print buffer name in debugfs Cross-subsystem Changes: * dma-buf: Improve dma-fence handling; Cleanups * fbdev: Device-unregistering fixes Core Changes: * client: Only use driver-validated modes to avoid blank screen * dp-aux: Make probing more reliable; Small fixes * edit: CEA data-block iterators; Introduce struct drm_edid; Many cleanups * gem: Don't use framebuffer format's non-exising color planes * probe-helper: Use 640x480 as DisplayPort fallback; Refactoring * scheduler: Don't kill jobs in interrupt context Driver Changes: * amdgpu: Use atomic fence helpers in DM; Fix VRAM address calculation; Export CRTC bpc settings via debugfs * bridge: Add TI-DLPC3433; anx7625: Fixes; fy07024di26a30d: Optional GPIO reset; icn6211: Cleanups; ldb: Add reg and reg-name properties to bindings, Kconfig fixes; lt9611: Fix display sensing; lt9611uxc: Fixes; nwl-dsi: Fixes; ps8640: Cleanups; st7735r: Fixes; tc358767: DSI/DPI refactoring and DSI-to-eDP support, Fixes; ti-sn65dsi83: Fixes; * gma500: Cleanup connector I2C handling * hyperv: Unify VRAM allocation of Gen1 and Gen2 * i915: export CRTC bpc settings via debugfs * meson: Support YUV422 output; Refcount fixes * mgag200: Support damage clipping; Support gamma handling; Protect concurrent HW access; Fixes to connector; Store model-specific limits in device-info structure; Cleanups * nouveau: Fixes and Cleanups * panel: Kconfig fixes * panfrost: Valhall support * r128: Fix bit-shift overflow * rockchip: Locking fixes in error path; Minor cleanups * ssd130x: Fix built-in linkage * ttm: Cleanups * udl; Always advertize VGA connector * fbdev/vesa: Support COMPILE_TEST ---------------------------------------------------------------- Alyssa Rosenzweig (9): dt-bindings: Add compatible for Mali Valhall (JM) drm/panfrost: Handle HW_ISSUE_TTRX_2968_TTRX_3162 drm/panfrost: Constify argument to has_hw_issue drm/panfrost: Handle HW_ISSUE_TTRX_3076 drm/panfrost: Add HW_ISSUE_TTRX_3485 quirk drm/panfrost: Add "clean only safe" feature bit drm/panfrost: Don't set L2_MMU_CONFIG quirks drm/panfrost: Add Mali-G57 "Natt" support drm/panfrost: Add arm,mali-valhall-jm compatible André Almeida (1): drm/vkms: Update vkms_composer_worker documentation Bhanuprakash Modem (3): drm/debug: Expose connector's max supported bpc via debugfs drm/i915/display/debug: Expose crtc current bpc via debugfs drm/amd/display: Move connector debugfs to drm Bjorn Andersson (1): drm/bridge: lt9611uxc: Cancel only driver's work Borislav Petkov (1): drm/r128: Fix undefined behavior due to shift overflowing the constant Christian König (10): drm/ttm: move default BO destructor into VMWGFX v2 drm/amdgpu: switch DM to atomic fence helpers v2 drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new drm/amdgpu: move internal vram_mgr function into the C file dma-buf: cleanup dma_fence_chain_walk dma-buf: cleanup dma_fence_unwrap selftest v2 dma-buf: cleanup dma_fence_unwrap implementation dma-buf: return only unsignaled fences in dma_fence_unwrap_for_each v3 dma-buf: generalize dma_fence unwrap & merging v3 drm: use dma_fence_unwrap_merge() in drm_syncobj Colin Ian King (1): drm/rockchip: Fix spelling mistake "aligened" -> "aligned" Dan Carpenter (1): drm/rockchip: vop2: unlock on error path in vop2_crtc_atomic_enable() Dmitry Osipenko (1): drm/scheduler: Don't kill jobs in interrupt context Dongjin Kim (1): drm/meson: add YUV422 output support Douglas Anderson (8): drm/probe-helper: Add helper for drm_helper_probe_single_connector_modes() drm/probe-helper: For DP, add 640x480 if all other modes are bad drm: Document the power requirements for DP AUX transfers drm/dp: Export symbol / kerneldoc fixes for DP AUX bus drm/dp: Add callbacks to make using DP AUX bus properly easier drm/bridge: Add devm_drm_bridge_add() drm/bridge: parade-ps8640: Handle DP AUX more properly drm/probe-helper: Default to 640x480 if no EDID on DP Fabio Estevam (1): drm: bridge: adv7511: Move CEC definitions to adv7511_cec.c Gao Chao (1): drm/panel: Fix build error when CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=y && CONFIG_DRM_DISPLAY_HELPER=m Geert Uytterhoeven (1): drm: bridge: DRM_FSL_LDB should depend on ARCH_MXC Guo Zhengkui (1): drm/nouveau/tegra: remove needless NULL check Jagan Teki (2): dt-bindings: display: bridge: Add TI DLPC3433 DSI to DMD drm: bridge: Add TI DLPC3433 DSI to DMD bridge Jani Nikula (44): drm/edid: reset display info in drm_add_edid_modes() for NULL edid drm/edid: rename HDMI Forum VSDB to SCDS drm/edid: clean up CTA data block tag definitions drm/edid: add iterator for EDID base and extension blocks drm/edid: add iterator for CTA data blocks drm/edid: clean up cea_db_is_*() functions drm/edid: convert add_cea_modes() to use cea db iter drm/edid: convert drm_edid_to_speaker_allocation() to use cea db iter drm/edid: convert drm_edid_to_sad() to use cea db iter drm/edid: convert drm_detect_hdmi_monitor() to use cea db iter drm/edid: convert drm_detect_monitor_audio() to use cea db iter drm/edid: convert drm_parse_cea_ext() to use cea db iter drm/edid: convert drm_edid_to_eld() to use cea db iter drm/edid: sunset the old unused cea data block iterators drm/edid: restore some type safety to cea_db_*() functions drm/edid: detect basic audio in all CEA extensions drm/edid: detect color formats and CTA revision in all CTA extensions drm/edid: skip CTA extension scan in drm_edid_to_eld() just for CTA rev drm/edid: sunset drm_find_cea_extension() drm/edid: use else-if in CTA extension parsing drm/edid: convert drm_for_each_detailed_block() to edid iter drm/edid: add struct drm_edid container drm/edid: start propagating drm_edid to lower levels drm/edid: keep propagating drm_edid to display info drm/edid: propagate drm_edid to drm_edid_to_eld() drm/edid: convert drm_edid_connector_update() to drm_edid fully drm/edid: convert struct detailed_mode_closure to drm_edid drm/edid: convert drm_mode_detailed() to drm_edid drm/edid: convert drm_dmt_modes_for_range() to drm_edid drm/edid: convert drm_gtf_modes_for_range() to drm_edid drm/edid: convert drm_cvt_modes_for_range() to drm_edid drm/edid: convert drm_mode_std() and children to drm_edid drm/edid: convert mode_in_range() and drm_monitor_supports_rb() to drm_edid drm/edid: convert get_monitor_name() to drm_edid drm/edid: convert drm_for_each_detailed_block() to drm_edid drm/edid: add drm_edid helper for drm_edid_to_sad() drm/edid: add drm_edid helper for drm_edid_to_speaker_allocation() drm/edid: add drm_edid helper for drm_detect_hdmi_monitor() drm/edid: add drm_edid helper for drm_detect_monitor_audio() drm/edid: convert cea_db_iter_edid_begin() to drm_edid drm/edid: convert drm_edid_iter_begin() to drm_edid drm/edid: add drm_edid helper for drm_update_tile_info() drm/displayid: convert to drm_edid drm/edid: convert version_greater() to drm_edid Javier Martinez Canillas (6): MAINTAINERS: Add simpledrm driver co-maintainer drm/todo: Add entry for converting kselftests to kunit fbdev: Restart conflicting fb removal loop when unregistering devices fbdev: vesafb: Allow to be built if COMPILE_TEST is enabled drm/st7735r: Fix module autoloading for Okaya RH128128T drm/ssd130x: Only define a SPI device ID table when built as a module Jayshri Pawar (1): drm/bridge: cdns-dsi: Add support for pre_enable and post_enable control functions. Jiapeng Chong (1): drm/nouveau/gr/gf100-: Clean up some inconsistent indenting Jocelyn Falempe (4): drm/mgag200: Add FB_DAMAGE_CLIPS support drm/mgag200: Optimize damage clips drm/mgag200: Warn once if trying to set start address on broken hardware. drm/mgag200: Enable atomic gamma lut update John Stultz (2): drm/bridge: lt9611: Consolidate detection logic drm/bridge: lt9611: Use both bits for HDMI sensing Jonathan Liu (1): drm: bridge: icn6211: Adjust clock phase using SYS_CTRL_1 Julia Lawall (1): drm/nouveau/mmu: fix typo in comment Lee Shawn C (1): drm/edid: check for HF-SCDB block Liu Ying (1): drm/bridge: nwl-dsi: Set PHY mode in nwl_dsi_mode_set() Marek Vasut (9): dt-bindings: display: bridge: ldb: Fill in reg property drm/bridge: tc358767: Factor out DSI and DPI RX enablement drm/bridge: tc358767: Add DSI-to-(e)DP mode support drm: bridge: icn6211: Register macro clean up drm/bridge: tc358767: Handle dsi_lanes == 0 as invalid drm/bridge: tc358767: Report DSI-to-(e)DP as supported drm/bridge: tc358767: Make sure Refclk clock are enabled drm/bridge: ti-sn65dsi83: Handle dsi_lanes == 0 as invalid drm/bridge: anx7625: Add missing of_node_put for endpoint Mark Menzynski (1): drm/nouveau: clear output poll workers before nouveau_fbcon_destroy() Melissa Wen (1): MAINTAINERS: add Melissa to V3D maintainers Miaoqian Lin (3): drm/meson: Fix refcount leak in meson_encoder_hdmi_init drm/meson: encoder_cvbs: Fix refcount leak in meson_encoder_cvbs_init drm/meson: encoder_hdmi: Fix refcount leak in meson_encoder_hdmi_init Minghao Chi (1): drm/bridge: simplify the return expression of ps8640_bridge_host_attach Niels Dossche (1): drm: use ENOMEM for drmm_kzalloc allocation failures Patrik Jakobsson (8): drm/gma500: Use gma_ prefix for our i2c abstraction drm/gma500: Make gma_i2c_chan a subclass of i2c_adapter drm/gma500: Make cdv lvds use ddc adapter from drm_connector drm/gma500: Make cdv hdmi use ddc adapter from drm_connector drm/gma500: Make psb lvds use ddc adapter from drm_connector drm/gma500: Make cdv crt use ddc adapter from drm_connector drm/gma500: Make oaktrail lvds use ddc adapter from drm_connector drm/gma500: Read EDID from the correct i2c adapter Peter Geis (2): dt-bindings: display: panel: feiyang, fy07024di26a30d: make reset gpio optional drm/panel: feiyang-fy07024di26a30d: make reset gpio optional Ren Zhijie (1): drm/rockchip: Fix Kconfig dependencies for display-port encoders Rob Herring (1): dt-bindings: display: ingenic,jz4780-hdmi: Drop undocumented 'ddc-i2c-bus' Robert Foss (2): Revert "drm/bridge: anx7625: Use DPI bus type" Revert "dt-bindings:drm/bridge:anx7625: add port@0 property" Saurabh Sengar (1): drm/hyperv : Removing the restruction of VRAM allocation with PCI bar size Thomas Zimmermann (26): drm: Always warn if user-defined modes are not supported drm/client: Look for command-line modes first drm/client: Don't add new command-line mode drm/mgag200: Acquire I/O lock while reading EDID drm/mgag200: Fail on I2C initialization errors drm/mgag200: Implement connector's get_modes with helper drm/mgag200: Switch I2C code to managed cleanup drm/mgag200: Remove struct mga_connector drm/mgag200: Test memory requirements in drm_mode_config_funcs.mode_valid drm/mgag200: Split up connector's mode_valid helper drm/udl: Set VGA connector drm/gem: Share code between drm_gem_fb_{begin,end}_cpu_access() drm/gem: Ignore color planes that are unused by framebuffer format drm/gem-vram: Share code between GEM VRAM's _{prepare, cleanup}_fb() drm/gem-vram: Ignore planes that are unused by framebuffer format drm/gem: Warn on trying to use a non-existing framebuffer plane drm/mgag200: Remove special case for G200SE with <2 MiB drm/mgag200: Initialize each model in separate function drm/mgag200: Move PCI-option setup into model-specific code drm/mgag200: Call mgag200_device_probe_vram() from per-model init drm/mgag200: Implement new init logic drm/mgag200: Add struct mgag200_device_info drm/mgag200: Store HW_BUG_NO_STARTADD flag in device info drm/mgag200: Store maximum resolution and memory bandwidth in device info drm/mgag200: Store vidrst flag in device info drm/mgag200: Store positions of I2C data and clock bits in device info Timur Tabi (1): drm/nouveau: fix another off-by-one in nvbios_addr Tom Rix (1): drm/nouveau/fifo/gv100-: set gv100_fifo_runlist storage-class to static Ville Syrjälä (1): drm/edid: Extract drm_edid_decode_mfg_id() Xin Ji (2): dt-bindings:drm/bridge:anx7625: add port@0 property drm/bridge: anx7625: Use DPI bus type Yang Li (1): drm/rockchip: remove unneeded semicolon from vop2 driver Yuanzheng Song (1): dma-buf: add the name field to the table header Yunhao Tian (1): drm/mipi-dbi: align max_chunk to 2 in spi_transfer .../bindings/display/bridge/fsl,ldb.yaml | 16 +- .../display/bridge/ingenic,jz4780-hdmi.yaml | 1 - .../bindings/display/bridge/ti,dlpc3433.yaml | 117 ++ .../display/panel/feiyang,fy07024di26a30d.yaml | 1 - .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 25 +- Documentation/gpu/todo.rst | 11 + MAINTAINERS | 8 + drivers/dma-buf/Makefile | 2 +- drivers/dma-buf/dma-buf.c | 4 +- drivers/dma-buf/dma-fence-chain.c | 4 +- drivers/dma-buf/dma-fence-unwrap.c | 162 +++ drivers/dma-buf/st-dma-fence-unwrap.c | 157 ++- drivers/dma-buf/sync_file.c | 119 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 51 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 27 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 38 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 - drivers/gpu/drm/bridge/Kconfig | 17 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/adv7511/adv7511.h | 12 - drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 12 + drivers/gpu/drm/bridge/analogix/anx7625.c | 1 + drivers/gpu/drm/bridge/cdns-dsi.c | 26 + drivers/gpu/drm/bridge/chipone-icn6211.c | 42 +- drivers/gpu/drm/bridge/lontium-lt9611.c | 24 +- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- drivers/gpu/drm/bridge/nwl-dsi.c | 6 + drivers/gpu/drm/bridge/parade-ps8640.c | 73 +- drivers/gpu/drm/bridge/tc358767.c | 169 ++- drivers/gpu/drm/bridge/ti-dlpc3433.c | 417 +++++++ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- drivers/gpu/drm/display/drm_dp_aux_bus.c | 211 ++-- drivers/gpu/drm/drm_bridge.c | 23 + drivers/gpu/drm/drm_client_modeset.c | 28 +- drivers/gpu/drm/drm_debugfs.c | 21 + drivers/gpu/drm/drm_displayid.c | 16 +- drivers/gpu/drm/drm_edid.c | 1272 ++++++++++++-------- drivers/gpu/drm/drm_encoder.c | 2 +- drivers/gpu/drm/drm_gem_atomic_helper.c | 6 +- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 104 +- drivers/gpu/drm/drm_gem_vram_helper.c | 54 +- drivers/gpu/drm/drm_mipi_dbi.c | 7 + drivers/gpu/drm/drm_modes.c | 4 + drivers/gpu/drm/drm_probe_helper.c | 178 ++- drivers/gpu/drm/drm_syncobj.c | 57 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 47 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 98 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 80 +- drivers/gpu/drm/gma500/intel_i2c.c | 36 +- drivers/gpu/drm/gma500/oaktrail_lvds.c | 50 +- drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 36 +- drivers/gpu/drm/gma500/psb_drv.h | 2 +- drivers/gpu/drm/gma500/psb_intel_drv.h | 24 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 86 +- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 74 +- .../gpu/drm/i915/display/intel_display_debugfs.c | 28 + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 1 + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 27 +- drivers/gpu/drm/mgag200/Makefile | 14 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 386 +++--- drivers/gpu/drm/mgag200/mgag200_drv.h | 148 ++- drivers/gpu/drm/mgag200/mgag200_g200.c | 200 +++ drivers/gpu/drm/mgag200/mgag200_g200eh.c | 50 + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 51 + drivers/gpu/drm/mgag200/mgag200_g200er.c | 46 + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 50 + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 60 + drivers/gpu/drm/mgag200/mgag200_g200se.c | 130 ++ drivers/gpu/drm/mgag200/mgag200_g200wb.c | 50 + drivers/gpu/drm/mgag200/mgag200_i2c.c | 59 +- drivers/gpu/drm/mgag200/mgag200_mm.c | 116 -- drivers/gpu/drm/mgag200/mgag200_mode.c | 453 ++++--- drivers/gpu/drm/mgag200/mgag200_pll.c | 12 +- drivers/gpu/drm/mgag200/mgag200_reg.h | 2 + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 14 +- drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- drivers/gpu/drm/panel/Kconfig | 2 + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 2 +- drivers/gpu/drm/panfrost/panfrost_device.c | 9 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 1 + drivers/gpu/drm/panfrost/panfrost_features.h | 13 + drivers/gpu/drm/panfrost/panfrost_gpu.c | 18 +- drivers/gpu/drm/panfrost/panfrost_issues.h | 19 +- drivers/gpu/drm/panfrost/panfrost_regs.h | 1 + drivers/gpu/drm/r128/r128_drv.h | 4 +- drivers/gpu/drm/rockchip/Kconfig | 4 +- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +- drivers/gpu/drm/scheduler/sched_entity.c | 6 +- drivers/gpu/drm/solomon/ssd130x-spi.c | 2 + drivers/gpu/drm/tiny/st7735r.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 9 +- drivers/gpu/drm/udl/udl_connector.c | 2 +- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 10 +- drivers/video/fbdev/Kconfig | 2 +- drivers/video/fbdev/core/fbmem.c | 22 +- include/drm/display/drm_dp_aux_bus.h | 34 +- include/drm/display/drm_dp_helper.h | 16 +- include/drm/drm_bridge.h | 1 + include/drm/drm_displayid.h | 6 +- include/drm/drm_edid.h | 27 +- include/drm/drm_gem_framebuffer_helper.h | 10 +- include/drm/drm_probe_helper.h | 2 + include/drm/gpu_scheduler.h | 4 +- include/linux/dma-fence-unwrap.h | 82 +- include/linux/fb.h | 1 - 111 files changed, 4032 insertions(+), 2286 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml create mode 100644 drivers/dma-buf/dma-fence-unwrap.c create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh3.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200er.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ev.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ew3.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200se.c create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200wb.c delete mode 100644 drivers/gpu/drm/mgag200/mgag200_mm.c -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer

2 1

[PATCH 1/2] drm/msm: Drop update_fences()
by Rob Clark 15 Jun '22

15 Jun '22

From: Rob Clark <robdclark(a)chromium.org> I noticed while looking at some traces, that we could miss calls to msm_update_fence(), as the irq could have raced with retire_submits() which could have already popped the last submit on a ring out of the queue of in-flight submits. But walking the list of submits in the irq handler isn't really needed, as dma_fence_is_signaled() will dtrt. So lets just drop it entirely. Reported-by: Steev Klimaszewski <steev(a)kali.org> Fixes: 95d1deb02a9c ("drm/msm/gem: Add fenced vma unpin") Signed-off-by: Rob Clark <robdclark(a)chromium.org> --- drivers/gpu/drm/msm/msm_gpu.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index e59a757578df..b61078f0cd0f 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -176,24 +176,6 @@ int msm_gpu_hw_init(struct msm_gpu *gpu) return ret; } -static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring, - uint32_t fence) -{ - struct msm_gem_submit *submit; - unsigned long flags; - - spin_lock_irqsave(&ring->submit_lock, flags); - list_for_each_entry(submit, &ring->submits, node) { - if (fence_after(submit->seqno, fence)) - break; - - msm_update_fence(submit->ring->fctx, - submit->hw_fence->seqno); - dma_fence_signal(submit->hw_fence); - } - spin_unlock_irqrestore(&ring->submit_lock, flags); -} - #ifdef CONFIG_DEV_COREDUMP static ssize_t msm_gpu_devcoredump_read(char *buffer, loff_t offset, size_t count, void *data, size_t datalen) @@ -450,7 +432,7 @@ static void recover_worker(struct kthread_work *work) if (ring == cur_ring) fence++; - update_fences(gpu, ring, fence); + msm_update_fence(ring->fctx, fence); } if (msm_gpu_active(gpu)) { @@ -753,7 +735,7 @@ void msm_gpu_retire(struct msm_gpu *gpu) int i; for (i = 0; i < gpu->nr_rings; i++) - update_fences(gpu, gpu->rb[i], gpu->rb[i]->memptrs->fence); + msm_update_fence(gpu->rb[i]->fctx, gpu->rb[i]->memptrs->fence); kthread_queue_work(gpu->worker, &gpu->retire_work); update_sw_cntrs(gpu); -- 2.36.1

2 3

[PATCH v2 0/3] Expand CRC to support interface blocks
by Jessica Zhang 15 Jun '22

15 Jun '22

Refactor existing CRC code for layer mixer and add CRC support for interface blocks Changes since V1: - Create helper methods for collect_misr and setup_misr in dpu_hw_util.c - Move common bitmasks into dpu_hw_util.h - Update copyrights - Create a dynamically allocated crcs array in dpu_crtc_state - Collect CRCs for all drm_encoders connected to the crtc Jessica Zhang (3): drm/msm/dpu: Move LM CRC code into separate method drm/msm/dpu: Add MISR register support for interface drm/msm/dpu: Add interface support for CRC debugfs drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 131 +++++++++++++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 7 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 63 ++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 22 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 19 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 42 +------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 46 ++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 16 +++ 9 files changed, 279 insertions(+), 75 deletions(-) -- 2.35.1

2 10

[PATCH v7 0/6] Proposal for a GPU cgroup controller
by T.J. Mercier 15 Jun '22

15 Jun '22

This patch series revisits the proposal for a GPU cgroup controller to track and limit memory allocations by various device/allocator subsystems. The patch series also contains a simple prototype to illustrate how Android intends to implement DMA-BUF allocator attribution using the GPU cgroup controller. The prototype does not include resource limit enforcements. Changelog: v7: Hide gpucg and gpucg_bucket struct definitions per Michal Koutný. This means gpucg_register_bucket now returns an internally allocated struct gpucg_bucket. Move all public function documentation to the cgroup_gpu.h header. Remove comment in documentation about duplicate name rejection which is not relevant to cgroups users per Michal Koutný. v6: Move documentation into cgroup-v2.rst per Tejun Heo. Rename BINDER_FD{A}_FLAG_SENDER_NO_NEED -> BINDER_FD{A}_FLAG_XFER_CHARGE per Carlos Llamas. Return error on transfer failure per Carlos Llamas. v5: Rebase on top of v5.18-rc3 Drop the global GPU cgroup "total" (sum of all device totals) portion of the design since there is no currently known use for this per Tejun Heo. Fix commit message which still contained the old name for dma_buf_transfer_charge per Michal Koutný. Remove all GPU cgroup code except what's necessary to support charge transfer from dma_buf. Previously charging was done in export, but for non-Android graphics use-cases this is not ideal since there may be a delay between allocation and export, during which time there is no accounting. Merge dmabuf: Use the GPU cgroup charge/uncharge APIs patch into dmabuf: heaps: export system_heap buffers with GPU cgroup charging as a result of above. Put the charge and uncharge code in the same file (system_heap_allocate, system_heap_dma_buf_release) instead of splitting them between the heap and the dma_buf_release. This avoids asymmetric management of the gpucg charges. Modify the dma_buf_transfer_charge API to accept a task_struct instead of a gpucg. This avoids requiring the caller to manage the refcount of the gpucg upon failure and confusing ownership transfer logic. Support all strings for gpucg_register_bucket instead of just string literals. Enforce globally unique gpucg_bucket names. Constrain gpucg_bucket name lengths to 64 bytes. Append "-heap" to gpucg_bucket names from dmabuf-heaps. Drop patch 7 from the series, which changed the types of binder_transaction_data's sender_pid and sender_euid fields. This was done in another commit here: https://lore.kernel.org/all/20220210021129.3386083-4-masahiroy@kernel.org/ Rename: gpucg_try_charge -> gpucg_charge find_cg_rpool_locked -> cg_rpool_find_locked init_cg_rpool -> cg_rpool_init get_cg_rpool_locked -> cg_rpool_get_locked "gpu cgroup controller" -> "GPU controller" gpucg_device -> gpucg_bucket usage -> size Tests: Support both binder_fd_array_object and binder_fd_object. This is necessary because new versions of Android will use binder_fd_object instead of binder_fd_array_object, and we need to support both. Tests for both binder_fd_array_object and binder_fd_object. For binder_utils return error codes instead of struct binder{fs}_ctx. Use ifdef __ANDROID__ to choose platform-dependent temp path instead of a runtime fallback. Ensure binderfs_mntpt ends with a trailing '/' character instead of prepending it where used. v4: Skip test if not run as root per Shuah Khan Add better test logging for abnormal child termination per Shuah Khan Adjust ordering of charge/uncharge during transfer to avoid potentially hitting cgroup limit per Michal Koutný Adjust gpucg_try_charge critical section for charge transfer functionality Fix uninitialized return code error for dmabuf_try_charge error case v3: Remove Upstreaming Plan from gpu-cgroup.rst per John Stultz Use more common dual author commit message format per John Stultz Remove android from binder changes title per Todd Kjos Add a kselftest for this new behavior per Greg Kroah-Hartman Include details on behavior for all combinations of kernel/userspace versions in changelog (thanks Suren Baghdasaryan) per Greg Kroah-Hartman. Fix pid and uid types in binder UAPI header v2: See the previous revision of this change submitted by Hridya Valsaraju at: https://lore.kernel.org/all/20220115010622.3185921-1-hridya@google.com/ Move dma-buf cgroup charge transfer from a dma_buf_op defined by every heap to a single dma-buf function for all heaps per Daniel Vetter and Christian König. Pointers to struct gpucg and struct gpucg_device tracking the current associations were added to the dma_buf struct to achieve this. Fix incorrect Kconfig help section indentation per Randy Dunlap. History of the GPU cgroup controller ==================================== The GPU/DRM cgroup controller came into being when a consensus[1] was reached that the resources it tracked were unsuitable to be integrated into memcg. Originally, the proposed controller was specific to the DRM subsystem and was intended to track GEM buffers and GPU-specific resources[2]. In order to help establish a unified memory accounting model for all GPU and all related subsystems, Daniel Vetter put forth a suggestion to move it out of the DRM subsystem so that it can be used by other DMA-BUF exporters as well[3]. This RFC proposes an interface that does the same. [1]: https://patchwork.kernel.org/project/dri-devel/cover/20190501140438.9506-1-… [2]: https://lore.kernel.org/amd-gfx/20210126214626.16260-1-brian.welty@intel.co… [3]: https://lore.kernel.org/amd-gfx/YCVOl8%2F87bqRSQei@phenom.ffwll.local/ Hridya Valsaraju (3): gpu: rfc: Proposal for a GPU cgroup controller cgroup: gpu: Add a cgroup controller for allocator attribution of GPU memory binder: Add flags to relinquish ownership of fds T.J. Mercier (3): dmabuf: heaps: export system_heap buffers with GPU cgroup charging dmabuf: Add gpu cgroup charge transfer function selftests: Add binder cgroup gpu memory transfer tests Documentation/admin-guide/cgroup-v2.rst | 23 + drivers/android/binder.c | 31 +- drivers/dma-buf/dma-buf.c | 80 ++- drivers/dma-buf/dma-heap.c | 38 ++ drivers/dma-buf/heaps/system_heap.c | 28 +- include/linux/cgroup_gpu.h | 146 +++++ include/linux/cgroup_subsys.h | 4 + include/linux/dma-buf.h | 49 +- include/linux/dma-heap.h | 15 + include/uapi/linux/android/binder.h | 23 +- init/Kconfig | 7 + kernel/cgroup/Makefile | 1 + kernel/cgroup/gpu.c | 390 +++++++++++++ .../selftests/drivers/android/binder/Makefile | 8 + .../drivers/android/binder/binder_util.c | 250 +++++++++ .../drivers/android/binder/binder_util.h | 32 ++ .../selftests/drivers/android/binder/config | 4 + .../binder/test_dmabuf_cgroup_transfer.c | 526 ++++++++++++++++++ 18 files changed, 1632 insertions(+), 23 deletions(-) create mode 100644 include/linux/cgroup_gpu.h create mode 100644 kernel/cgroup/gpu.c create mode 100644 tools/testing/selftests/drivers/android/binder/Makefile create mode 100644 tools/testing/selftests/drivers/android/binder/binder_util.c create mode 100644 tools/testing/selftests/drivers/android/binder/binder_util.h create mode 100644 tools/testing/selftests/drivers/android/binder/config create mode 100644 tools/testing/selftests/drivers/android/binder/test_dmabuf_cgroup_transfer.c -- 2.36.0.512.ge40c2bad7a-goog

4 16

← Newer
1
...
30
31
32
33
34
35
36
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2022