@@ -370,7 +370,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset,
return wndw->func->acquire(wndw, asyw, asyh);
}
-static int
+static void
nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw,
struct nv50_wndw_atom *armw,
struct nv50_wndw_atom *asyw,
@@ -392,7 +392,6 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw,
*/
if (!(ilut = asyh->state.gamma_lut)) {
asyw->visible = false;
- return 0;
}
if (wndw->func->ilut)
@@ -436,7 +435,6 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw,
/* Can't do an immediate flip while changing the LUT. */
asyh->state.async_flip = false;
- return 0;
}
static int
@@ -481,9 +479,7 @@ nv50_wndw_atomic_check(struct drm_plane *plane,
asyh->state.color_mgmt_changed ||
asyw->state.fb->format->format !=
armw->state.fb->format->format)) {
- ret = nv50_wndw_atomic_check_lut(wndw, armw, asyw, asyh);
- if (ret)
- return ret;
+ nv50_wndw_atomic_check_lut(wndw, armw, asyw, asyh);
}
/* Calculate new window state. */
It always returned 0 so make it void instead of returning int. Signed-off-by: Denis Plotnikov <den-plotnikov@yandex-team.ru> --- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)