History

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

drm-misc-fixes for v6.7-rc6: - Fix regression for checking if FD is master capable. - Fix uninitialized variables in drm/crtc. - Fix ivpu w/a. - Refresh modes correctly when updating EDID. - Small panel fixes.

Dave Airlie committed 2 years ago

Commit f8678a32 parents 7beae48 6c9dbee7 files · +19 −12Browse files

Unified · Split

7 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/drm_auth.c +1 −1
  5. drivers/gpu/drm/drm_crtc.c +4 −4
  6. drivers/gpu/drm/drm_edid.c +2 −1
  7. 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
4242 - lg,acx467akm-7
4343 # LG Corporation 7" WXGA TFT LCD panel
4444 - lg,ld070wx3-sl01
45+ # LG Corporation 5" HD TFT LCD panel
46+ - lg,lh500wx1-sd03
4547 # One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel
4648 - osddisplays,osd101t2587-53ts
4749 # Panasonic 10" WUXGA TFT LCD panel
Documentation/devicetree/bindings/display/panel/panel-simple.yaml+0−2
@@ -208,8 +208,6 @@ properties: · 207 unmodified lines
208208 - lemaker,bl035-rgb-002
209209 # LG 7" (800x480 pixels) TFT LCD panel
210210 - lg,lb070wv8
211− # LG Corporation 5" HD TFT LCD panel
212− - lg,lh500wx1-sd03
213211 # LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel
214212 - lg,lp079qx1-sp0v
215213 # LG 9.7" (2048x1536 pixels) TFT LCD panel
drivers/accel/ivpu/ivpu_hw_37xx.c+9−3
@@ -53,10 +53,12 @@ · 52 unmodified lines
5353
5454 #define ICB_0_1_IRQ_MASK ((((u64)ICB_1_IRQ_MASK) << 32) | ICB_0_IRQ_MASK)
5555
56−#define BUTTRESS_IRQ_MASK ((REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE)) | \
57− (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, ATS_ERR)) | \
56+#define BUTTRESS_IRQ_MASK ((REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, ATS_ERR)) | \
5857 (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, UFI_ERR)))
5958
59+#define BUTTRESS_ALL_IRQ_MASK (BUTTRESS_IRQ_MASK | \
60+ (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE)))
61+
6062 #define BUTTRESS_IRQ_ENABLE_MASK ((u32)~BUTTRESS_IRQ_MASK)
6163 #define BUTTRESS_IRQ_DISABLE_MASK ((u32)-1)
6264
@@ -74,8 +76,12 @@ static void ivpu_hw_wa_init(struct ivpu_device *vdev) · 11 unmodified lines
7476 vdev->wa.clear_runtime_mem = false;
7577 vdev->wa.d3hot_after_power_off = true;
7678
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 */
7882 vdev->wa.interrupt_clear_with_0 = true;
83+ REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, 0x0);
84+ }
7985
8086 IVPU_PRINT_WA(punit_disabled);
8187 IVPU_PRINT_WA(clear_runtime_mem);
drivers/gpu/drm/drm_auth.c+1−1
@@ -236,7 +236,7 @@ static int · 235 unmodified lines
236236 drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv)
237237 {
238238 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))
240240 return 0;
241241
242242 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
715715 struct drm_mode_set set;
716716 uint32_t __user *set_connectors_ptr;
717717 struct drm_modeset_acquire_ctx ctx;
718− int ret;
719− int i;
718+ int ret, i, num_connectors = 0;
720719
721720 if (!drm_core_check_feature(dev, DRIVER_MODESET))
722721 return -EOPNOTSUPP;
@@ -871,6 +870,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, · 148 unmodified lines
871870 connector->name);
872871
873872 connector_set[i] = connector;
873+ num_connectors++;
874874 }
875875 }
876876
@@ -879,7 +879,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, · 2 unmodified lines
879879 set.y = crtc_req->y;
880880 set.mode = mode;
881881 set.connectors = connector_set;
882− set.num_connectors = crtc_req->count_connectors;
882+ set.num_connectors = num_connectors;
883883 set.fb = fb;
884884
885885 if (drm_drv_uses_atomic_modeset(dev))
@@ -892,7 +892,7 @@ out: · 6 unmodified lines
892892 drm_framebuffer_put(fb);
893893
894894 if (connector_set) {
895− for (i = 0; i < crtc_req->count_connectors; i++) {
895+ for (i = 0; i < num_connectors; i++) {
896896 if (connector_set[i])
897897 drm_connector_put(connector_set[i]);
898898 }
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
23092309
23102310 override = drm_edid_override_get(connector);
23112311 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);
23132314
23142315 drm_edid_free(override);
23152316
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
326326 static const struct ltk050h3146w_desc ltk050h3148w_data = {
327327 .mode = &ltk050h3148w_mode,
328328 .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,
330330 };
331331
332332 static 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