Reviewed-by: Ander Conselvan de Oliveira <[email protected]> On Fri, 2015-04-10 at 16:22 +0200, Daniel Vetter wrote: > This is a separate patch to simplify conflict handling with other > ongoing atomic work. > > Signed-off-by: Daniel Vetter <[email protected]> > --- > drivers/gpu/drm/i915/intel_display.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index b1afd7d5e28c..cdf21df8c69c 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10711,7 +10711,6 @@ clear_intel_crtc_state(struct intel_crtc_state > *crtc_state) > > static struct intel_crtc_state * > intel_modeset_pipe_config(struct drm_crtc *crtc, > - struct drm_framebuffer *fb, > struct drm_display_mode *mode, > struct drm_atomic_state *state) > { > @@ -11514,7 +11513,6 @@ static void update_scanline_offset(struct intel_crtc > *crtc) > static struct intel_crtc_state * > intel_modeset_compute_config(struct drm_crtc *crtc, > struct drm_display_mode *mode, > - struct drm_framebuffer *fb, > struct drm_atomic_state *state, > unsigned *modeset_pipes, > unsigned *prepare_pipes, > @@ -11552,7 +11550,7 @@ intel_modeset_compute_config(struct drm_crtc *crtc, > if (WARN_ON(&intel_crtc->base != crtc)) > continue; > > - pipe_config = intel_modeset_pipe_config(crtc, fb, mode, state); > + pipe_config = intel_modeset_pipe_config(crtc, mode, state); > if (IS_ERR(pipe_config)) > return pipe_config; > > @@ -11758,7 +11756,7 @@ static int intel_set_mode(struct drm_crtc *crtc, > unsigned modeset_pipes, prepare_pipes, disable_pipes; > int ret = 0; > > - pipe_config = intel_modeset_compute_config(crtc, mode, fb, state, > + pipe_config = intel_modeset_compute_config(crtc, mode, state, > &modeset_pipes, > &prepare_pipes, > &disable_pipes); > @@ -12216,7 +12214,7 @@ static int intel_crtc_set_config(struct drm_mode_set > *set) > goto fail; > > pipe_config = intel_modeset_compute_config(set->crtc, set->mode, > - set->fb, state, > + state, > &modeset_pipes, > &prepare_pipes, > &disable_pipes);
_______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
