History

Merge tag 'drm-fixes-2023-12-15' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie: "More regular fixes, amdgpu, i915, mediatek and nouveau are most of them this week. Nothing too major, then a few misc bits and pieces in core, panel and ivpu. drm: - fix uninit problems in crtc - fix fd ownership check - edid: add modes in fallback paths panel: - move LG panel into DSI yaml - ltk050h3146w: set burst mode mediatek: - mtk_disp_gamma: Fix breakage due to merge issue - fix kernel oops if no crtc is found - Add spinlock for setting vblank event in atomic_begin - Fix access violation in mtk_drm_crtc_dma_dev_get i915: - Fix selftest engine reset count storage for multi-tile - Fix out-of-bounds reads for engine reset counts - Fix ADL+ remapped stride with CCS - Fix intel_atomic_setup_scalers() plane_state handling - Fix ADL+ tiled plane stride when the POT stride is smaller than the original - Fix eDP 1.4 rate select method link configuration amdgpu: - Fix suspend fix that got accidently mangled last week - Fix OD regression - PSR fixes - OLED Backlight regression fix - JPEG 4.0.5 fix - Misc display fixes - SDMA 5.2 fix - SDMA 2.4 regression fix - GPUVM race fix nouveau: - fix gk20a instobj hierarchy - fix headless iors inheritance regression ivpu: - fix WA initialisation" * tag 'drm-fixes-2023-12-15' of git://anongit.freedesktop.org/drm/drm: (31 commits) drm/nouveau/kms/nv50-: Don't allow inheritance of headless iors drm/nouveau: Fixup gk20a instobj hierarchy drm/amdgpu: warn when there are still mappings when a BO is destroyed v2 drm/amdgpu: fix tear down order in amdgpu_vm_pt_free drm/amd: Fix a probing order problem on SDMA 2.4 drm/amdgpu/sdma5.2: add begin/end_use ring callbacks drm/panel: ltk050h3146w: Set burst mode for ltk050h3148w dt-bindings: panel-simple-dsi: move LG 5" HD TFT LCD panel into DSI yaml drm/amd/display: Disable PSR-SU on Parade 0803 TCON again drm/amd/display: Populate dtbclk from bounding box drm/amd/display: Revert "Fix conversions between bytes and KB" drm/amdgpu/jpeg: configure doorbell for each playback drm/amd/display: Restore guard against default backlight value < 1 nit drm/amd/display: fix hw rotated modes when PSR-SU is enabled drm/amd/pm: fix pp_*clk_od typo drm/amdgpu: fix buffer funcs setting order on suspend harder drm/mediatek: Fix access violation in mtk_drm_crtc_dma_dev_get drm/edid: also call add modes in EDID connector update fallback drm/i915/edp: don't write to DP_LINK_BW_SET when using rate select drm/i915: Fix ADL+ tiled plane stride when the POT stride is smaller than the original ...

Linus Torvalds committed 2 years ago

Commit 595609b2 parents 3f71685 7ba84cb36 files · +190 −83Browse files

Unified · Split

36 files
  1. Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml +2 −0
  2. Documentation/devicetree/bindings/display/panel/panel-simple.yaml +0 −2
  3. drivers/accel/ivpu/ivpu_hw_37xx.c +9 −3
  4. drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 −2
  5. drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 −0
  6. drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +2 −1
  7. drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c +8 −7
  8. drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +2 −2
  9. drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +28 −0
  10. drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 −0
  11. drivers/gpu/drm/amd/display/dc/dc_hw_types.h +1 −0
  12. drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c +10 −2
  13. drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +9 −5
  14. drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +8 −8
  15. drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +3 −2
  16. drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +2 −1
  17. drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +2 −2
  18. drivers/gpu/drm/amd/display/modules/power/power_helpers.c +2 −0
  19. drivers/gpu/drm/amd/pm/amdgpu_pm.c +2 −2
  20. drivers/gpu/drm/drm_auth.c +1 −1
  21. drivers/gpu/drm/drm_crtc.c +4 −4
  22. drivers/gpu/drm/drm_edid.c +2 −1
  23. drivers/gpu/drm/i915/display/intel_dp_link_training.c +21 −10
  24. drivers/gpu/drm/i915/display/intel_fb.c +16 −3
  25. drivers/gpu/drm/i915/display/skl_scaler.c +1 −1
  26. drivers/gpu/drm/i915/gt/intel_reset.c +1 −1
  27. drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3 −2
  28. drivers/gpu/drm/i915/i915_gpu_error.h +10 −2
  29. drivers/gpu/drm/i915/selftests/igt_live_test.c +5 −4
  30. drivers/gpu/drm/i915/selftests/igt_live_test.h +2 −1
  31. drivers/gpu/drm/mediatek/mtk_disp_gamma.c +1 −1
  32. drivers/gpu/drm/mediatek/mtk_drm_crtc.c +13 −1
  33. drivers/gpu/drm/mediatek/mtk_drm_drv.c +4 −1
  34. drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c +1 −1
  35. drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c +9 −9
  36. drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c +1 −1
Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml+2−0
@@ -42,6 +42,8 @@ properties: · 41 unmodified lines
42 - lg,acx467akm-742 - lg,acx467akm-7
43 # LG Corporation 7" WXGA TFT LCD panel43 # LG Corporation 7" WXGA TFT LCD panel
44 - lg,ld070wx3-sl0144 - lg,ld070wx3-sl01
45 # LG Corporation 5" HD TFT LCD panel
46 - lg,lh500wx1-sd03
45 # One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel47 # One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel
46 - osddisplays,osd101t2587-53ts48 - osddisplays,osd101t2587-53ts
47 # Panasonic 10" WUXGA TFT LCD panel49 # Panasonic 10" WUXGA TFT LCD panel
Documentation/devicetree/bindings/display/panel/panel-simple.yaml+0−2
@@ -208,8 +208,6 @@ properties: · 207 unmodified lines
208 - lemaker,bl035-rgb-002208 - lemaker,bl035-rgb-002
209 # LG 7" (800x480 pixels) TFT LCD panel209 # LG 7" (800x480 pixels) TFT LCD panel
210 - lg,lb070wv8210 - lg,lb070wv8
211 # LG Corporation 5" HD TFT LCD panel
212 - lg,lh500wx1-sd03
213 # LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel211 # LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel
214 - lg,lp079qx1-sp0v212 - lg,lp079qx1-sp0v
215 # LG 9.7" (2048x1536 pixels) TFT LCD panel213 # LG 9.7" (2048x1536 pixels) TFT LCD panel
drivers/accel/ivpu/ivpu_hw_37xx.c+9−3
@@ -53,10 +53,12 @@ · 52 unmodified lines
53 53
54#define ICB_0_1_IRQ_MASK ((((u64)ICB_1_IRQ_MASK) << 32) | ICB_0_IRQ_MASK)54#define ICB_0_1_IRQ_MASK ((((u64)ICB_1_IRQ_MASK) << 32) | ICB_0_IRQ_MASK)
55 55
56#define BUTTRESS_IRQ_MASK ((REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE)) | \56#define BUTTRESS_IRQ_MASK ((REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, ATS_ERR)) | \
57 (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, ATS_ERR)) | \
58 (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, UFI_ERR)))57 (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, UFI_ERR)))
59 58
59#define BUTTRESS_ALL_IRQ_MASK (BUTTRESS_IRQ_MASK | \
60 (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE)))
61
60#define BUTTRESS_IRQ_ENABLE_MASK ((u32)~BUTTRESS_IRQ_MASK)62#define BUTTRESS_IRQ_ENABLE_MASK ((u32)~BUTTRESS_IRQ_MASK)
61#define BUTTRESS_IRQ_DISABLE_MASK ((u32)-1)63#define BUTTRESS_IRQ_DISABLE_MASK ((u32)-1)
62 64
@@ -74,8 +76,12 @@ static void ivpu_hw_wa_init(struct ivpu_device *vdev) · 11 unmodified lines
74 vdev->wa.clear_runtime_mem = false;76 vdev->wa.clear_runtime_mem = false;
75 vdev->wa.d3hot_after_power_off = true;77 vdev->wa.d3hot_after_power_off = true;
76 78
77 if (ivpu_device_id(vdev) == PCI_DEVICE_ID_MTL && ivpu_revision(vdev) < 4)79 REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, BUTTRESS_ALL_IRQ_MASK);
80 if (REGB_RD32(VPU_37XX_BUTTRESS_INTERRUPT_STAT) == BUTTRESS_ALL_IRQ_MASK) {
81 /* Writing 1s does not clear the interrupt status register */
78 vdev->wa.interrupt_clear_with_0 = true;82 vdev->wa.interrupt_clear_with_0 = true;
83 REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, 0x0);
84 }
79 85
80 IVPU_PRINT_WA(punit_disabled);86 IVPU_PRINT_WA(punit_disabled);
81 IVPU_PRINT_WA(clear_runtime_mem);87 IVPU_PRINT_WA(clear_runtime_mem);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c+0−2
@@ -4516,8 +4516,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) · 4515 unmodified lines
4516 4516
4517 amdgpu_ras_suspend(adev);4517 amdgpu_ras_suspend(adev);
4518 4518
4519 amdgpu_ttm_set_buffer_funcs_status(adev, false);
4520
4521 amdgpu_device_ip_suspend_phase1(adev);4519 amdgpu_device_ip_suspend_phase1(adev);
4522 4520
4523 if (!adev->in_s0ix)4521 if (!adev->in_s0ix)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c+2−0
@@ -1343,6 +1343,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) · 1342 unmodified lines
1343 1343
1344 abo = ttm_to_amdgpu_bo(bo);1344 abo = ttm_to_amdgpu_bo(bo);
1345 1345
1346 WARN_ON(abo->vm_bo);
1347
1346 if (abo->kfd_bo)1348 if (abo->kfd_bo)
1347 amdgpu_amdkfd_release_notify(abo);1349 amdgpu_amdkfd_release_notify(abo);
1348 1350
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c+2−1
@@ -642,13 +642,14 @@ static void amdgpu_vm_pt_free(struct amdgpu_vm_bo_base *entry) · 641 unmodified lines
642 642
643 if (!entry->bo)643 if (!entry->bo)
644 return;644 return;
645
646 entry->bo->vm_bo = NULL;
645 shadow = amdgpu_bo_shadowed(entry->bo);647 shadow = amdgpu_bo_shadowed(entry->bo);
646 if (shadow) {648 if (shadow) {
647 ttm_bo_set_bulk_move(&shadow->tbo, NULL);649 ttm_bo_set_bulk_move(&shadow->tbo, NULL);
648 amdgpu_bo_unref(&shadow);650 amdgpu_bo_unref(&shadow);
649 }651 }
650 ttm_bo_set_bulk_move(&entry->bo->tbo, NULL);652 ttm_bo_set_bulk_move(&entry->bo->tbo, NULL);
651 entry->bo->vm_bo = NULL;
652 653
653 spin_lock(&entry->vm->status_lock);654 spin_lock(&entry->vm->status_lock);
654 list_del(&entry->vm_status);655 list_del(&entry->vm_status);
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c+8−7
@@ -155,13 +155,6 @@ static int jpeg_v4_0_5_hw_init(void *handle) · 154 unmodified lines
155 struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;155 struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;
156 int r;156 int r;
157 157
158 adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
159 (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
160
161 WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
162 ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
163 VCN_JPEG_DB_CTRL__EN_MASK);
164
165 r = amdgpu_ring_test_helper(ring);158 r = amdgpu_ring_test_helper(ring);
166 if (r)159 if (r)
167 return r;160 return r;
@@ -336,6 +329,14 @@ static int jpeg_v4_0_5_start(struct amdgpu_device *adev) · 168 unmodified lines
336 if (adev->pm.dpm_enabled)329 if (adev->pm.dpm_enabled)
337 amdgpu_dpm_enable_jpeg(adev, true);330 amdgpu_dpm_enable_jpeg(adev, true);
338 331
332 /* doorbell programming is done for every playback */
333 adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
334 (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
335
336 WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
337 ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
338 VCN_JPEG_DB_CTRL__EN_MASK);
339
339 /* disable power gating */340 /* disable power gating */
340 r = jpeg_v4_0_5_disable_static_power_gating(adev);341 r = jpeg_v4_0_5_disable_static_power_gating(adev);
341 if (r)342 if (r)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c+2−2
@@ -813,12 +813,12 @@ static int sdma_v2_4_early_init(void *handle) · 812 unmodified lines
813 struct amdgpu_device *adev = (struct amdgpu_device *)handle;813 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
814 int r;814 int r;
815 815
816 adev->sdma.num_instances = SDMA_MAX_INSTANCE;
817
816 r = sdma_v2_4_init_microcode(adev);818 r = sdma_v2_4_init_microcode(adev);
817 if (r)819 if (r)
818 return r;820 return r;
819 821
820 adev->sdma.num_instances = SDMA_MAX_INSTANCE;
821
822 sdma_v2_4_set_ring_funcs(adev);822 sdma_v2_4_set_ring_funcs(adev);
823 sdma_v2_4_set_buffer_funcs(adev);823 sdma_v2_4_set_buffer_funcs(adev);
824 sdma_v2_4_set_vm_pte_funcs(adev);824 sdma_v2_4_set_vm_pte_funcs(adev);
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c+28−0
@@ -1643,6 +1643,32 @@ static void sdma_v5_2_get_clockgating_state(void *handle, u64 *flags) · 1642 unmodified lines
1643 *flags |= AMD_CG_SUPPORT_SDMA_LS;1643 *flags |= AMD_CG_SUPPORT_SDMA_LS;
1644}1644}
1645 1645
1646static void sdma_v5_2_ring_begin_use(struct amdgpu_ring *ring)
1647{
1648 struct amdgpu_device *adev = ring->adev;
1649
1650 /* SDMA 5.2.3 (RMB) FW doesn't seem to properly
1651 * disallow GFXOFF in some cases leading to
1652 * hangs in SDMA. Disallow GFXOFF while SDMA is active.
1653 * We can probably just limit this to 5.2.3,
1654 * but it shouldn't hurt for other parts since
1655 * this GFXOFF will be disallowed anyway when SDMA is
1656 * active, this just makes it explicit.
1657 */
1658 amdgpu_gfx_off_ctrl(adev, false);
1659}
1660
1661static void sdma_v5_2_ring_end_use(struct amdgpu_ring *ring)
1662{
1663 struct amdgpu_device *adev = ring->adev;
1664
1665 /* SDMA 5.2.3 (RMB) FW doesn't seem to properly
1666 * disallow GFXOFF in some cases leading to
1667 * hangs in SDMA. Allow GFXOFF when SDMA is complete.
1668 */
1669 amdgpu_gfx_off_ctrl(adev, true);
1670}
1671
1646const struct amd_ip_funcs sdma_v5_2_ip_funcs = {1672const struct amd_ip_funcs sdma_v5_2_ip_funcs = {
1647 .name = "sdma_v5_2",1673 .name = "sdma_v5_2",
1648 .early_init = sdma_v5_2_early_init,1674 .early_init = sdma_v5_2_early_init,
@@ -1690,6 +1716,8 @@ static const struct amdgpu_ring_funcs sdma_v5_2_ring_funcs = { · 41 unmodified lines
1690 .test_ib = sdma_v5_2_ring_test_ib,1716 .test_ib = sdma_v5_2_ring_test_ib,
1691 .insert_nop = sdma_v5_2_ring_insert_nop,1717 .insert_nop = sdma_v5_2_ring_insert_nop,
1692 .pad_ib = sdma_v5_2_ring_pad_ib,1718 .pad_ib = sdma_v5_2_ring_pad_ib,
1719 .begin_use = sdma_v5_2_ring_begin_use,
1720 .end_use = sdma_v5_2_ring_end_use,
1693 .emit_wreg = sdma_v5_2_ring_emit_wreg,1721 .emit_wreg = sdma_v5_2_ring_emit_wreg,
1694 .emit_reg_wait = sdma_v5_2_ring_emit_reg_wait,1722 .emit_reg_wait = sdma_v5_2_ring_emit_reg_wait,
1695 .emit_reg_write_reg_wait = sdma_v5_2_ring_emit_reg_write_reg_wait,1723 .emit_reg_write_reg_wait = sdma_v5_2_ring_emit_reg_write_reg_wait,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+3−0
@@ -5182,6 +5182,9 @@ static void fill_dc_dirty_rects(struct drm_plane *plane, · 5181 unmodified lines
5182 if (plane->type == DRM_PLANE_TYPE_CURSOR)5182 if (plane->type == DRM_PLANE_TYPE_CURSOR)
5183 return;5183 return;
5184 5184
5185 if (new_plane_state->rotation != DRM_MODE_ROTATE_0)
5186 goto ffu;
5187
5185 num_clips = drm_plane_get_damage_clips_count(new_plane_state);5188 num_clips = drm_plane_get_damage_clips_count(new_plane_state);
5186 clips = drm_plane_get_damage_clips(new_plane_state);5189 clips = drm_plane_get_damage_clips(new_plane_state);
5187 5190
drivers/gpu/drm/amd/display/dc/dc_hw_types.h+1−0
@@ -465,6 +465,7 @@ struct dc_cursor_mi_param { · 464 unmodified lines
465 struct fixed31_32 v_scale_ratio;465 struct fixed31_32 v_scale_ratio;
466 enum dc_rotation_angle rotation;466 enum dc_rotation_angle rotation;
467 bool mirror;467 bool mirror;
468 struct dc_stream_state *stream;
468};469};
469 470
470/* IPP related types */471/* IPP related types */
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c+10−2
@@ -1077,8 +1077,16 @@ void hubp2_cursor_set_position( · 1076 unmodified lines
1077 if (src_y_offset < 0)1077 if (src_y_offset < 0)
1078 src_y_offset = 0;1078 src_y_offset = 0;
1079 /* Save necessary cursor info x, y position. w, h is saved in attribute func. */1079 /* Save necessary cursor info x, y position. w, h is saved in attribute func. */
1080 hubp->cur_rect.x = src_x_offset + param->viewport.x;1080 if (param->stream->link->psr_settings.psr_version >= DC_PSR_VERSION_SU_1 &&
1081 hubp->cur_rect.y = src_y_offset + param->viewport.y;1081 param->rotation != ROTATION_ANGLE_0) {
1082 hubp->cur_rect.x = 0;
1083 hubp->cur_rect.y = 0;
1084 hubp->cur_rect.w = param->stream->timing.h_addressable;
1085 hubp->cur_rect.h = param->stream->timing.v_addressable;
1086 } else {
1087 hubp->cur_rect.x = src_x_offset + param->viewport.x;
1088 hubp->cur_rect.y = src_y_offset + param->viewport.y;
1089 }
1082}1090}
1083 1091
1084void hubp2_clk_cntl(struct hubp *hubp, bool enable)1092void hubp2_clk_cntl(struct hubp *hubp, bool enable)
drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c+9−5
@@ -124,7 +124,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 123 unmodified lines
124 .phyclk_mhz = 600.0,124 .phyclk_mhz = 600.0,
125 .phyclk_d18_mhz = 667.0,125 .phyclk_d18_mhz = 667.0,
126 .dscclk_mhz = 186.0,126 .dscclk_mhz = 186.0,
127 .dtbclk_mhz = 625.0,127 .dtbclk_mhz = 600.0,
128 },128 },
129 {129 {
130 .state = 1,130 .state = 1,
@@ -133,7 +133,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
133 .phyclk_mhz = 810.0,133 .phyclk_mhz = 810.0,
134 .phyclk_d18_mhz = 667.0,134 .phyclk_d18_mhz = 667.0,
135 .dscclk_mhz = 209.0,135 .dscclk_mhz = 209.0,
136 .dtbclk_mhz = 625.0,136 .dtbclk_mhz = 600.0,
137 },137 },
138 {138 {
139 .state = 2,139 .state = 2,
@@ -142,7 +142,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
142 .phyclk_mhz = 810.0,142 .phyclk_mhz = 810.0,
143 .phyclk_d18_mhz = 667.0,143 .phyclk_d18_mhz = 667.0,
144 .dscclk_mhz = 209.0,144 .dscclk_mhz = 209.0,
145 .dtbclk_mhz = 625.0,145 .dtbclk_mhz = 600.0,
146 },146 },
147 {147 {
148 .state = 3,148 .state = 3,
@@ -151,7 +151,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
151 .phyclk_mhz = 810.0,151 .phyclk_mhz = 810.0,
152 .phyclk_d18_mhz = 667.0,152 .phyclk_d18_mhz = 667.0,
153 .dscclk_mhz = 371.0,153 .dscclk_mhz = 371.0,
154 .dtbclk_mhz = 625.0,154 .dtbclk_mhz = 600.0,
155 },155 },
156 {156 {
157 .state = 4,157 .state = 4,
@@ -160,7 +160,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
160 .phyclk_mhz = 810.0,160 .phyclk_mhz = 810.0,
161 .phyclk_d18_mhz = 667.0,161 .phyclk_d18_mhz = 667.0,
162 .dscclk_mhz = 417.0,162 .dscclk_mhz = 417.0,
163 .dtbclk_mhz = 625.0,163 .dtbclk_mhz = 600.0,
164 },164 },
165 },165 },
166 .num_states = 5,166 .num_states = 5,
@@ -348,6 +348,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc, · 181 unmodified lines
348 clock_limits[i].socclk_mhz;348 clock_limits[i].socclk_mhz;
349 dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].memclk_mhz =349 dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].memclk_mhz =
350 clk_table->entries[i].memclk_mhz * clk_table->entries[i].wck_ratio;350 clk_table->entries[i].memclk_mhz * clk_table->entries[i].wck_ratio;
351 dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz =
352 clock_limits[i].dtbclk_mhz;
351 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels =353 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels =
352 clk_table->num_entries;354 clk_table->num_entries;
353 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_fclk_levels =355 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_fclk_levels =
@@ -360,6 +362,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc, · 6 unmodified lines
360 clk_table->num_entries;362 clk_table->num_entries;
361 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_memclk_levels =363 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_memclk_levels =
362 clk_table->num_entries;364 clk_table->num_entries;
365 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dtbclk_levels =
366 clk_table->num_entries;
363 }367 }
364 }368 }
365 369
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c+8−8
@@ -6329,7 +6329,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) · 6328 unmodified lines
6329 mode_lib->ms.NoOfDPPThisState,6329 mode_lib->ms.NoOfDPPThisState,
6330 mode_lib->ms.dpte_group_bytes,6330 mode_lib->ms.dpte_group_bytes,
6331 s->HostVMInefficiencyFactor,6331 s->HostVMInefficiencyFactor,
6332 mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024,6332 mode_lib->ms.soc.hostvm_min_page_size_kbytes,
6333 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels);6333 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels);
6334 6334
6335 s->NextMaxVStartup = s->MaxVStartupAllPlanes[j];6335 s->NextMaxVStartup = s->MaxVStartupAllPlanes[j];
@@ -6542,7 +6542,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) · 206 unmodified lines
6542 mode_lib->ms.cache_display_cfg.plane.HostVMEnable,6542 mode_lib->ms.cache_display_cfg.plane.HostVMEnable,
6543 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels,6543 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels,
6544 mode_lib->ms.cache_display_cfg.plane.GPUVMEnable,6544 mode_lib->ms.cache_display_cfg.plane.GPUVMEnable,
6545 mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024,6545 mode_lib->ms.soc.hostvm_min_page_size_kbytes,
6546 mode_lib->ms.PDEAndMetaPTEBytesPerFrame[j][k],6546 mode_lib->ms.PDEAndMetaPTEBytesPerFrame[j][k],
6547 mode_lib->ms.MetaRowBytes[j][k],6547 mode_lib->ms.MetaRowBytes[j][k],
6548 mode_lib->ms.DPTEBytesPerRow[j][k],6548 mode_lib->ms.DPTEBytesPerRow[j][k],
@@ -7687,7 +7687,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) · 1138 unmodified lines
7687 CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;7687 CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;
7688 CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;7688 CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;
7689 CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes;7689 CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes;
7690 CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024;7690 CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes;
7691 CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn;7691 CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn;
7692 CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode;7692 CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode;
7693 CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = mode_lib->ms.PTEBufferSizeNotExceededPerState;7693 CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = mode_lib->ms.PTEBufferSizeNotExceededPerState;
@@ -7957,7 +7957,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) · 263 unmodified lines
7957 UseMinimumDCFCLK_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;7957 UseMinimumDCFCLK_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;
7958 UseMinimumDCFCLK_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable;7958 UseMinimumDCFCLK_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable;
7959 UseMinimumDCFCLK_params->NumberOfActiveSurfaces = mode_lib->ms.num_active_planes;7959 UseMinimumDCFCLK_params->NumberOfActiveSurfaces = mode_lib->ms.num_active_planes;
7960 UseMinimumDCFCLK_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024;7960 UseMinimumDCFCLK_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes;
7961 UseMinimumDCFCLK_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;7961 UseMinimumDCFCLK_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;
7962 UseMinimumDCFCLK_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled;7962 UseMinimumDCFCLK_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled;
7963 UseMinimumDCFCLK_params->ImmediateFlipRequirement = s->ImmediateFlipRequiredFinal;7963 UseMinimumDCFCLK_params->ImmediateFlipRequirement = s->ImmediateFlipRequiredFinal;
@@ -8699,7 +8699,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 735 unmodified lines
8699 CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;8699 CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;
8700 CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;8700 CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;
8701 CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes;8701 CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes;
8702 CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024;8702 CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes;
8703 CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn;8703 CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn;
8704 CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode;8704 CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode;
8705 CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = s->dummy_boolean_array[0];8705 CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = s->dummy_boolean_array[0];
@@ -8805,7 +8805,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 99 unmodified lines
8805 mode_lib->ms.cache_display_cfg.hw.DPPPerSurface,8805 mode_lib->ms.cache_display_cfg.hw.DPPPerSurface,
8806 locals->dpte_group_bytes,8806 locals->dpte_group_bytes,
8807 s->HostVMInefficiencyFactor,8807 s->HostVMInefficiencyFactor,
8808 mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024,8808 mode_lib->ms.soc.hostvm_min_page_size_kbytes,
8809 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels);8809 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels);
8810 8810
8811 locals->TCalc = 24.0 / locals->DCFCLKDeepSleep;8811 locals->TCalc = 24.0 / locals->DCFCLKDeepSleep;
@@ -8995,7 +8995,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 183 unmodified lines
8995 CalculatePrefetchSchedule_params->GPUVMEnable = mode_lib->ms.cache_display_cfg.plane.GPUVMEnable;8995 CalculatePrefetchSchedule_params->GPUVMEnable = mode_lib->ms.cache_display_cfg.plane.GPUVMEnable;
8996 CalculatePrefetchSchedule_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable;8996 CalculatePrefetchSchedule_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable;
8997 CalculatePrefetchSchedule_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;8997 CalculatePrefetchSchedule_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;
8998 CalculatePrefetchSchedule_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024;8998 CalculatePrefetchSchedule_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes;
8999 CalculatePrefetchSchedule_params->DynamicMetadataEnable = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataEnable[k];8999 CalculatePrefetchSchedule_params->DynamicMetadataEnable = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataEnable[k];
9000 CalculatePrefetchSchedule_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled;9000 CalculatePrefetchSchedule_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled;
9001 CalculatePrefetchSchedule_params->DynamicMetadataLinesBeforeActiveRequired = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataLinesBeforeActiveRequired[k];9001 CalculatePrefetchSchedule_params->DynamicMetadataLinesBeforeActiveRequired = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataLinesBeforeActiveRequired[k];
@@ -9240,7 +9240,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 238 unmodified lines
9240 mode_lib->ms.cache_display_cfg.plane.HostVMEnable,9240 mode_lib->ms.cache_display_cfg.plane.HostVMEnable,
9241 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels,9241 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels,
9242 mode_lib->ms.cache_display_cfg.plane.GPUVMEnable,9242 mode_lib->ms.cache_display_cfg.plane.GPUVMEnable,
9243 mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024,9243 mode_lib->ms.soc.hostvm_min_page_size_kbytes,
9244 locals->PDEAndMetaPTEBytesFrame[k],9244 locals->PDEAndMetaPTEBytesFrame[k],
9245 locals->MetaRowByte[k],9245 locals->MetaRowByte[k],
9246 locals->PixelPTEBytesPerRow[k],9246 locals->PixelPTEBytesPerRow[k],
drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c+3−2
@@ -423,8 +423,9 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc, · 422 unmodified lines
423 }423 }
424 424
425 for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dtbclk_levels; i++) {425 for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dtbclk_levels; i++) {
426 p->in_states->state_array[i].dtbclk_mhz =426 if (dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz > 0)
427 dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz;427 p->in_states->state_array[i].dtbclk_mhz =
428 dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz;
428 }429 }
429 430
430 for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dispclk_levels; i++) {431 for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dispclk_levels; i++) {
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c+2−1
@@ -3417,7 +3417,8 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) · 3416 unmodified lines
3417 .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz,3417 .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz,
3418 .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert,3418 .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert,
3419 .rotation = pipe_ctx->plane_state->rotation,3419 .rotation = pipe_ctx->plane_state->rotation,
3420 .mirror = pipe_ctx->plane_state->horizontal_mirror3420 .mirror = pipe_ctx->plane_state->horizontal_mirror,
3421 .stream = pipe_ctx->stream,
3421 };3422 };
3422 bool pipe_split_on = false;3423 bool pipe_split_on = false;
3423 bool odm_combine_on = (pipe_ctx->next_odm_pipe != NULL) ||3424 bool odm_combine_on = (pipe_ctx->next_odm_pipe != NULL) ||
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c+2−2
@@ -287,8 +287,8 @@ bool set_default_brightness_aux(struct dc_link *link) · 286 unmodified lines
287 if (link && link->dpcd_sink_ext_caps.bits.oled == 1) {287 if (link && link->dpcd_sink_ext_caps.bits.oled == 1) {
288 if (!read_default_bl_aux(link, &default_backlight))288 if (!read_default_bl_aux(link, &default_backlight))
289 default_backlight = 150000;289 default_backlight = 150000;
290 // if > 5000, it might be wrong readback290 // if < 1 nits or > 5000, it might be wrong readback
291 if (default_backlight > 5000000)291 if (default_backlight < 1000 || default_backlight > 5000000)
292 default_backlight = 150000;292 default_backlight = 150000;
293 293
294 return edp_set_backlight_level_nits(link, true,294 return edp_set_backlight_level_nits(link, true,
drivers/gpu/drm/amd/display/modules/power/power_helpers.c+2−0
@@ -839,6 +839,8 @@ bool is_psr_su_specific_panel(struct dc_link *link) · 838 unmodified lines
839 ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) ||839 ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) ||
840 (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07)))840 (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07)))
841 isPSRSUSupported = false;841 isPSRSUSupported = false;
842 else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03)
843 isPSRSUSupported = false;
842 else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1)844 else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1)
843 isPSRSUSupported = true;845 isPSRSUSupported = true;
844 }846 }
drivers/gpu/drm/amd/pm/amdgpu_pm.c+2−2
@@ -2198,10 +2198,10 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ · 2197 unmodified lines
2198 } else if (DEVICE_ATTR_IS(xgmi_plpd_policy)) {2198 } else if (DEVICE_ATTR_IS(xgmi_plpd_policy)) {
2199 if (amdgpu_dpm_get_xgmi_plpd_mode(adev, NULL) == XGMI_PLPD_NONE)2199 if (amdgpu_dpm_get_xgmi_plpd_mode(adev, NULL) == XGMI_PLPD_NONE)
2200 *states = ATTR_STATE_UNSUPPORTED;2200 *states = ATTR_STATE_UNSUPPORTED;
2201 } else if (DEVICE_ATTR_IS(pp_dpm_mclk_od)) {2201 } else if (DEVICE_ATTR_IS(pp_mclk_od)) {
2202 if (amdgpu_dpm_get_mclk_od(adev) == -EOPNOTSUPP)2202 if (amdgpu_dpm_get_mclk_od(adev) == -EOPNOTSUPP)
2203 *states = ATTR_STATE_UNSUPPORTED;2203 *states = ATTR_STATE_UNSUPPORTED;
2204 } else if (DEVICE_ATTR_IS(pp_dpm_sclk_od)) {2204 } else if (DEVICE_ATTR_IS(pp_sclk_od)) {
2205 if (amdgpu_dpm_get_sclk_od(adev) == -EOPNOTSUPP)2205 if (amdgpu_dpm_get_sclk_od(adev) == -EOPNOTSUPP)
2206 *states = ATTR_STATE_UNSUPPORTED;2206 *states = ATTR_STATE_UNSUPPORTED;
2207 } else if (DEVICE_ATTR_IS(apu_thermal_cap)) {2207 } else if (DEVICE_ATTR_IS(apu_thermal_cap)) {
drivers/gpu/drm/drm_auth.c+1−1
@@ -236,7 +236,7 @@ static int · 235 unmodified lines
236drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv)236drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv)
237{237{
238 if (file_priv->was_master &&238 if (file_priv->was_master &&
239 rcu_access_pointer(file_priv->pid) == task_pid(current))239 rcu_access_pointer(file_priv->pid) == task_tgid(current))
240 return 0;240 return 0;
241 241
242 if (!capable(CAP_SYS_ADMIN))242 if (!capable(CAP_SYS_ADMIN))
drivers/gpu/drm/drm_crtc.c+4−4
@@ -715,8 +715,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, · 714 unmodified lines
715 struct drm_mode_set set;715 struct drm_mode_set set;
716 uint32_t __user *set_connectors_ptr;716 uint32_t __user *set_connectors_ptr;
717 struct drm_modeset_acquire_ctx ctx;717 struct drm_modeset_acquire_ctx ctx;
718 int ret;718 int ret, i, num_connectors = 0;
719 int i;
720 719
721 if (!drm_core_check_feature(dev, DRIVER_MODESET))720 if (!drm_core_check_feature(dev, DRIVER_MODESET))
722 return -EOPNOTSUPP;721 return -EOPNOTSUPP;
@@ -871,6 +870,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, · 148 unmodified lines
871 connector->name);870 connector->name);
872 871
873 connector_set[i] = connector;872 connector_set[i] = connector;
873 num_connectors++;
874 }874 }
875 }875 }
876 876
@@ -879,7 +879,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, · 2 unmodified lines
879 set.y = crtc_req->y;879 set.y = crtc_req->y;
880 set.mode = mode;880 set.mode = mode;
881 set.connectors = connector_set;881 set.connectors = connector_set;
882 set.num_connectors = crtc_req->count_connectors;882 set.num_connectors = num_connectors;
883 set.fb = fb;883 set.fb = fb;
884 884
885 if (drm_drv_uses_atomic_modeset(dev))885 if (drm_drv_uses_atomic_modeset(dev))
@@ -892,7 +892,7 @@ out: · 6 unmodified lines
892 drm_framebuffer_put(fb);892 drm_framebuffer_put(fb);
893 893
894 if (connector_set) {894 if (connector_set) {
895 for (i = 0; i < crtc_req->count_connectors; i++) {895 for (i = 0; i < num_connectors; i++) {
896 if (connector_set[i])896 if (connector_set[i])
897 drm_connector_put(connector_set[i]);897 drm_connector_put(connector_set[i]);
898 }898 }
drivers/gpu/drm/drm_edid.c+2−1
@@ -2309,7 +2309,8 @@ int drm_edid_override_connector_update(struct drm_connector *connector) · 2308 unmodified lines
2309 2309
2310 override = drm_edid_override_get(connector);2310 override = drm_edid_override_get(connector);
2311 if (override) {2311 if (override) {
2312 num_modes = drm_edid_connector_update(connector, override);2312 if (drm_edid_connector_update(connector, override) == 0)
2313 num_modes = drm_edid_connector_add_modes(connector);
2313 2314
2314 drm_edid_free(override);2315 drm_edid_free(override);
2315 2316
drivers/gpu/drm/i915/display/intel_dp_link_training.c+21−10
@@ -650,19 +650,30 @@ intel_dp_update_link_bw_set(struct intel_dp *intel_dp, · 649 unmodified lines
650 const struct intel_crtc_state *crtc_state,650 const struct intel_crtc_state *crtc_state,
651 u8 link_bw, u8 rate_select)651 u8 link_bw, u8 rate_select)
652{652{
653 u8 link_config[2];653 u8 lane_count = crtc_state->lane_count;
654 654
655 /* Write the link configuration data */
656 link_config[0] = link_bw;
657 link_config[1] = crtc_state->lane_count;
658 if (crtc_state->enhanced_framing)655 if (crtc_state->enhanced_framing)
659 link_config[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN;656 lane_count |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
660 drm_dp_dpcd_write(&intel_dp->aux, DP_LINK_BW_SET, link_config, 2);657
658 if (link_bw) {
659 /* DP and eDP v1.3 and earlier link bw set method. */
660 u8 link_config[] = { link_bw, lane_count };
661 661
662 /* eDP 1.4 rate select method. */662 drm_dp_dpcd_write(&intel_dp->aux, DP_LINK_BW_SET, link_config,
663 if (!link_bw)663 ARRAY_SIZE(link_config));
664 drm_dp_dpcd_write(&intel_dp->aux, DP_LINK_RATE_SET,664 } else {
665 &rate_select, 1);665 /*
666 * eDP v1.4 and later link rate set method.
667 *
668 * eDP v1.4x sinks shall ignore DP_LINK_RATE_SET if
669 * DP_LINK_BW_SET is set. Avoid writing DP_LINK_BW_SET.
670 *
671 * eDP v1.5 sinks allow choosing either, and the last choice
672 * shall be active.
673 */
674 drm_dp_dpcd_writeb(&intel_dp->aux, DP_LANE_COUNT_SET, lane_count);
675 drm_dp_dpcd_writeb(&intel_dp->aux, DP_LINK_RATE_SET, rate_select);
676 }
666}677}
667 678
668/*679/*
drivers/gpu/drm/i915/display/intel_fb.c+16−3
@@ -1374,7 +1374,8 @@ plane_view_scanout_stride(const struct intel_framebuffer *fb, int color_plane, · 1373 unmodified lines
1374 struct drm_i915_private *i915 = to_i915(fb->base.dev);1374 struct drm_i915_private *i915 = to_i915(fb->base.dev);
1375 unsigned int stride_tiles;1375 unsigned int stride_tiles;
1376 1376
1377 if (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14)1377 if ((IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14) &&
1378 src_stride_tiles < dst_stride_tiles)
1378 stride_tiles = src_stride_tiles;1379 stride_tiles = src_stride_tiles;
1379 else1380 else
1380 stride_tiles = dst_stride_tiles;1381 stride_tiles = dst_stride_tiles;
@@ -1501,8 +1502,20 @@ static u32 calc_plane_remap_info(const struct intel_framebuffer *fb, int color_p · 120 unmodified lines
1501 1502
1502 size += remap_info->size;1503 size += remap_info->size;
1503 } else {1504 } else {
1504 unsigned int dst_stride = plane_view_dst_stride_tiles(fb, color_plane,1505 unsigned int dst_stride;
1505 remap_info->width);1506
1507 /*
1508 * The hardware automagically calculates the CCS AUX surface
1509 * stride from the main surface stride so can't really remap a
1510 * smaller subset (unless we'd remap in whole AUX page units).
1511 */
1512 if (intel_fb_needs_pot_stride_remap(fb) &&
1513 intel_fb_is_ccs_modifier(fb->base.modifier))
1514 dst_stride = remap_info->src_stride;
1515 else
1516 dst_stride = remap_info->width;
1517
1518 dst_stride = plane_view_dst_stride_tiles(fb, color_plane, dst_stride);
1506 1519
1507 assign_chk_ovf(i915, remap_info->dst_stride, dst_stride);1520 assign_chk_ovf(i915, remap_info->dst_stride, dst_stride);
1508 color_plane_info->mapping_stride = dst_stride *1521 color_plane_info->mapping_stride = dst_stride *
drivers/gpu/drm/i915/display/skl_scaler.c+1−1
@@ -504,7 +504,6 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, · 503 unmodified lines
504{504{
505 struct drm_plane *plane = NULL;505 struct drm_plane *plane = NULL;
506 struct intel_plane *intel_plane;506 struct intel_plane *intel_plane;
507 struct intel_plane_state *plane_state = NULL;
508 struct intel_crtc_scaler_state *scaler_state =507 struct intel_crtc_scaler_state *scaler_state =
509 &crtc_state->scaler_state;508 &crtc_state->scaler_state;
510 struct drm_atomic_state *drm_state = crtc_state->uapi.state;509 struct drm_atomic_state *drm_state = crtc_state->uapi.state;
@@ -536,6 +535,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, · 25 unmodified lines
536 535
537 /* walkthrough scaler_users bits and start assigning scalers */536 /* walkthrough scaler_users bits and start assigning scalers */
538 for (i = 0; i < sizeof(scaler_state->scaler_users) * 8; i++) {537 for (i = 0; i < sizeof(scaler_state->scaler_users) * 8; i++) {
538 struct intel_plane_state *plane_state = NULL;
539 int *scaler_id;539 int *scaler_id;
540 const char *name;540 const char *name;
541 int idx, ret;541 int idx, ret;
drivers/gpu/drm/i915/gt/intel_reset.c+1−1
@@ -1293,7 +1293,7 @@ int __intel_engine_reset_bh(struct intel_engine_cs *engine, const char *msg) · 1292 unmodified lines
1293 if (msg)1293 if (msg)
1294 drm_notice(&engine->i915->drm,1294 drm_notice(&engine->i915->drm,
1295 "Resetting %s for %s\n", engine->name, msg);1295 "Resetting %s for %s\n", engine->name, msg);
1296 atomic_inc(&engine->i915->gpu_error.reset_engine_count[engine->uabi_class]);1296 i915_increase_reset_engine_count(&engine->i915->gpu_error, engine);
1297 1297
1298 ret = intel_gt_reset_engine(engine);1298 ret = intel_gt_reset_engine(engine);
1299 if (ret) {1299 if (ret) {
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+3−2
@@ -5001,7 +5001,8 @@ static void capture_error_state(struct intel_guc *guc, · 5000 unmodified lines
5001 if (match) {5001 if (match) {
5002 intel_engine_set_hung_context(e, ce);5002 intel_engine_set_hung_context(e, ce);
5003 engine_mask |= e->mask;5003 engine_mask |= e->mask;
5004 atomic_inc(&i915->gpu_error.reset_engine_count[e->uabi_class]);5004 i915_increase_reset_engine_count(&i915->gpu_error,
5005 e);
5005 }5006 }
5006 }5007 }
5007 5008
@@ -5013,7 +5014,7 @@ static void capture_error_state(struct intel_guc *guc, · 5 unmodified lines
5013 } else {5014 } else {
5014 intel_engine_set_hung_context(ce->engine, ce);5015 intel_engine_set_hung_context(ce->engine, ce);
5015 engine_mask = ce->engine->mask;5016 engine_mask = ce->engine->mask;
5016 atomic_inc(&i915->gpu_error.reset_engine_count[ce->engine->uabi_class]);5017 i915_increase_reset_engine_count(&i915->gpu_error, ce->engine);
5017 }5018 }
5018 5019
5019 with_intel_runtime_pm(&i915->runtime_pm, wakeref)5020 with_intel_runtime_pm(&i915->runtime_pm, wakeref)
drivers/gpu/drm/i915/i915_gpu_error.h+10−2
@@ -16,6 +16,7 @@ · 15 unmodified lines
16 16
17#include "display/intel_display_device.h"17#include "display/intel_display_device.h"
18#include "gt/intel_engine.h"18#include "gt/intel_engine.h"
19#include "gt/intel_engine_types.h"
19#include "gt/intel_gt_types.h"20#include "gt/intel_gt_types.h"
20#include "gt/uc/intel_uc_fw.h"21#include "gt/uc/intel_uc_fw.h"
21 22
@@ -232,7 +233,7 @@ struct i915_gpu_error { · 210 unmodified lines
232 atomic_t reset_count;233 atomic_t reset_count;
233 234
234 /** Number of times an engine has been reset */235 /** Number of times an engine has been reset */
235 atomic_t reset_engine_count[I915_NUM_ENGINES];236 atomic_t reset_engine_count[MAX_ENGINE_CLASS];
236};237};
237 238
238struct drm_i915_error_state_buf {239struct drm_i915_error_state_buf {
@@ -255,7 +256,14 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error) · 16 unmodified lines
255static inline u32 i915_reset_engine_count(struct i915_gpu_error *error,256static inline u32 i915_reset_engine_count(struct i915_gpu_error *error,
256 const struct intel_engine_cs *engine)257 const struct intel_engine_cs *engine)
257{258{
258 return atomic_read(&error->reset_engine_count[engine->uabi_class]);259 return atomic_read(&error->reset_engine_count[engine->class]);
260}
261
262static inline void
263i915_increase_reset_engine_count(struct i915_gpu_error *error,
264 const struct intel_engine_cs *engine)
265{
266 atomic_inc(&error->reset_engine_count[engine->class]);
259}267}
260 268
261#define CORE_DUMP_FLAG_NONE 0x0269#define CORE_DUMP_FLAG_NONE 0x0
drivers/gpu/drm/i915/selftests/igt_live_test.c+5−4
@@ -37,8 +37,9 @@ int igt_live_test_begin(struct igt_live_test *t, · 36 unmodified lines
37 }37 }
38 38
39 for_each_engine(engine, gt, id)39 for_each_engine(engine, gt, id)
40 t->reset_engine[id] =40 t->reset_engine[i][id] =
41 i915_reset_engine_count(&i915->gpu_error, engine);41 i915_reset_engine_count(&i915->gpu_error,
42 engine);
42 }43 }
43 44
44 t->reset_global = i915_reset_count(&i915->gpu_error);45 t->reset_global = i915_reset_count(&i915->gpu_error);
@@ -66,14 +67,14 @@ int igt_live_test_end(struct igt_live_test *t) · 21 unmodified lines
66 67
67 for_each_gt(gt, i915, i) {68 for_each_gt(gt, i915, i) {
68 for_each_engine(engine, gt, id) {69 for_each_engine(engine, gt, id) {
69 if (t->reset_engine[id] ==70 if (t->reset_engine[i][id] ==
70 i915_reset_engine_count(&i915->gpu_error, engine))71 i915_reset_engine_count(&i915->gpu_error, engine))
71 continue;72 continue;
72 73
73 gt_err(gt, "%s(%s): engine '%s' was reset %d times!\n",74 gt_err(gt, "%s(%s): engine '%s' was reset %d times!\n",
74 t->func, t->name, engine->name,75 t->func, t->name, engine->name,
75 i915_reset_engine_count(&i915->gpu_error, engine) -76 i915_reset_engine_count(&i915->gpu_error, engine) -
76 t->reset_engine[id]);77 t->reset_engine[i][id]);
77 return -EIO;78 return -EIO;
78 }79 }
79 }80 }
drivers/gpu/drm/i915/selftests/igt_live_test.h+2−1
@@ -7,6 +7,7 @@ · 6 unmodified lines
7#ifndef IGT_LIVE_TEST_H7#ifndef IGT_LIVE_TEST_H
8#define IGT_LIVE_TEST_H8#define IGT_LIVE_TEST_H
9 9
10#include "gt/intel_gt_defines.h" /* for I915_MAX_GT */
10#include "gt/intel_engine.h" /* for I915_NUM_ENGINES */11#include "gt/intel_engine.h" /* for I915_NUM_ENGINES */
11 12
12struct drm_i915_private;13struct drm_i915_private;
@@ -17,7 +18,7 @@ struct igt_live_test { · 4 unmodified lines
17 const char *name;18 const char *name;
18 19
19 unsigned int reset_global;20 unsigned int reset_global;
20 unsigned int reset_engine[I915_NUM_ENGINES];21 unsigned int reset_engine[I915_MAX_GT][I915_NUM_ENGINES];
21};22};
22 23
23/*24/*
drivers/gpu/drm/mediatek/mtk_disp_gamma.c+1−1
@@ -203,7 +203,7 @@ void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) · 202 unmodified lines
203 /* Disable RELAY mode to pass the processed image */203 /* Disable RELAY mode to pass the processed image */
204 cfg_val &= ~GAMMA_RELAY_MODE;204 cfg_val &= ~GAMMA_RELAY_MODE;
205 205
206 cfg_val = readl(gamma->regs + DISP_GAMMA_CFG);206 writel(cfg_val, gamma->regs + DISP_GAMMA_CFG);
207}207}
208 208
209void mtk_gamma_config(struct device *dev, unsigned int w,209void mtk_gamma_config(struct device *dev, unsigned int w,
drivers/gpu/drm/mediatek/mtk_drm_crtc.c+13−1
@@ -788,6 +788,7 @@ static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, · 787 unmodified lines
788 crtc);788 crtc);
789 struct mtk_crtc_state *mtk_crtc_state = to_mtk_crtc_state(crtc_state);789 struct mtk_crtc_state *mtk_crtc_state = to_mtk_crtc_state(crtc_state);
790 struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);790 struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
791 unsigned long flags;
791 792
792 if (mtk_crtc->event && mtk_crtc_state->base.event)793 if (mtk_crtc->event && mtk_crtc_state->base.event)
793 DRM_ERROR("new event while there is still a pending event\n");794 DRM_ERROR("new event while there is still a pending event\n");
@@ -795,7 +796,11 @@ static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, · 1 unmodified line
795 if (mtk_crtc_state->base.event) {796 if (mtk_crtc_state->base.event) {
796 mtk_crtc_state->base.event->pipe = drm_crtc_index(crtc);797 mtk_crtc_state->base.event->pipe = drm_crtc_index(crtc);
797 WARN_ON(drm_crtc_vblank_get(crtc) != 0);798 WARN_ON(drm_crtc_vblank_get(crtc) != 0);
799
800 spin_lock_irqsave(&crtc->dev->event_lock, flags);
798 mtk_crtc->event = mtk_crtc_state->base.event;801 mtk_crtc->event = mtk_crtc_state->base.event;
802 spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
803
799 mtk_crtc_state->base.event = NULL;804 mtk_crtc_state->base.event = NULL;
800 }805 }
801}806}
@@ -921,7 +926,14 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev, · 119 unmodified lines
921 926
922struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)927struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)
923{928{
924 struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);929 struct mtk_drm_crtc *mtk_crtc = NULL;
930
931 if (!crtc)
932 return NULL;
933
934 mtk_crtc = to_mtk_crtc(crtc);
935 if (!mtk_crtc)
936 return NULL;
925 937
926 return mtk_crtc->dma_dev;938 return mtk_crtc->dma_dev;
927}939}
drivers/gpu/drm/mediatek/mtk_drm_drv.c+4−1
@@ -443,6 +443,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) · 442 unmodified lines
443 struct mtk_drm_private *private = drm->dev_private;443 struct mtk_drm_private *private = drm->dev_private;
444 struct mtk_drm_private *priv_n;444 struct mtk_drm_private *priv_n;
445 struct device *dma_dev = NULL;445 struct device *dma_dev = NULL;
446 struct drm_crtc *crtc;
446 int ret, i, j;447 int ret, i, j;
447 448
448 if (drm_firmware_drivers_only())449 if (drm_firmware_drivers_only())
@@ -519,7 +520,9 @@ static int mtk_drm_kms_init(struct drm_device *drm) · 70 unmodified lines
519 }520 }
520 521
521 /* Use OVL device for all DMA memory allocations */522 /* Use OVL device for all DMA memory allocations */
522 dma_dev = mtk_drm_crtc_dma_dev_get(drm_crtc_from_index(drm, 0));523 crtc = drm_crtc_from_index(drm, 0);
524 if (crtc)
525 dma_dev = mtk_drm_crtc_dma_dev_get(crtc);
523 if (!dma_dev) {526 if (!dma_dev) {
524 ret = -ENODEV;527 ret = -ENODEV;
525 dev_err(drm->dev, "Need at least one OVL device\n");528 dev_err(drm->dev, "Need at least one OVL device\n");
drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c+1−1
@@ -385,7 +385,7 @@ nvkm_uoutp_mthd_inherit(struct nvkm_outp *outp, void *argv, u32 argc) · 384 unmodified lines
385 385
386 /* Ensure an ior is hooked up to this outp already */386 /* Ensure an ior is hooked up to this outp already */
387 ior = outp->func->inherit(outp);387 ior = outp->func->inherit(outp);
388 if (!ior)388 if (!ior || !ior->arm.head)
389 return -ENODEV;389 return -ENODEV;
390 390
391 /* With iors, there will be a separate output path for each type of connector - and all of391 /* With iors, there will be a separate output path for each type of connector - and all of
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c+9−9
@@ -49,14 +49,14 @@ · 48 unmodified lines
49#include <subdev/mmu.h>49#include <subdev/mmu.h>
50 50
51struct gk20a_instobj {51struct gk20a_instobj {
52 struct nvkm_memory memory;52 struct nvkm_instobj base;
53 struct nvkm_mm_node *mn;53 struct nvkm_mm_node *mn;
54 struct gk20a_instmem *imem;54 struct gk20a_instmem *imem;
55 55
56 /* CPU mapping */56 /* CPU mapping */
57 u32 *vaddr;57 u32 *vaddr;
58};58};
59#define gk20a_instobj(p) container_of((p), struct gk20a_instobj, memory)59#define gk20a_instobj(p) container_of((p), struct gk20a_instobj, base.memory)
60 60
61/*61/*
62 * Used for objects allocated using the DMA API62 * Used for objects allocated using the DMA API
@@ -148,7 +148,7 @@ gk20a_instobj_iommu_recycle_vaddr(struct gk20a_instobj_iommu *obj) · 85 unmodified lines
148 list_del(&obj->vaddr_node);148 list_del(&obj->vaddr_node);
149 vunmap(obj->base.vaddr);149 vunmap(obj->base.vaddr);
150 obj->base.vaddr = NULL;150 obj->base.vaddr = NULL;
151 imem->vaddr_use -= nvkm_memory_size(&obj->base.memory);151 imem->vaddr_use -= nvkm_memory_size(&obj->base.base.memory);
152 nvkm_debug(&imem->base.subdev, "vaddr used: %x/%x\n", imem->vaddr_use,152 nvkm_debug(&imem->base.subdev, "vaddr used: %x/%x\n", imem->vaddr_use,
153 imem->vaddr_max);153 imem->vaddr_max);
154}154}
@@ -283,7 +283,7 @@ gk20a_instobj_map(struct nvkm_memory *memory, u64 offset, struct nvkm_vmm *vmm, · 128 unmodified lines
283{283{
284 struct gk20a_instobj *node = gk20a_instobj(memory);284 struct gk20a_instobj *node = gk20a_instobj(memory);
285 struct nvkm_vmm_map map = {285 struct nvkm_vmm_map map = {
286 .memory = &node->memory,286 .memory = &node->base.memory,
287 .offset = offset,287 .offset = offset,
288 .mem = node->mn,288 .mem = node->mn,
289 };289 };
@@ -391,8 +391,8 @@ gk20a_instobj_ctor_dma(struct gk20a_instmem *imem, u32 npages, u32 align, · 101 unmodified lines
391 return -ENOMEM;391 return -ENOMEM;
392 *_node = &node->base;392 *_node = &node->base;
393 393
394 nvkm_memory_ctor(&gk20a_instobj_func_dma, &node->base.memory);394 nvkm_memory_ctor(&gk20a_instobj_func_dma, &node->base.base.memory);
395 node->base.memory.ptrs = &gk20a_instobj_ptrs;395 node->base.base.memory.ptrs = &gk20a_instobj_ptrs;
396 396
397 node->base.vaddr = dma_alloc_attrs(dev, npages << PAGE_SHIFT,397 node->base.vaddr = dma_alloc_attrs(dev, npages << PAGE_SHIFT,
398 &node->handle, GFP_KERNEL,398 &node->handle, GFP_KERNEL,
@@ -438,8 +438,8 @@ gk20a_instobj_ctor_iommu(struct gk20a_instmem *imem, u32 npages, u32 align, · 39 unmodified lines
438 *_node = &node->base;438 *_node = &node->base;
439 node->dma_addrs = (void *)(node->pages + npages);439 node->dma_addrs = (void *)(node->pages + npages);
440 440
441 nvkm_memory_ctor(&gk20a_instobj_func_iommu, &node->base.memory);441 nvkm_memory_ctor(&gk20a_instobj_func_iommu, &node->base.base.memory);
442 node->base.memory.ptrs = &gk20a_instobj_ptrs;442 node->base.base.memory.ptrs = &gk20a_instobj_ptrs;
443 443
444 /* Allocate backing memory */444 /* Allocate backing memory */
445 for (i = 0; i < npages; i++) {445 for (i = 0; i < npages; i++) {
@@ -533,7 +533,7 @@ gk20a_instobj_new(struct nvkm_instmem *base, u32 size, u32 align, bool zero, · 87 unmodified lines
533 else533 else
534 ret = gk20a_instobj_ctor_dma(imem, size >> PAGE_SHIFT,534 ret = gk20a_instobj_ctor_dma(imem, size >> PAGE_SHIFT,
535 align, &node);535 align, &node);
536 *pmemory = node ? &node->memory : NULL;536 *pmemory = node ? &node->base.memory : NULL;
537 if (ret)537 if (ret)
538 return ret;538 return ret;
539 539
drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c+1−1
@@ -326,7 +326,7 @@ static const struct drm_display_mode ltk050h3148w_mode = { · 325 unmodified lines
326static const struct ltk050h3146w_desc ltk050h3148w_data = {326static const struct ltk050h3146w_desc ltk050h3148w_data = {
327 .mode = &ltk050h3148w_mode,327 .mode = &ltk050h3148w_mode,
328 .init = ltk050h3148w_init_sequence,328 .init = ltk050h3148w_init_sequence,
329 .mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE,329 .mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE | MIPI_DSI_MODE_VIDEO_BURST,
330};330};
331 331
332static int ltk050h3146w_init_sequence(struct ltk050h3146w *ctx)332static int ltk050h3146w_init_sequence(struct ltk050h3146w *ctx)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t