UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Drop unecessary fb arguments from function signatures 

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>
This commit is contained in:
Daniel Vetter 2015-04-10 16:22:38 +02:00
parent d328c9d78d
commit 8805aa713e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_display.c
View File

@ -11235,7 +11235,6 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)
static struct intel_crtc_state * static struct intel_crtc_state *
intel_modeset_pipe_config(struct drm_crtc *crtc, intel_modeset_pipe_config(struct drm_crtc *crtc,
struct drm_framebuffer *fb,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_atomic_state *state) struct drm_atomic_state *state)
{ {
@ -12040,7 +12039,6 @@ static void update_scanline_offset(struct intel_crtc *crtc)
static struct intel_crtc_state * static struct intel_crtc_state *
intel_modeset_compute_config(struct drm_crtc *crtc, intel_modeset_compute_config(struct drm_crtc *crtc,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_framebuffer *fb,
struct drm_atomic_state *state, struct drm_atomic_state *state,
unsigned *modeset_pipes, unsigned *modeset_pipes,
unsigned *prepare_pipes, unsigned *prepare_pipes,
@ -12078,7 +12076,7 @@ intel_modeset_compute_config(struct drm_crtc *crtc,
if (WARN_ON(&intel_crtc->base != crtc)) if (WARN_ON(&intel_crtc->base != crtc))
continue; 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)) if (IS_ERR(pipe_config))
return pipe_config; return pipe_config;
@ -12281,7 +12279,7 @@ static int intel_set_mode(struct drm_crtc *crtc,
unsigned modeset_pipes, prepare_pipes, disable_pipes; unsigned modeset_pipes, prepare_pipes, disable_pipes;
int ret = 0; int ret = 0;
pipe_config = intel_modeset_compute_config(crtc, mode, fb, state, pipe_config = intel_modeset_compute_config(crtc, mode, state,
&modeset_pipes, &modeset_pipes,
&prepare_pipes, &prepare_pipes,
&disable_pipes); &disable_pipes);
@ -12739,7 +12737,7 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
goto fail; goto fail;
pipe_config = intel_modeset_compute_config(set->crtc, set->mode, pipe_config = intel_modeset_compute_config(set->crtc, set->mode,
set->fb, state, state,
&modeset_pipes, &modeset_pipes,
&prepare_pipes, &prepare_pipes,
&disable_pipes); &disable_pipes);