History

Merge tag 'drm-misc-fixes-2023-08-03' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes

A NULL pointer dereference fix for TTM, a timings fix for imx/ipuv3 and the addition of a MODULE_DEVICE_TABLE for the samsung-s6d7aa0 panel. Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 3 years ago

Commit 062ff852 parents 5d0c230 c71b7aa3 files · +4 −2Browse files

Unified · Split

3 files
  1. drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c +1 −1
  2. drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c +1 −0
  3. drivers/gpu/drm/ttm/ttm_bo.c +2 −1
drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c+1−1
@@ -310,7 +310,7 @@ static void ipu_crtc_mode_set_nofb(struct drm_crtc *crtc) · 309 unmodified lines
310 dev_warn(ipu_crtc->dev, "8-pixel align hactive %d -> %d\n",310 dev_warn(ipu_crtc->dev, "8-pixel align hactive %d -> %d\n",
311 sig_cfg.mode.hactive, new_hactive);311 sig_cfg.mode.hactive, new_hactive);
312 312
313 sig_cfg.mode.hfront_porch = new_hactive - sig_cfg.mode.hactive;313 sig_cfg.mode.hfront_porch -= new_hactive - sig_cfg.mode.hactive;
314 sig_cfg.mode.hactive = new_hactive;314 sig_cfg.mode.hactive = new_hactive;
315 }315 }
316 316
drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c+1−0
@@ -569,6 +569,7 @@ static const struct of_device_id s6d7aa0_of_match[] = { · 568 unmodified lines
569 },569 },
570 { /* sentinel */ }570 { /* sentinel */ }
571};571};
572MODULE_DEVICE_TABLE(of, s6d7aa0_of_match);
572 573
573static struct mipi_dsi_driver s6d7aa0_driver = {574static struct mipi_dsi_driver s6d7aa0_driver = {
574 .probe = s6d7aa0_probe,575 .probe = s6d7aa0_probe,
drivers/gpu/drm/ttm/ttm_bo.c+2−1
@@ -519,7 +519,8 @@ static bool ttm_bo_evict_swapout_allowable(struct ttm_buffer_object *bo, · 518 unmodified lines
519 519
520 if (bo->pin_count) {520 if (bo->pin_count) {
521 *locked = false;521 *locked = false;
522 *busy = false;522 if (busy)
523 *busy = false;
523 return false;524 return false;
524 }525 }
525 526

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