Skip to content

Commit

Permalink
drm/i915: Drop unecessary fb arguments from function signatures
Browse files Browse the repository at this point in the history
This is a separate patch to simplify conflict handling with other
ongoing atomic work.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Apr 16, 2015
1 parent d328c9d commit 8805aa7
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -11235,7 +11235,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)
{
Expand Down Expand Up @@ -12040,7 +12039,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,
Expand Down Expand Up @@ -12078,7 +12076,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;

Expand Down Expand Up @@ -12281,7 +12279,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);
Expand Down Expand Up @@ -12739,7 +12737,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);
Expand Down

0 comments on commit 8805aa7

Please sign in to comment.