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>
Unified · Split
| @@ -310,7 +310,7 @@ static void ipu_crtc_mode_set_nofb(struct drm_crtc *crtc) · 309 unmodified lines | ||
| 310 | 310 | dev_warn(ipu_crtc->dev, "8-pixel align hactive %d -> %d\n", |
| 311 | 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 | 314 | sig_cfg.mode.hactive = new_hactive; |
| 315 | 315 | } |
| 316 | 316 | |
| @@ -569,6 +569,7 @@ static const struct of_device_id s6d7aa0_of_match[] = { · 568 unmodified lines | ||
| 569 | 569 | }, |
| 570 | 570 | { /* sentinel */ } |
| 571 | 571 | }; |
| 572 | +MODULE_DEVICE_TABLE(of, s6d7aa0_of_match); | |
| 572 | 573 | |
| 573 | 574 | static struct mipi_dsi_driver s6d7aa0_driver = { |
| 574 | 575 | .probe = s6d7aa0_probe, |
| @@ -519,7 +519,8 @@ static bool ttm_bo_evict_swapout_allowable(struct ttm_buffer_object *bo, · 518 unmodified lines | ||
| 519 | 519 | |
| 520 | 520 | if (bo->pin_count) { |
| 521 | 521 | *locked = false; |
| 522 | − *busy = false; | |
| 522 | + if (busy) | |
| 523 | + *busy = false; | |
| 523 | 524 | return false; |
| 524 | 525 | } |
| 525 | 526 | |