Merge branch 'msm-fixes' into msm-next

Browse source

Back-merge msm-fixes to resolve msm-next conflicts.

Signed-off-by: Rob Clark <robdclark@chromium.org>

...

This commit is contained in:

Rob Clark 2024-10-20 13:34:03 -07:00

parent a20a91fb1b 77ad507dbb

commit 1fac1fa4a6

8 changed files with 89 additions and 59 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

View file

20

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

View file

68

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

View file

7

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c

View file

5

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c

View file

19

drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c

View file

4

drivers/gpu/drm/msm/dsi/dsi_host.c

View file

9

drivers/gpu/drm/msm/hdmi/hdmi_phy_8998.c

View file