diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-04-26 14:40:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-04-26 14:40:09 +1000 |
| commit | e39c35cea229e5393f0eae185d317da9ef75c583 (patch) | |
| tree | e52a09ae02e82b017b8eb033228c2e3b640939ac | |
| parent | 39beba4f19a160051669020b02dbe4cf457dc211 (diff) | |
| parent | 2e3f08a1ac99cb9a19a5cb151593d4f9df5cc6a7 (diff) | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d6327dc12cb1..23997d2ea91c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6766,7 +6766,7 @@ DRM DRIVER FOR LG SW43408 PANELS M: Sumit Semwal <sumit.semwal@linaro.org> M: Caleb Connolly <caleb.connolly@linaro.org> S: Maintained -T: git git://anongit.freedesktop.org/drm/drm-misc +T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/lg,sw43408.yaml F: drivers/gpu/drm/panel/panel-lg-sw43408.c diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 62ebbdb16253..9873172e3fd3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2344,7 +2344,7 @@ static void vop2_setup_layer_mixer(struct vop2_video_port *vp) port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT2_MUX, (vp2->nlayers + vp1->nlayers + vp0->nlayers - 1)); else - port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT1_MUX, 8); + port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT2_MUX, 8); layer_sel = vop2_readl(vop2, RK3568_OVL_LAYER_SEL); |