dri-devel June 2021

dri-devel@lists.freedesktop.org

341 participants
878 discussions

[PATCH V5 1/2] dt-bindings: drm/bridge: ti-sn65dsi83: Add TI SN65DSI83 and SN65DSI84 bindings
by Marek Vasut 04 Jun '21

04 Jun '21

Add DT binding document for TI SN65DSI83 and SN65DSI84 DSI to LVDS bridge. Reviewed-by: Linus Walleij <linus.walleij(a)linaro.org> Reviewed-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Douglas Anderson <dianders(a)chromium.org> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Linus Walleij <linus.walleij(a)linaro.org> Cc: Rob Herring <robh+dt(a)kernel.org> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Stephen Boyd <swboyd(a)chromium.org> Cc: devicetree(a)vger.kernel.org To: dri-devel(a)lists.freedesktop.org --- V2: Add compatible string for SN65DSI84, since this is now tested on it V3: - Add 0x2c as valid i2c address - Switch to schemas/graph.yaml - Constraint data-lanes to <1>, <1 2>, <1 2 3>, <1 2 3 4> only - Indent example by 4 spaces - Handle dual-link LVDS with two ports and describe the second DSI channel-B port as well. Based on the register defaults of DSI83 and DSI84, it is likely that the LVDS-channel-B and DSI-channel-B hardware is present in all the chips, so just reuse port@0 and 2 for DSI83, port@0,2,3 for DSI84 and all of 0,1,2,3 for DSI85 when that is supported V4: - Fix typo in port@3 description - Add RB from Linus Walleij - Replace oneOf: and const with enum: - ref /schemas/media/video-interfaces.yaml# - Drop empty endpoint: and properties: V5: - Add RB from Rob Herring --- .../bindings/display/bridge/ti,sn65dsi83.yaml | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml diff --git a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml new file mode 100644 index 0000000000000..d101233ae17ff --- /dev/null +++ b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml @@ -0,0 +1,159 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/ti,sn65dsi83.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SN65DSI83 and SN65DSI84 DSI to LVDS bridge chip + +maintainers: + - Marek Vasut <marex(a)denx.de> + +description: | + Texas Instruments SN65DSI83 1x Single-link MIPI DSI + to 1x Single-link LVDS + https://www.ti.com/lit/gpn/sn65dsi83 + Texas Instruments SN65DSI84 1x Single-link MIPI DSI + to 1x Dual-link or 2x Single-link LVDS + https://www.ti.com/lit/gpn/sn65dsi84 + +properties: + compatible: + enum: + - ti,sn65dsi83 + - ti,sn65dsi84 + + reg: + enum: + - 0x2c + - 0x2d + + enable-gpios: + maxItems: 1 + description: GPIO specifier for bridge_en pin (active high). + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: Video port for MIPI DSI Channel-A input + + properties: + endpoint: + $ref: /schemas/media/video-interfaces.yaml# + unevaluatedProperties: false + + properties: + data-lanes: + description: array of physical DSI data lane indexes. + minItems: 1 + maxItems: 4 + items: + - const: 1 + - const: 2 + - const: 3 + - const: 4 + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: Video port for MIPI DSI Channel-B input + + properties: + endpoint: + $ref: /schemas/media/video-interfaces.yaml# + unevaluatedProperties: false + + properties: + data-lanes: + description: array of physical DSI data lane indexes. + minItems: 1 + maxItems: 4 + items: + - const: 1 + - const: 2 + - const: 3 + - const: 4 + + port@2: + $ref: /schemas/graph.yaml#/properties/port + description: Video port for LVDS Channel-A output (panel or bridge). + + port@3: + $ref: /schemas/graph.yaml#/properties/port + description: Video port for LVDS Channel-B output (panel or bridge). + + required: + - port@0 + - port@2 + +required: + - compatible + - reg + - enable-gpios + - ports + +allOf: + - if: + properties: + compatible: + contains: + const: ti,sn65dsi83 + then: + properties: + ports: + properties: + port@1: false + port@3: false + + - if: + properties: + compatible: + contains: + const: ti,sn65dsi84 + then: + properties: + ports: + properties: + port@1: false + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + bridge@2d { + compatible = "ti,sn65dsi83"; + reg = <0x2d>; + + enable-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + endpoint { + remote-endpoint = <&dsi0_out>; + data-lanes = <1 2 3 4>; + }; + }; + + port@2 { + reg = <2>; + + endpoint { + remote-endpoint = <&panel_in_lvds>; + }; + }; + }; + }; + }; -- 2.30.2

2 2

[PATCH] video: fbdev: aty: mach64_gx: Added parentheses for the macro
by lijian_8010a29＠163.com 04 Jun '21

04 Jun '21

From: lijian <lijian(a)yulong.com> Macros with complex values should be enclosed in parentheses， so Added parentheses for the macro 'MAX_N'. Signed-off-by: lijian <lijian(a)yulong.com> --- drivers/video/fbdev/aty/mach64_gx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/aty/mach64_gx.c b/drivers/video/fbdev/aty/mach64_gx.c index 9619661b7843..4d89c05e5a65 100644 --- a/drivers/video/fbdev/aty/mach64_gx.c +++ b/drivers/video/fbdev/aty/mach64_gx.c @@ -33,7 +33,7 @@ #define MIN_M 2 #define MAX_M 30 #define MIN_N 35 -#define MAX_N 255-8 +#define MAX_N (255-8) /* -- 2.25.1

1 0

[PATCH] video: fbdev: aty: mach64_gx: Removed unnecessary 'return'
by lijian_8010a29＠163.com 04 Jun '21

04 Jun '21

From: lijian <lijian(a)yulong.com> Removed unnecessary 'return' in void functions. Signed-off-by: lijian <lijian(a)yulong.com> --- drivers/video/fbdev/aty/mach64_gx.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/video/fbdev/aty/mach64_gx.c b/drivers/video/fbdev/aty/mach64_gx.c index 9c37e28fb78b..9619661b7843 100644 --- a/drivers/video/fbdev/aty/mach64_gx.c +++ b/drivers/video/fbdev/aty/mach64_gx.c @@ -58,7 +58,6 @@ static void aty_StrobeClock(const struct atyfb_par *par) tmp = aty_ld_8(CLOCK_CNTL, par); aty_st_8(CLOCK_CNTL + par->clk_wr_offset, tmp | CLOCK_STROBE, par); - return; } @@ -423,7 +422,6 @@ static void aty_ICS2595_put1bit(u8 data, const struct atyfb_par *par) par); aty_StrobeClock(par); - return; } static void aty_set_pll18818(const struct fb_info *info, @@ -480,7 +478,6 @@ static void aty_set_pll18818(const struct fb_info *info, mdelay(50); /* delay for 50 (15) ms */ aty_st_8(CLOCK_CNTL + par->clk_wr_offset, ((pll->ics2595.locationAddr & 0x0F) | CLOCK_STROBE), par); - return; } const struct aty_pll_ops aty_pll_ati18818_1 = { @@ -596,7 +593,6 @@ static void aty_set_pll_1703(const struct fb_info *info, (void) aty_ld_8(DAC_REGS, par); /* Clear DAC Counter */ aty_st_8(CRTC_GEN_CNTL + 3, old_crtc_ext_disp, par); - return; } const struct aty_pll_ops aty_pll_stg1703 = { @@ -718,8 +714,6 @@ static void aty_set_pll_8398(const struct fb_info *info, (void) aty_ld_8(DAC_REGS, par); /* Clear DAC Counter */ aty_st_8(CRTC_GEN_CNTL + 3, old_crtc_ext_disp, par); - - return; } const struct aty_pll_ops aty_pll_ch8398 = { @@ -866,7 +860,6 @@ static void aty_set_pll_408(const struct fb_info *info, (void) aty_ld_8(DAC_REGS, par); /* Clear DAC Counter */ aty_st_8(CRTC_GEN_CNTL + 3, old_crtc_ext_disp, par); - return; } const struct aty_pll_ops aty_pll_att20c408 = { -- 2.25.1

1 0

[PATCH] video: fbdev: uvesafb: Removed unnecessary 'return'
by lijian_8010a29＠163.com 04 Jun '21

04 Jun '21

From: lijian <lijian(a)yulong.com> Removed unnecessary 'return' in void function uvesafb_vbe_getmonspecs() and uvesafb_cn_callback(). Signed-off-by: lijian <lijian(a)yulong.com> --- drivers/video/fbdev/uvesafb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 4df6772802d7..28f353da668c 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -106,7 +106,6 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns memcpy(task->buf, utask + 1, task->t.buf_len); complete(task->done); - return; } static int uvesafb_helper_start(void) @@ -748,8 +747,6 @@ static void uvesafb_vbe_getmonspecs(struct uvesafb_ktask *task, fb_add_videomode(&info->monspecs.modedb[i], &info->modelist); } - - return; } static void uvesafb_vbe_getstatesize(struct uvesafb_ktask *task, -- 2.25.1

1 0

[PATCH] video: fbdev: cirrusfb: Removed unnecessary 'return'
by lijian_8010a29＠163.com 04 Jun '21

04 Jun '21

From: lijian <lijian(a)yulong.com> Removed unnecessary 'return' in void function init_vgachip(). Signed-off-by: lijian <lijian(a)yulong.com> --- drivers/video/fbdev/cirrusfb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c index 93802abbbc72..e726e7ac3eeb 100644 --- a/drivers/video/fbdev/cirrusfb.c +++ b/drivers/video/fbdev/cirrusfb.c @@ -1662,7 +1662,6 @@ static void init_vgachip(struct fb_info *info) /* misc... */ WHDR(cinfo, 0); /* Hidden DAC register: - */ - return; } static void switch_monitor(struct cirrusfb_info *cinfo, int on) -- 2.25.1

1 0

[PATCH] video: fbdev: hyperv_fb: Removed unnecessary 'return'
by lijian_8010a29＠163.com 04 Jun '21

04 Jun '21

From: lijian <lijian(a)yulong.com> Removed unnecessary 'return' in void function hvfb_get_option(). Signed-off-by: lijian <lijian(a)yulong.com> --- drivers/video/fbdev/hyperv_fb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 23999df52739..c8e57a513896 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -952,7 +952,6 @@ static void hvfb_get_option(struct fb_info *info) screen_width = x; screen_height = y; - return; } /* -- 2.25.1

1 0

[PATCH] video: fbdev: cyber2000fb: Removed unnecessary 'return'
by lijian_8010a29＠163.com 04 Jun '21

04 Jun '21

From: lijian <lijian(a)yulong.com> Removed unnecessary 'return' in void functions. Signed-off-by: lijian <lijian(a)yulong.com> --- drivers/video/fbdev/cyber2000fb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c index d45355b9a58c..ee17e7fa8f4b 100644 --- a/drivers/video/fbdev/cyber2000fb.c +++ b/drivers/video/fbdev/cyber2000fb.c @@ -231,7 +231,6 @@ static void cyber2000fb_imageblit(struct fb_info *info, const struct fb_image *image) { cfb_imageblit(info, image); - return; } static int cyber2000fb_sync(struct fb_info *info) -- 2.25.1

1 0

linux-next: manual merge of the amdgpu tree with the drm-misc tree
by Stephen Rothwell 04 Jun '21

04 Jun '21

Hi all, Today's linux-next merge of the amdgpu tree got conflicts in: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c between commit: d3116756a710 ("drm/ttm: rename bo->mem and make it a pointer") from the drm-misc tree and commits: b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs") 2a675640bc2d ("drm/amdgpu: move shadow bo validation to VM code") 59276f056fb7 ("drm/amdgpu: switch to amdgpu_bo_vm for vm code") 19a1d9350be6 ("drm/amdgpu: flush gart changes after all BO recovery") from the amdgpu tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 663aa7d2e2ea,86259435803e..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@@ -459,10 -479,11 +461,11 @@@ static int amdgpu_bo_move(struct ttm_bu { struct amdgpu_device *adev; struct amdgpu_bo *abo; - struct ttm_resource *old_mem = &bo->mem; + struct ttm_resource *old_mem = bo->resource; int r; - if (new_mem->mem_type == TTM_PL_TT) { + if (new_mem->mem_type == TTM_PL_TT || + new_mem->mem_type == AMDGPU_PL_PREEMPT) { r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, new_mem); if (r) return r; @@@ -989,8 -1012,9 +995,9 @@@ int amdgpu_ttm_alloc_gart(struct ttm_bu return r; } + amdgpu_gart_invalidate_tlb(adev); - ttm_resource_free(bo, &bo->mem); - bo->mem = tmp; + ttm_resource_free(bo, bo->resource); + ttm_bo_assign_mem(bo, &tmp); } return 0; @@@ -1348,7 -1373,16 +1356,16 @@@ static bool amdgpu_ttm_bo_eviction_valu } } - switch (bo->mem.mem_type) { + switch (bo->resource->mem_type) { + case AMDGPU_PL_PREEMPT: + /* Preemptible BOs don't own system resources managed by the + * driver (pages, VRAM, GART space). They point to resources + * owned by someone else (e.g. pageable memory in user mode + * or a DMABuf). They are used in a preemptible context so we + * can guarantee no deadlocks and good QoS in case of MMU + * notifiers or DMABuf move notifiers from the resource owner. + */ + return false; case TTM_PL_TT: if (amdgpu_bo_is_amdgpu_bo(bo) && amdgpu_bo_encrypted(ttm_to_amdgpu_bo(bo))) @@@ -1767,8 -1809,13 +1791,9 @@@ void amdgpu_ttm_fini(struct amdgpu_devi amdgpu_bo_free_kernel(&adev->mman.discovery_memory, NULL, NULL); amdgpu_ttm_fw_reserve_vram_fini(adev); - if (adev->mman.aper_base_kaddr) - iounmap(adev->mman.aper_base_kaddr); - adev->mman.aper_base_kaddr = NULL; - amdgpu_vram_mgr_fini(adev); amdgpu_gtt_mgr_fini(adev); + amdgpu_preempt_mgr_fini(adev); ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GDS); ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GWS); ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA); @@@ -1919,7 -2010,12 +1944,12 @@@ int amdgpu_fill_buffer(struct amdgpu_b return -EINVAL; } - if (bo->tbo.mem.mem_type == AMDGPU_PL_PREEMPT) { ++ if (bo->tbo.resource->mem_type == AMDGPU_PL_PREEMPT) { + DRM_ERROR("Trying to clear preemptible memory.\n"); + return -EINVAL; + } + - if (bo->tbo.mem.mem_type == TTM_PL_TT) { + if (bo->tbo.resource->mem_type == TTM_PL_TT) { r = amdgpu_ttm_alloc_gart(&bo->tbo); if (r) return r; diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index bcfd4a8d0288,1923f035713a..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@@ -657,11 -657,10 +658,11 @@@ void amdgpu_vm_move_to_lru_tail(struct if (!bo->parent) continue; - ttm_bo_move_to_lru_tail(&bo->tbo, &bo->tbo.mem, + ttm_bo_move_to_lru_tail(&bo->tbo, bo->tbo.resource, &vm->lru_bulk_move); - if (bo->shadow) - ttm_bo_move_to_lru_tail(&bo->shadow->tbo, + if (shadow) - ttm_bo_move_to_lru_tail(&shadow->tbo, &shadow->tbo.mem, ++ ttm_bo_move_to_lru_tail(&shadow->tbo, + bo->shadow->tbo.resource, &vm->lru_bulk_move); } spin_unlock(&adev->mman.bdev.lru_lock); @@@ -1818,11 -1853,12 +1859,12 @@@ int amdgpu_vm_bo_update(struct amdgpu_d struct drm_gem_object *gobj = dma_buf->priv; struct amdgpu_bo *abo = gem_to_amdgpu_bo(gobj); - if (abo->tbo.mem.mem_type == TTM_PL_VRAM) + if (abo->tbo.resource->mem_type == TTM_PL_VRAM) bo = gem_to_amdgpu_bo(gobj); } - mem = &bo->tbo.mem; + mem = bo->tbo.resource; - if (mem->mem_type == TTM_PL_TT) + if (mem->mem_type == TTM_PL_TT || + mem->mem_type == AMDGPU_PL_PREEMPT) pages_addr = bo->tbo.ttm->dma_address; }

1 2

[Bug 213321] New: Laptop not waking from sleep
by bugzilla-daemon＠bugzilla.kernel.org 04 Jun '21

04 Jun '21

https://bugzilla.kernel.org/show_bug.cgi?id=213321 Bug ID: 213321 Summary: Laptop not waking from sleep Product: Drivers Version: 2.5 Kernel Version: 5.12.8-arch1-1 Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: high Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: sujay1844(a)protonmail.com Regression: No Created attachment 297123 --> https://bugzilla.kernel.org/attachment.cgi?id=297123&action=edit System information My laptop doesn't wake up from sleep. Interestingly, it wakes up once. The next time I close and open it, I get a black screen. I have no other choice but to restart the computer. I have uploaded logs of dmesg, journalctl and my system information. The log is filled with the following line. > amdgpu: Msg issuing pre-check failed and SMU may be not in the right state! I run Arch linux. Kernel version 5.12.8-arch1-1. -- You may reply to this email to add a comment. You are receiving this mail because: You are watching the assignee of the bug.

1 5

[PATCH] drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends
by Kees Cook 04 Jun '21

04 Jun '21

VEXPRESS_CONFIG needs to either be missing, built-in, or modular when pl111 is modular. Update the Kconfig to reflect the need. Cc: Emma Anholt <emma(a)anholt.net> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: dri-devel(a)lists.freedesktop.org Fixes: 4dc7c97d04dc ("drm/pl111: depend on CONFIG_VEXPRESS_CONFIG") Signed-off-by: Kees Cook <keescook(a)chromium.org> --- drivers/gpu/drm/pl111/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig index c5210a5bef1b..b84879ca430d 100644 --- a/drivers/gpu/drm/pl111/Kconfig +++ b/drivers/gpu/drm/pl111/Kconfig @@ -2,7 +2,8 @@ config DRM_PL111 tristate "DRM Support for PL111 CLCD Controller" depends on DRM - depends on VEXPRESS_CONFIG + depends on ARM || ARM64 || COMPILE_TEST + depends on !VEXPRESS_CONFIG || VEXPRESS_CONFIG=DRM depends on COMMON_CLK select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER -- 2.25.1

2 3

← Newer
1
...
77
78
79
80
81
82
83
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2021