dri-devel July 2020

dri-devel@lists.freedesktop.org

336 participants
772 discussions

[PATCH] drm/v3d: Fix double free in gem code
by Nicolas Saenz Julienne 16 Jul '20

16 Jul '20

These two patches fix the same issue: - drm/v3d: Fix memory leak in v3d_submit_cl_ioctl (29cd13cfd76) - drm/v3d: don't leak bin job if v3d_job_init fails (0d352a3a8a1) And it seems that the conflict was missed during the merge. Get rid of one of the free() calls. Fixes: 77e0723bd27f ("Merge v5.4-rc7 into drm-next") Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne(a)suse.de> --- drivers/gpu/drm/v3d/v3d_gem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 915f8bfdb58c..3cfbdb8e6a91 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -570,7 +570,6 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, if (ret) { kfree(bin); v3d_job_put(&render->base); - kfree(bin); return ret; } -- 2.27.0

1 0

[PULL] drm-misc-next
by Maarten Lankhorst 16 Jul '20

16 Jul '20

drm-misc-next-2020-07-16: drm-misc-next for v5.9: UAPI Changes: Cross-subsystem Changes: - Add ckoenig as dma-buf maintainer. - Revert invalid fix for dma-fence-chain, and fix selftest. - Add fixmes to amifb about APUS support. - Use array3_size in fbcon_prepare_logo, and struct_size() in alloc_apertures. - Fix leaks in neofb, fb/savage and omapfb. - Other small fixes to fb code. - Convert some dt bindings to schema for some panels, and fix simple-framebuffer dt example. Core Changes: - Add DRM_FORMAT_MOD_GENERIC_16_16_TILE as alias to DRM_FORMAT_MOD_SAMSUNG_16_16_TILE, as it can be used more generic. - Add support for multiple DispID extension blocks in edid. - Use https instead of http for some of the urls. - Use drm_* macros for logging in mipi-dsi and fb-helper. - Further cleanup ttm_mem_reg handling. - Remove duplicated words in comments. Driver Changes: - Use __drm_atomic_helper_crtc_reset in all atomic drivers. - Add Amlogic Video FBC support to meson and fourcc to core. - Refactor hisilicon's hibmc_drv_vdac. - Create a TXP CRTC for vc4. - Rework cursor support in ast. - Fix runtime PM in STM. - Allow bigger cursors in vkms. - Cleanup sg handling in radeon and amdgpu, and stop creating dummy gtt nodes with ttm fixed. - Rework crtc handling in mgag200. - Miscellaneous small fixes to meson, vgem, bridge/dw-hdmi, panel/auo,b116xw03, panel/LG LB070WV8, lima, bridge/sil_sii8620, virtio, tilcdc. The following changes since commit 41752663b410c6265e24ff0570350b0b05ecdafe: drm/debug: Expose connector VRR monitor range via debugfs (2020-06-25 15:47:14 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2020-07-16 for you to fetch changes up to 947fcfeac3295ff0961bb50803e0c4ae63cff65b: drm: drm_rect.h: delete duplicated word in comment (2020-07-15 14:03:02 +0200) ---------------------------------------------------------------- Adam Ford (1): omapfb: dss: Fix max fclk divider for omap36xx Aditya Pakki (1): omapfb: fix multiple reference count leaks due to pm_runtime_get_sync Alexander A. Klimov (2): drm/panel: Replace HTTP links with HTTPS ones drm/bridge: Replace HTTP links with HTTPS ones Andrey Lebedev (1): drm/lima: Expose job_hang_limit module parameter Antonio Borneo (1): drm/connector: fix minor typos in comments Bartlomiej Zolnierkiewicz (2): video: fbdev: amifb: add FIXME about dead APUS support video: fbdev: amifb: add FIXMEs about {put,get}_user() failures Brian Starkey (1): drm: drm_fourcc: Add generic alias for 16_16_TILE modifier Chris Wilson (1): drm/vgem: Replace opencoded version of drm_gem_dumb_map_offset() Christian König (5): drm/ttm: cleanup ttm_mem_type_manager_func.get_node interface v3 drm/ttm: make TT creation purely optional v3 MAINTAINERS: Add myself as DMA-buf maintainer drm/ttm: further cleanup ttm_mem_reg handling drm/amdgpu: stop allocating dummy GTT nodes Daniel Vetter (8): drm/atomic-helper: reset vblank on crtc reset drm/amdgpu: Use __drm_atomic_helper_crtc_reset drm/imx: Use __drm_atomic_helper_crtc_reset drm/mtk: Use __drm_atomic_helper_crtc_reset drm/vc4: Use __drm_atomic_helper_crtc_reset drm/vmwgfx: Use __drm_atomic_helper_crtc_reset drm/tilcdc: Use standard drm_atomic_helper_commit drm/virtio: Remove open-coded commit-tail function Dmitry Osipenko (4): drm/panel-simple: Correct EDT ET057090DHU connector type drm/panel-simple: Add missing BUS descriptions for some panels of_graph: add of_graph_is_present() drm/of: Make drm_of_find_panel_or_bridge() to check graph's presence Emil Velikov (3): drm/dsi: use stack buffer in mipi_dsi_dcs_write() drm/panel: use mipi_dsi_dcs_write_buffer where possible drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline Evgeny Novikov (4): video: fbdev: savage: fix memory leak on error handling path in probe video: fbdev: neofb: fix memory leak in neo_scan_monitor() fbdev: da8xx-fb: go to proper label on error handling paths in probe fbdev: sm712fb: set error code in probe Gustavo A. R. Silva (2): fbcon: Use array3_size() helper in scr_memcpyw() fbdev/fb.h: Use struct_size() helper in kzalloc() Harigovindan P (1): drm/bridge: ti-sn65dsi86: ensure bridge suspend happens during PM sleep Icenowy Zheng (1): dt-bindings: vendor-prefixes: Add Xingbangda Imre Deak (1): drm/i915: Fix the old vs. new epoch counter check during hotplug detect Jason Yan (1): drm/zte: remove unneeded semicolon Jitao Shi (1): drm/panel: auo,b116xw03: fix flash backlight when power on Laurent Pinchart (6): dt-bindings: display: bridge: renesas,lvds: Convert binding to YAML drm: panel: simple: Correct connector type for Starry KR070PE2T drm: panel: simple: Correct bus format for Satoz SAT050AT40H12R2 drm: panel: simple: Drop drive/sample bus flags for LVDS panels drm: panel: simple: Warn in case of incorrect bus format for LVDS panels drm: panel: simple: Fix bpc for LG LB070WV8 panel Linus Walleij (3): drm: pl111: Credit where credit is due video: fbdev: amba-clcd: Retire elder CLCD driver drm: pl111: Absorb the external register header Lionel Landwerlin (2): Revert "dma-buf: Report signaled links inside dma-fence-chain" dma-buf: fix dma-fence-chain out of order test Liu Ying (2): drm/bridge: dw-hdmi: Don't cleanup i2c adapter and ddc ptr in __dw_hdmi_probe() bailout path drm/bridge: dw-hdmi: Always add the bridge in the global bridge list Maarten Lankhorst (1): Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next Marek Szyprowski (2): drm: amdgpu: fix common struct sg_table related issues drm: radeon: fix common struct sg_table related issues Marek Vasut (1): drm/stm: repair runtime power management Maxime Ripard (11): dt-bindings: display: vc4: dpi: Fix panel warning drm/vc4: Convert register accessors to FIELD_* drm/vc4: Reorder the bind order of the devices drm/vc4: crtc: Move HVS setup code to the HVS driver drm/vc4: crtc: Make state functions public drm/vc4: crtc: Split CRTC data in two drm/vc4: crtc: Only access the PixelValve registers if we have to drm/vc4: crtc: Move the CRTC initialisation to a separate function drm/vc4: crtc: Move the txp_armed function to the TXP drm/vc4: txp: Turn the TXP into a CRTC of its own drm/vc4: crtc: Remove the feed_txp tests Melissa Wen (1): drm/vkms: change the max cursor width/height Neil Armstrong (7): drm/fourcc: Add modifier definitions for describing Amlogic Video Framebuffer Compression drm/meson: add Amlogic Video FBC registers drm/meson: overlay: setup overlay for Amlogic FBC drm/meson: overlay: setup overlay for Amlogic FBC Memory Saving mode drm/meson: overlay: setup overlay for Amlogic FBC Scatter Memory layout drm/meson: crtc: handle commit of Amlogic FBC frames drm/meson: overlay: fix build failure Nirmoy Das (4): drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/scheduler: improve job distribution with multiple queues drm/ttm: do not keep GPU dependent addresses Ondrej Jirman (10): dt-bindings: panel: Convert rocktech,jh057n00900 to yaml dt-bindings: panel: Add compatible for Xingbangda XBD599 panel drm/panel: rocktech-jh057n00900: Rename the driver to st7703 drm/panel: st7703: Rename functions from jh057n prefix to st7703 drm/panel: st7703: Prepare for supporting multiple panels drm/panel: st7703: Move code specific to jh057n closer together drm/panel: st7703: Move generic part of init sequence to enable callback drm/panel: st7703: Add support for Xingbangda XBD599 drm/panel: st7703: Enter sleep after display off drm/panel: st7703: Assert reset prior to powering down the regulators Randy Dunlap (7): drm: drm_atomic.h: delete duplicated word in comment drm: drm_bridge.h: delete duplicated word in comment drm: drm_gem.h: delete duplicated words in comments drm: drm_mode_config.h: delete duplicated words in comments drm: i915_drm.h: delete duplicated words in comments drm: msm_drm.h: delete duplicated words in comments drm: drm_rect.h: delete duplicated word in comment Rikard Falkeborn (1): video: fbdev: vt8623fb: Constify static vga_regsets Rob Herring (1): dt-bindings: display: Convert connectors to DT schema Sam Ravnborg (11): drm/tidss: drop use of legacy drm_bus_flags drm/ingenic-drm: drop use of legacy drm_bus_flags drm/panel: raydium-rm67191: drop use of legacy drm_bus_flags drm/panel: novatek-nt39016: drop use of legacy drm_bus_flags drm/panel: panel-simple: drop use of legacy drm_bus_flags drm/drm_connector: drop legacy drm_bus_flags values drm/drm_connector: use inline comments for drm_bus_flags dt-bindings: display: convert innolux,p079zca to DT Schema dt-bindings: display: convert samsung,s6e8aa0 to DT Schema dt-bindings: display: convert sharp,lq101r1sx01 to DT Schema dt-bindings: fix simple-framebuffer example Stanislav Lisovskiy (3): drm: Add helper to compare edids. drm: Introduce epoch counter to drm_connector drm/i915: Send hotplug event if edid had changed Suraj Upadhyay (3): drm : Insert blank lines after declarations. drm: mipi-dsi: Convert logging to drm_* functions. drm: fb-helper: Convert logging to drm_* functions. Thomas Zimmermann (21): drm/ast: Move cursor functions to ast_cursor.c drm/ast: Pass struct ast_private instance to cursor init/fini functions drm/ast: Move cursor fb pinning and mapping into helper drm/ast: Update cursor image and checksum from same function drm/ast: Move cursor pageflip into helper drm/ast: Replace ast_cursor_move() with ast_cursor_show() drm/ast: Don't enable HW cursors twice during atomic update drm/ast: Add helper to hide cursor drm/ast: Keep cursor HW BOs mapped drm/ast: Managed cursor release drm/ast: Init cursors before creating modesetting structures drm/ast: Replace struct ast_crtc with struct drm_crtc drm/ast: Use managed mode-config init drm/ast: Initialize mode setting in ast_mode_config_init() drm/mgag200: Don't write-protect CRTC 0-7 while in mga_crtc_prepare() drm/mgag200: Move PLL setup out of mode-setting function drm/mgag200: Don't set or clear <scroff> field during modeset drm/mgag200: Split DPMS function into helpers drm/mgag200: Set/clear <syncrst> field in display enable/disable helpers drm/mgag200: Rename G200WB prepare/commit function drm/mgag200: Inline mga_crtc_{prepare, commit}() into enable function Tian Tao (2): drm/hisilicon: Use drmm_kzalloc() instead of devm_kzalloc() drm/hisilicon: Code refactoring for hibmc_drv_vdac Tom Rix (1): drm/bridge: sil_sii8620: initialize return of sii8620_readb Ville Syrjälä (4): drm/dp: Include the AUX CH name in the debug messages drm/edid: Allow looking for ext blocks starting from a specified index drm/edid: Iterate through all DispID ext blocks drm/edid: Clean up some curly braces Yannick Fertre (1): drm/stm: ltdc: remove call of pm-runtime functions

1 0

[PATCH 0/6] drm/ast: Managed MM
by Thomas Zimmermann 16 Jul '20

16 Jul '20

This is the second patchset for converting ast to managed DRM interfaces. This one addresses memory management. There will be another, final round of patches for converting DRM device structures as well. Patch #1 introduces managed initialization for VRAM MM. Other drivers using the VRAM helpers should be converted to this at some point. Patches #2 to #4 do some preparation that make ast look slightly nicer. Patch #5 fixes a long-standing bug that I found as part of the rework. Posting the GPU requires information about the installed DRAM. So the DRAM detection has to run before the GPU-posting code. This got reversed by a fix in v4.11. The patch restores the original correct order of these operations. As the GPU is usually posted by the VGA BIOS, the problem might not have shown up in practice. With all the cleanups in place, patch #6 switches memory management to mnaged interfaces. Tested on AST2100 HW. Thomas Zimmermann (6): drm/vram-helper: Managed vram helpers drm/ast: Rename ast_ttm.c to ast_mm.c drm/ast: Use managed VRAM-helper initialization drm/ast: Move VRAM size detection to ast_mm.c drm/ast: Initialize DRAM type before posting GPU drm/ast: Use managed MM initialization drivers/gpu/drm/ast/Makefile | 2 +- drivers/gpu/drm/ast/ast_drv.h | 2 - drivers/gpu/drm/ast/ast_main.c | 45 ++----------- drivers/gpu/drm/ast/{ast_ttm.c => ast_mm.c} | 73 ++++++++++++++++----- drivers/gpu/drm/drm_gem_vram_helper.c | 68 ++++++++++++++----- include/drm/drm_gem_vram_helper.h | 4 ++ 6 files changed, 118 insertions(+), 76 deletions(-) rename drivers/gpu/drm/ast/{ast_ttm.c => ast_mm.c} (64%) -- 2.27.0

3 10

[PATCH] drm: remove redundant assignment to variable 'ret'
by Jing Xiangfeng 16 Jul '20

16 Jul '20

The variable ret has been assigned the value '-EINVAL'. The assignment in the if() is redundant. We can remove it. Signed-off-by: Jing Xiangfeng <jingxiangfeng(a)huawei.com> --- drivers/gpu/drm/drm_auth.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 800ac39f3213..6e1b502f2797 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -299,7 +299,6 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, if (file_priv->master->lessor != NULL) { DRM_DEBUG_LEASE("Attempt to drop lessee %d as master\n", file_priv->master->lessee_id); - ret = -EINVAL; goto out_unlock; } -- 2.17.1

2 3

[PATCH] dt-bindings: display: sun8i-mixer: Remove duplicated 'iommus'
by Fabio Estevam 16 Jul '20

16 Jul '20

Commit 13871279ff5c ("arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage") introduced a double instance of 'iommus' causing the following build error with 'make dt_binding_check': found duplicate key "iommus" with value "{}" (original value: "{}") in "<unicode string>", line 45, column 3 Remove the double occurrence to fix this problem. Fixes: 13871279ff5c ("arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage") Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml index c2fbf0b06d32..c040eef56518 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml @@ -42,9 +42,6 @@ properties: resets: maxItems: 1 - iommus: - maxItems: 1 - ports: type: object description: | -- 2.17.1

2 1

Re: [PATCH 0/8] drm/mgag200: Support desktop chips
by Egbert Eich 16 Jul '20

16 Jul '20

Dave Airlie writes: > On Thu, 16 Jul 2020 at 00:59, Thomas Zimmermann <tzimmermann(a)suse.de> wrote: > > > > This patchset puts device initialization in the correct order and > > adds support for G200 Desktop chips (PCI ids 0x520 and 0x521). > > why? :-) > > I'm pretty sure I NAKed the previous version because the userspace > experience for these old cards was probably better with > xorg-x11-drv-mga, but hey maybe it isn't anymore and we should go > ahead. I know SuSE use these for testing, but apart from that do we > really think we have any users for this? > The reason I had added this was to enable me to test the basic functionality of this driver with a test box at my desk rather than having to rely on some remote screen setup to some server half way around the world ;) And I'm actually not sure if the user experience with this card with the xorg-x11-drv-mga is as good as it used to be in its prime time days. Cheers, Egbert.

1 0

[PATCH] drm/ttm: remove TTM_MEMTYPE_FLAG_CMA
by Christian König 16 Jul '20

16 Jul '20

The original intention was to avoid CPU page table unmaps when BOs move between the GTT and SYSTEM domain. The problem is that this never correctly handled changes in the caching attributes or backing pages. Just drop this for now and simply unmap the CPU page tables in all cases. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +-- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 34 ++++------------------ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +- include/drm/ttm/ttm_bo_driver.h | 1 - 6 files changed, 11 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 9c0f12f74af9..44fa8bc49d18 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -93,7 +93,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, man->func = &amdgpu_gtt_mgr_func; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; break; case TTM_PL_VRAM: /* "On-card" video ram */ @@ -108,7 +108,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, case AMDGPU_PL_OA: /* On-chip GDS memory*/ man->func = &ttm_bo_manager_func; - man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_FIXED; man->available_caching = TTM_PL_FLAG_UNCACHED; man->default_caching = TTM_PL_FLAG_UNCACHED; break; diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index a1037478fa3f..7883341f8c83 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -695,8 +695,7 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, TTM_PL_FLAG_WC; man->default_caching = TTM_PL_FLAG_WC; } else { - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | - TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; } diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 73085523fad7..54af06df865b 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -84,7 +84,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, man->func = &ttm_bo_manager_func; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; #if IS_ENABLED(CONFIG_AGP) if (rdev->flags & RADEON_IS_AGP) { if (!rdev->ddev->agp) { diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 8b9e7f62bea7..0768a054a916 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -272,20 +272,15 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx) { struct ttm_bo_device *bdev = bo->bdev; - bool old_is_pci = ttm_mem_reg_is_pci(bdev, &bo->mem); - bool new_is_pci = ttm_mem_reg_is_pci(bdev, mem); struct ttm_mem_type_manager *old_man = &bdev->man[bo->mem.mem_type]; struct ttm_mem_type_manager *new_man = &bdev->man[mem->mem_type]; - int ret = 0; + int ret; - if (old_is_pci || new_is_pci || - ((mem->placement & bo->mem.placement & TTM_PL_MASK_CACHING) == 0)) { - ret = ttm_mem_io_lock(old_man, true); - if (unlikely(ret != 0)) - goto out_err; - ttm_bo_unmap_virtual_locked(bo); - ttm_mem_io_unlock(old_man); - } + ret = ttm_mem_io_lock(old_man, true); + if (unlikely(ret != 0)) + goto out_err; + ttm_bo_unmap_virtual_locked(bo); + ttm_mem_io_unlock(old_man); /* * Create and bind a ttm if required. @@ -1698,23 +1693,6 @@ EXPORT_SYMBOL(ttm_bo_device_init); * buffer object vm functions. */ -bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) -{ - struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; - - if (!(man->flags & TTM_MEMTYPE_FLAG_FIXED)) { - if (mem->mem_type == TTM_PL_SYSTEM) - return false; - - if (man->flags & TTM_MEMTYPE_FLAG_CMA) - return false; - - if (mem->placement & TTM_PL_FLAG_CACHED) - return false; - } - return true; -} - void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo) { struct ttm_bo_device *bdev = bo->bdev; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index bfd0c54ec30a..6bea7548aee0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -762,7 +762,7 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, * slots as well as the bo size. */ man->func = &vmw_gmrid_manager_func; - man->flags = TTM_MEMTYPE_FLAG_CMA | TTM_MEMTYPE_FLAG_MAPPABLE; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; man->available_caching = TTM_PL_FLAG_CACHED; man->default_caching = TTM_PL_FLAG_CACHED; break; diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 45522e4fbd6b..71b195e78c7c 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -47,7 +47,6 @@ #define TTM_MEMTYPE_FLAG_FIXED (1 << 0) /* Fixed (on-card) PCI memory */ #define TTM_MEMTYPE_FLAG_MAPPABLE (1 << 1) /* Memory mappable */ -#define TTM_MEMTYPE_FLAG_CMA (1 << 3) /* Can't map aperture */ struct ttm_mem_type_manager; -- 2.17.1

1 0

[PATCH] drm/i915/display: Ensure that ret is always initialized in icl_combo_phy_verify_state
by Nathan Chancellor 16 Jul '20

16 Jul '20

Clang warns: drivers/gpu/drm/i915/display/intel_combo_phy.c:268:3: warning: variable 'ret' is uninitialized when used here [-Wuninitialized] ret &= check_phy_reg(dev_priv, phy, ICL_PORT_TX_DW8_LN0(phy), ^~~ drivers/gpu/drm/i915/display/intel_combo_phy.c:261:10: note: initialize the variable 'ret' to silence this warning bool ret; ^ = 0 1 warning generated. In practice, the bug this warning appears to be concerned with would not actually matter because ret gets initialized to the return value of cnl_verify_procmon_ref_values. However, that does appear to be a bug since it means the first hunk of the patch this fixes won't actually do anything (since the values of check_phy_reg won't factor into the final ret value). Initialize ret to true then make all of the assignments a bitwise AND with itself so that the function always does what it should do. Fixes: 239bef676d8e ("drm/i915/display: Implement new combo phy initialization step") Link: https://github.com/ClangBuiltLinux/linux/issues/1094 Signed-off-by: Nathan Chancellor <natechancellor(a)gmail.com> --- drivers/gpu/drm/i915/display/intel_combo_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c index eccaa79cb4a9..a4b8aa6d0a9e 100644 --- a/drivers/gpu/drm/i915/display/intel_combo_phy.c +++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c @@ -258,7 +258,7 @@ static bool phy_is_master(struct drm_i915_private *dev_priv, enum phy phy) static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, enum phy phy) { - bool ret; + bool ret = true; u32 expected_val = 0; if (!icl_combo_phy_enabled(dev_priv, phy)) @@ -276,7 +276,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, DCC_MODE_SELECT_CONTINUOSLY); } - ret = cnl_verify_procmon_ref_values(dev_priv, phy); + ret &= cnl_verify_procmon_ref_values(dev_priv, phy); if (phy_is_master(dev_priv, phy)) { ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy), base-commit: ca0e494af5edb59002665bf12871e94b4163a257 -- 2.28.0.rc0

2 1

[pull] amdgpu drm-fixes-5.8
by Alex Deucher 15 Jul '20

15 Jul '20

Hi Dave, Daniel, Fixes for 5.8. The following changes since commit 38794a5465b752118098e36cf95c59083f9f1f88: Merge tag 'amd-drm-fixes-5.8-2020-07-09' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2020-07-10 07:02:02 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/amd-drm-fixes-5.8-2020-07-15 for you to fetch changes up to 05051496b2622e4d12e2036b35165969aa502f89: drm/amdgpu/sdma5: fix wptr overwritten in ->get_wptr() (2020-07-14 15:42:17 -0400) ---------------------------------------------------------------- amd-drm-fixes-5.8-2020-07-15: amdgpu: - Fix a race condition with KIQ - Preemption fix - Fix handling of fake MST encoders - OLED panel fix - Handle allocation failure in stream construction - Renoir SMC fix - SDMA 5.x fix ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu/display: create fake mst encoders ahead of time (v4) Jack Xiao (2): drm/amdgpu/gfx10: fix race condition for kiq drm/amdgpu: fix preemption unit test Josip Pavic (1): drm/amd/display: handle failed allocation during stream construction Xiaojie Yuan (1): drm/amdgpu/sdma5: fix wptr overwritten in ->get_wptr() chen gong (1): drm/amdgpu/powerplay: Modify SMC message name for setting power profile mode hersen wu (1): drm/amd/display: OLED panel backlight adjust not work with external display connected drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 20 ++++++-- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +++- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 26 ++++------- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 11 ++++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 53 +++++++++++----------- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 ++ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 19 ++++++-- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 +- 9 files changed, 101 insertions(+), 56 deletions(-)

1 0

[PATCHv1 0/4] panel-dsi-cm: update bindings
by Sebastian Reichel 15 Jul '20

15 Jul '20

Subject: panel-dsi-cm: update bindings The cleanup series for omapdrm's DSI code got too big. Reviewing this is not fun and the same goes for keeping track of the change requests. Let's do the cleanup in smaller steps instead. This is the first batch, which updates the binding (txt -> yaml) and modifies the DT slightly. -- Sebastian Sebastian Reichel (4): dt-bindings: display: panel-dsi-cm: convert to YAML ARM: dts: omap: add channel to DSI panels ARM: dts: omap4-droid4: add panel compatible ARM: dts: omap4-droid4: add panel orientation .../bindings/display/panel/panel-dsi-cm.txt | 29 ----- .../bindings/display/panel/panel-dsi-cm.yaml | 100 ++++++++++++++++++ .../boot/dts/motorola-mapphone-common.dtsi | 6 +- arch/arm/boot/dts/omap3-n950.dts | 3 +- arch/arm/boot/dts/omap3.dtsi | 3 + arch/arm/boot/dts/omap4-sdp.dts | 6 +- arch/arm/boot/dts/omap4.dtsi | 6 ++ arch/arm/boot/dts/omap5.dtsi | 6 ++ 8 files changed, 125 insertions(+), 34 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt create mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi-cm.yaml -- 2.27.0

4 11

← Newer
1
...
47
48
49
50
51
52
53
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2020