Commit cf6d0d76 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Vetter

drm/i915: Delete fb, x and y parameters from mode set functions

We don't need to pass it down the call chain anymore now that the plane
state is set up properly.
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d3a40d1b
...@@ -83,7 +83,6 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc, ...@@ -83,7 +83,6 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config); struct intel_crtc_state *pipe_config);
static int intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, static int intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *old_fb,
struct drm_atomic_state *state); struct drm_atomic_state *state);
static int intel_framebuffer_init(struct drm_device *dev, static int intel_framebuffer_init(struct drm_device *dev,
struct intel_framebuffer *ifb, struct intel_framebuffer *ifb,
...@@ -9891,7 +9890,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, ...@@ -9891,7 +9890,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
if (ret) if (ret)
goto fail; goto fail;
if (intel_set_mode(crtc, mode, 0, 0, fb, state)) { if (intel_set_mode(crtc, mode, state)) {
DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n"); DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
if (old->release_fb) if (old->release_fb)
old->release_fb->funcs->destroy(old->release_fb); old->release_fb->funcs->destroy(old->release_fb);
...@@ -9965,7 +9964,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector, ...@@ -9965,7 +9964,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
if (ret) if (ret)
goto fail; goto fail;
intel_set_mode(crtc, NULL, 0, 0, NULL, state); intel_set_mode(crtc, NULL, state);
drm_atomic_state_free(state); drm_atomic_state_free(state);
...@@ -12305,7 +12304,6 @@ static int __intel_set_mode_checks(struct drm_atomic_state *state) ...@@ -12305,7 +12304,6 @@ static int __intel_set_mode_checks(struct drm_atomic_state *state)
static int __intel_set_mode(struct drm_crtc *modeset_crtc, static int __intel_set_mode(struct drm_crtc *modeset_crtc,
struct drm_display_mode *mode, struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *fb,
struct intel_crtc_state *pipe_config) struct intel_crtc_state *pipe_config)
{ {
struct drm_device *dev = modeset_crtc->dev; struct drm_device *dev = modeset_crtc->dev;
...@@ -12415,12 +12413,11 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, ...@@ -12415,12 +12413,11 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc,
static int intel_set_mode_with_config(struct drm_crtc *crtc, static int intel_set_mode_with_config(struct drm_crtc *crtc,
struct drm_display_mode *mode, struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *fb,
struct intel_crtc_state *pipe_config) struct intel_crtc_state *pipe_config)
{ {
int ret; int ret;
ret = __intel_set_mode(crtc, mode, x, y, fb, pipe_config); ret = __intel_set_mode(crtc, mode, pipe_config);
if (ret == 0) if (ret == 0)
intel_modeset_check_state(crtc->dev); intel_modeset_check_state(crtc->dev);
...@@ -12430,7 +12427,6 @@ static int intel_set_mode_with_config(struct drm_crtc *crtc, ...@@ -12430,7 +12427,6 @@ static int intel_set_mode_with_config(struct drm_crtc *crtc,
static int intel_set_mode(struct drm_crtc *crtc, static int intel_set_mode(struct drm_crtc *crtc,
struct drm_display_mode *mode, struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *fb,
struct drm_atomic_state *state) struct drm_atomic_state *state)
{ {
struct intel_crtc_state *pipe_config; struct intel_crtc_state *pipe_config;
...@@ -12442,7 +12438,7 @@ static int intel_set_mode(struct drm_crtc *crtc, ...@@ -12442,7 +12438,7 @@ static int intel_set_mode(struct drm_crtc *crtc,
goto out; goto out;
} }
ret = intel_set_mode_with_config(crtc, mode, x, y, fb, pipe_config); ret = intel_set_mode_with_config(crtc, mode, pipe_config);
if (ret) if (ret)
goto out; goto out;
...@@ -12514,8 +12510,7 @@ void intel_crtc_restore_mode(struct drm_crtc *crtc) ...@@ -12514,8 +12510,7 @@ void intel_crtc_restore_mode(struct drm_crtc *crtc)
intel_modeset_setup_plane_state(state, crtc, &crtc->mode, intel_modeset_setup_plane_state(state, crtc, &crtc->mode,
crtc->primary->fb, crtc->x, crtc->y); crtc->primary->fb, crtc->x, crtc->y);
intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, crtc->primary->fb, intel_set_mode(crtc, &crtc->mode, state);
state);
drm_atomic_state_free(state); drm_atomic_state_free(state);
} }
...@@ -12921,7 +12916,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) ...@@ -12921,7 +12916,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
if (config->mode_changed) { if (config->mode_changed) {
ret = intel_set_mode_with_config(set->crtc, set->mode, ret = intel_set_mode_with_config(set->crtc, set->mode,
set->x, set->y, set->fb,
pipe_config); pipe_config);
} else if (config->fb_changed) { } else if (config->fb_changed) {
struct intel_crtc *intel_crtc = to_intel_crtc(set->crtc); struct intel_crtc *intel_crtc = to_intel_crtc(set->crtc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment