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
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/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/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