AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-18 02:26:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes

Browse Source 
single nouveau regression fix.

* 'linux-4.14' of git://github.com/skeggsb/linux:
  drm/nouveau/kms/nv50: use the correct state for base channel notifier setup
This commit is contained in:
Dave Airlie 2017-11-01 10:05:03 +10:00
commit 25dd1aa3b4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nv50_display.c
View File

@ -4099,7 +4099,7 @@ nv50_disp_atomic_commit(struct drm_device *dev,
{ {
struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_drm *drm = nouveau_drm(dev);
struct nv50_disp *disp = nv50_disp(dev); struct nv50_disp *disp = nv50_disp(dev);
struct drm_plane_state *old_plane_state; struct drm_plane_state *new_plane_state;
struct drm_plane *plane; struct drm_plane *plane;
struct drm_crtc *crtc; struct drm_crtc *crtc;
bool active = false; bool active = false;
@ -4129,8 +4129,8 @@ nv50_disp_atomic_commit(struct drm_device *dev,
if (ret) if (ret)
goto err_cleanup; goto err_cleanup;
for_each_old_plane_in_state(state, plane, old_plane_state, i) { for_each_new_plane_in_state(state, plane, new_plane_state, i) {
struct nv50_wndw_atom *asyw = nv50_wndw_atom(old_plane_state); struct nv50_wndw_atom *asyw = nv50_wndw_atom(new_plane_state);
struct nv50_wndw *wndw = nv50_wndw(plane); struct nv50_wndw *wndw = nv50_wndw(plane);
if (asyw->set.image) { if (asyw->set.image) {