From: Greg Kroah-Hartman Date: Mon, 23 Oct 2023 10:28:07 +0000 (+0200) Subject: drop queue-5.15/drm-get-rid-of-drm_debug_-log-calls-in-drm-core-file.patch X-Git-Tag: v4.14.328~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=369e607dcf842b609d25b93fd3c6dc914d8cdeca;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/drm-get-rid-of-drm_debug_-log-calls-in-drm-core-file.patch Not really needed. --- diff --git a/queue-5.15/drm-atomic-helper-relax-unregistered-connector-check.patch b/queue-5.15/drm-atomic-helper-relax-unregistered-connector-check.patch index 50e3e14d3da..15d1da0f55f 100644 --- a/queue-5.15/drm-atomic-helper-relax-unregistered-connector-check.patch +++ b/queue-5.15/drm-atomic-helper-relax-unregistered-connector-check.patch @@ -35,15 +35,14 @@ Cc: Jani Nikula Cc: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20231005131623.114379-1-contact@emersion.fr Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/gpu/drm/drm_atomic_helper.c | 17 +++++++++++++---- + drivers/gpu/drm/drm_atomic_helper.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) -diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index d0a8c22cbc4b8..070248597d27c 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c -@@ -289,7 +289,8 @@ static int +@@ -285,7 +285,8 @@ static int update_connector_routing(struct drm_atomic_state *state, struct drm_connector *connector, struct drm_connector_state *old_connector_state, @@ -53,7 +52,7 @@ index d0a8c22cbc4b8..070248597d27c 100644 { const struct drm_connector_helper_funcs *funcs; struct drm_encoder *new_encoder; -@@ -338,9 +339,13 @@ update_connector_routing(struct drm_atomic_state *state, +@@ -336,9 +337,13 @@ update_connector_routing(struct drm_atom * there's a chance the connector may have been destroyed during the * process, but it's better to ignore that then cause * drm_atomic_helper_resume() to fail. @@ -65,10 +64,10 @@ index d0a8c22cbc4b8..070248597d27c 100644 if (!state->duplicated && drm_connector_is_unregistered(connector) && - crtc_state->active) { + added_by_user && crtc_state->active) { - drm_dbg_atomic(connector->dev, - "[CONNECTOR:%d:%s] is not registered\n", - connector->base.id, connector->name); -@@ -619,7 +624,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, + DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] is not registered\n", + connector->base.id, connector->name); + return -EINVAL; +@@ -610,7 +615,10 @@ drm_atomic_helper_check_modeset(struct d struct drm_connector *connector; struct drm_connector_state *old_connector_state, *new_connector_state; int i, ret; @@ -80,7 +79,7 @@ index d0a8c22cbc4b8..070248597d27c 100644 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { bool has_connectors = -@@ -684,7 +692,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, +@@ -675,7 +683,8 @@ drm_atomic_helper_check_modeset(struct d */ ret = update_connector_routing(state, connector, old_connector_state, @@ -90,6 +89,3 @@ index d0a8c22cbc4b8..070248597d27c 100644 if (ret) return ret; if (old_connector_state->crtc) { --- -2.40.1 - diff --git a/queue-5.15/drm-get-rid-of-drm_debug_-log-calls-in-drm-core-file.patch b/queue-5.15/drm-get-rid-of-drm_debug_-log-calls-in-drm-core-file.patch deleted file mode 100644 index 9c4b7f197c8..00000000000 --- a/queue-5.15/drm-get-rid-of-drm_debug_-log-calls-in-drm-core-file.patch +++ /dev/null @@ -1,1070 +0,0 @@ -From d2acead229b0b87efbeaf67e490b7a159c84872e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 26 Nov 2021 11:49:49 +0100 -Subject: drm: get rid of DRM_DEBUG_* log calls in drm core, files drm_a*.c - -From: Claudio Suarez - -[ Upstream commit 6e22dc35837790a84fc040f08e5094b2d5d91477 ] - -DRM_DEBUG_* and DRM_* log calls are deprecated. -Change them to drm_dbg_* / drm_{err,info,...} calls in drm core -files. - -To avoid making a very big patch, this change is split in -smaller patches. This one includes drm_a*.c - -Signed-off-by: Claudio Suarez -Signed-off-by: Daniel Vetter -Link: https://patchwork.freedesktop.org/patch/msgid/YaC7zXW119tlzfVh@gineta.localdomain -Stable-dep-of: 2b7947bd32e2 ("drm/atomic-helper: relax unregistered connector check") -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/drm_atomic.c | 180 +++++++++++---------- - drivers/gpu/drm/drm_atomic_helper.c | 243 +++++++++++++++------------- - drivers/gpu/drm/drm_atomic_uapi.c | 2 +- - drivers/gpu/drm/drm_auth.c | 12 +- - 4 files changed, 242 insertions(+), 195 deletions(-) - -diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c -index 166d329de9397..e4ed4989a5dba 100644 ---- a/drivers/gpu/drm/drm_atomic.c -+++ b/drivers/gpu/drm/drm_atomic.c -@@ -74,7 +74,7 @@ int drm_crtc_commit_wait(struct drm_crtc_commit *commit) - - ret = wait_for_completion_timeout(&commit->hw_done, timeout); - if (!ret) { -- DRM_ERROR("hw_done timed out\n"); -+ drm_err(commit->crtc->dev, "hw_done timed out\n"); - return -ETIMEDOUT; - } - -@@ -84,7 +84,7 @@ int drm_crtc_commit_wait(struct drm_crtc_commit *commit) - */ - ret = wait_for_completion_timeout(&commit->flip_done, timeout); - if (!ret) { -- DRM_ERROR("flip_done timed out\n"); -+ drm_err(commit->crtc->dev, "flip_done timed out\n"); - return -ETIMEDOUT; - } - -@@ -146,7 +146,7 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state) - drm_dev_get(dev); - state->dev = dev; - -- DRM_DEBUG_ATOMIC("Allocated atomic state %p\n", state); -+ drm_dbg_atomic(dev, "Allocated atomic state %p\n", state); - - return 0; - fail: -@@ -197,7 +197,7 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state) - struct drm_mode_config *config = &dev->mode_config; - int i; - -- DRM_DEBUG_ATOMIC("Clearing atomic state %p\n", state); -+ drm_dbg_atomic(dev, "Clearing atomic state %p\n", state); - - for (i = 0; i < state->num_connector; i++) { - struct drm_connector *connector = state->connectors[i].ptr; -@@ -308,7 +308,7 @@ void __drm_atomic_state_free(struct kref *ref) - - drm_atomic_state_clear(state); - -- DRM_DEBUG_ATOMIC("Freeing atomic state %p\n", state); -+ drm_dbg_atomic(state->dev, "Freeing atomic state %p\n", state); - - if (config->funcs->atomic_state_free) { - config->funcs->atomic_state_free(state); -@@ -367,8 +367,8 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state, - state->crtcs[index].ptr = crtc; - crtc_state->state = state; - -- DRM_DEBUG_ATOMIC("Added [CRTC:%d:%s] %p state to %p\n", -- crtc->base.id, crtc->name, crtc_state, state); -+ drm_dbg_atomic(state->dev, "Added [CRTC:%d:%s] %p state to %p\n", -+ crtc->base.id, crtc->name, crtc_state, state); - - return crtc_state; - } -@@ -388,8 +388,9 @@ static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, - */ - - if (new_crtc_state->active && !new_crtc_state->enable) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] active without enabled\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, -+ "[CRTC:%d:%s] active without enabled\n", -+ crtc->base.id, crtc->name); - return -EINVAL; - } - -@@ -399,15 +400,17 @@ static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, - */ - if (drm_core_check_feature(crtc->dev, DRIVER_ATOMIC) && - WARN_ON(new_crtc_state->enable && !new_crtc_state->mode_blob)) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enabled without mode blob\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, -+ "[CRTC:%d:%s] enabled without mode blob\n", -+ crtc->base.id, crtc->name); - return -EINVAL; - } - - if (drm_core_check_feature(crtc->dev, DRIVER_ATOMIC) && - WARN_ON(!new_crtc_state->enable && new_crtc_state->mode_blob)) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] disabled with mode blob\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, -+ "[CRTC:%d:%s] disabled with mode blob\n", -+ crtc->base.id, crtc->name); - return -EINVAL; - } - -@@ -423,8 +426,9 @@ static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, - */ - if (new_crtc_state->event && - !new_crtc_state->active && !old_crtc_state->active) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] requesting event but off\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, -+ "[CRTC:%d:%s] requesting event but off\n", -+ crtc->base.id, crtc->name); - return -EINVAL; - } - -@@ -469,8 +473,9 @@ static int drm_atomic_connector_check(struct drm_connector *connector, - return 0; - - if (writeback_job->fb && !state->crtc) { -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] framebuffer without CRTC\n", -- connector->base.id, connector->name); -+ drm_dbg_atomic(connector->dev, -+ "[CONNECTOR:%d:%s] framebuffer without CRTC\n", -+ connector->base.id, connector->name); - return -EINVAL; - } - -@@ -479,16 +484,18 @@ static int drm_atomic_connector_check(struct drm_connector *connector, - state->crtc); - - if (writeback_job->fb && !crtc_state->active) { -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] has framebuffer, but [CRTC:%d] is off\n", -- connector->base.id, connector->name, -- state->crtc->base.id); -+ drm_dbg_atomic(connector->dev, -+ "[CONNECTOR:%d:%s] has framebuffer, but [CRTC:%d] is off\n", -+ connector->base.id, connector->name, -+ state->crtc->base.id); - return -EINVAL; - } - - if (!writeback_job->fb) { - if (writeback_job->out_fence) { -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] requesting out-fence without framebuffer\n", -- connector->base.id, connector->name); -+ drm_dbg_atomic(connector->dev, -+ "[CONNECTOR:%d:%s] requesting out-fence without framebuffer\n", -+ connector->base.id, connector->name); - return -EINVAL; - } - -@@ -546,8 +553,8 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state, - state->planes[index].new_state = plane_state; - plane_state->state = state; - -- DRM_DEBUG_ATOMIC("Added [PLANE:%d:%s] %p state to %p\n", -- plane->base.id, plane->name, plane_state, state); -+ drm_dbg_atomic(plane->dev, "Added [PLANE:%d:%s] %p state to %p\n", -+ plane->base.id, plane->name, plane_state, state); - - if (plane_state->crtc) { - struct drm_crtc_state *crtc_state; -@@ -603,12 +610,12 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, - - /* either *both* CRTC and FB must be set, or neither */ - if (crtc && !fb) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] CRTC set but no FB\n", -- plane->base.id, plane->name); -+ drm_dbg_atomic(plane->dev, "[PLANE:%d:%s] CRTC set but no FB\n", -+ plane->base.id, plane->name); - return -EINVAL; - } else if (fb && !crtc) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] FB set but no CRTC\n", -- plane->base.id, plane->name); -+ drm_dbg_atomic(plane->dev, "[PLANE:%d:%s] FB set but no CRTC\n", -+ plane->base.id, plane->name); - return -EINVAL; - } - -@@ -618,9 +625,10 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, - - /* Check whether this plane is usable on this CRTC */ - if (!(plane->possible_crtcs & drm_crtc_mask(crtc))) { -- DRM_DEBUG_ATOMIC("Invalid [CRTC:%d:%s] for [PLANE:%d:%s]\n", -- crtc->base.id, crtc->name, -- plane->base.id, plane->name); -+ drm_dbg_atomic(plane->dev, -+ "Invalid [CRTC:%d:%s] for [PLANE:%d:%s]\n", -+ crtc->base.id, crtc->name, -+ plane->base.id, plane->name); - return -EINVAL; - } - -@@ -628,9 +636,10 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, - ret = drm_plane_check_pixel_format(plane, fb->format->format, - fb->modifier); - if (ret) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid pixel format %p4cc, modifier 0x%llx\n", -- plane->base.id, plane->name, -- &fb->format->format, fb->modifier); -+ drm_dbg_atomic(plane->dev, -+ "[PLANE:%d:%s] invalid pixel format %p4cc, modifier 0x%llx\n", -+ plane->base.id, plane->name, -+ &fb->format->format, fb->modifier); - return ret; - } - -@@ -639,10 +648,11 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, - new_plane_state->crtc_x > INT_MAX - (int32_t) new_plane_state->crtc_w || - new_plane_state->crtc_h > INT_MAX || - new_plane_state->crtc_y > INT_MAX - (int32_t) new_plane_state->crtc_h) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid CRTC coordinates %ux%u+%d+%d\n", -- plane->base.id, plane->name, -- new_plane_state->crtc_w, new_plane_state->crtc_h, -- new_plane_state->crtc_x, new_plane_state->crtc_y); -+ drm_dbg_atomic(plane->dev, -+ "[PLANE:%d:%s] invalid CRTC coordinates %ux%u+%d+%d\n", -+ plane->base.id, plane->name, -+ new_plane_state->crtc_w, new_plane_state->crtc_h, -+ new_plane_state->crtc_x, new_plane_state->crtc_y); - return -ERANGE; - } - -@@ -654,18 +664,19 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, - new_plane_state->src_x > fb_width - new_plane_state->src_w || - new_plane_state->src_h > fb_height || - new_plane_state->src_y > fb_height - new_plane_state->src_h) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid source coordinates " -- "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n", -- plane->base.id, plane->name, -- new_plane_state->src_w >> 16, -- ((new_plane_state->src_w & 0xffff) * 15625) >> 10, -- new_plane_state->src_h >> 16, -- ((new_plane_state->src_h & 0xffff) * 15625) >> 10, -- new_plane_state->src_x >> 16, -- ((new_plane_state->src_x & 0xffff) * 15625) >> 10, -- new_plane_state->src_y >> 16, -- ((new_plane_state->src_y & 0xffff) * 15625) >> 10, -- fb->width, fb->height); -+ drm_dbg_atomic(plane->dev, -+ "[PLANE:%d:%s] invalid source coordinates " -+ "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n", -+ plane->base.id, plane->name, -+ new_plane_state->src_w >> 16, -+ ((new_plane_state->src_w & 0xffff) * 15625) >> 10, -+ new_plane_state->src_h >> 16, -+ ((new_plane_state->src_h & 0xffff) * 15625) >> 10, -+ new_plane_state->src_x >> 16, -+ ((new_plane_state->src_x & 0xffff) * 15625) >> 10, -+ new_plane_state->src_y >> 16, -+ ((new_plane_state->src_y & 0xffff) * 15625) >> 10, -+ fb->width, fb->height); - return -ENOSPC; - } - -@@ -680,9 +691,10 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, - clips->y1 < 0 || - clips->x2 > fb_width || - clips->y2 > fb_height) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid damage clip %d %d %d %d\n", -- plane->base.id, plane->name, clips->x1, -- clips->y1, clips->x2, clips->y2); -+ drm_dbg_atomic(plane->dev, -+ "[PLANE:%d:%s] invalid damage clip %d %d %d %d\n", -+ plane->base.id, plane->name, clips->x1, -+ clips->y1, clips->x2, clips->y2); - return -EINVAL; - } - clips++; -@@ -690,8 +702,9 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, - } - - if (plane_switching_crtc(old_plane_state, new_plane_state)) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] switching CRTC directly\n", -- plane->base.id, plane->name); -+ drm_dbg_atomic(plane->dev, -+ "[PLANE:%d:%s] switching CRTC directly\n", -+ plane->base.id, plane->name); - return -EINVAL; - } - -@@ -855,8 +868,9 @@ drm_atomic_get_private_obj_state(struct drm_atomic_state *state, - - state->num_private_objs = num_objs; - -- DRM_DEBUG_ATOMIC("Added new private object %p state %p to %p\n", -- obj, obj_state, state); -+ drm_dbg_atomic(state->dev, -+ "Added new private object %p state %p to %p\n", -+ obj, obj_state, state); - - return obj_state; - } -@@ -1036,7 +1050,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state, - state->connectors[index].ptr = connector; - connector_state->state = state; - -- DRM_DEBUG_ATOMIC("Added [CONNECTOR:%d:%s] %p state to %p\n", -+ drm_dbg_atomic(connector->dev, "Added [CONNECTOR:%d:%s] %p state to %p\n", - connector->base.id, connector->name, - connector_state, state); - -@@ -1170,8 +1184,9 @@ drm_atomic_add_encoder_bridges(struct drm_atomic_state *state, - if (!encoder) - return 0; - -- DRM_DEBUG_ATOMIC("Adding all bridges for [encoder:%d:%s] to %p\n", -- encoder->base.id, encoder->name, state); -+ drm_dbg_atomic(encoder->dev, -+ "Adding all bridges for [encoder:%d:%s] to %p\n", -+ encoder->base.id, encoder->name, state); - - drm_for_each_bridge_in_chain(encoder, bridge) { - /* Skip bridges that don't implement the atomic state hooks. */ -@@ -1223,8 +1238,9 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state, - if (ret) - return ret; - -- DRM_DEBUG_ATOMIC("Adding all current connectors for [CRTC:%d:%s] to %p\n", -- crtc->base.id, crtc->name, state); -+ drm_dbg_atomic(crtc->dev, -+ "Adding all current connectors for [CRTC:%d:%s] to %p\n", -+ crtc->base.id, crtc->name, state); - - /* - * Changed connectors are already in @state, so only need to look -@@ -1277,8 +1293,9 @@ drm_atomic_add_affected_planes(struct drm_atomic_state *state, - - WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc)); - -- DRM_DEBUG_ATOMIC("Adding all current planes for [CRTC:%d:%s] to %p\n", -- crtc->base.id, crtc->name, state); -+ drm_dbg_atomic(crtc->dev, -+ "Adding all current planes for [CRTC:%d:%s] to %p\n", -+ crtc->base.id, crtc->name, state); - - drm_for_each_plane_mask(plane, state->dev, old_crtc_state->plane_mask) { - struct drm_plane_state *plane_state = -@@ -1318,7 +1335,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) - unsigned int affected_crtc = 0; - int i, ret = 0; - -- DRM_DEBUG_ATOMIC("checking %p\n", state); -+ drm_dbg_atomic(dev, "checking %p\n", state); - - for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) { - if (new_crtc_state->enable) -@@ -1328,8 +1345,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) - for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { - ret = drm_atomic_plane_check(old_plane_state, new_plane_state); - if (ret) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] atomic core check failed\n", -- plane->base.id, plane->name); -+ drm_dbg_atomic(dev, "[PLANE:%d:%s] atomic core check failed\n", -+ plane->base.id, plane->name); - return ret; - } - } -@@ -1337,8 +1354,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) - for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { - ret = drm_atomic_crtc_check(old_crtc_state, new_crtc_state); - if (ret) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] atomic core check failed\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "[CRTC:%d:%s] atomic core check failed\n", -+ crtc->base.id, crtc->name); - return ret; - } - } -@@ -1346,8 +1363,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) - for_each_new_connector_in_state(state, conn, conn_state, i) { - ret = drm_atomic_connector_check(conn, conn_state); - if (ret) { -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] atomic core check failed\n", -- conn->base.id, conn->name); -+ drm_dbg_atomic(dev, "[CONNECTOR:%d:%s] atomic core check failed\n", -+ conn->base.id, conn->name); - return ret; - } - } -@@ -1356,8 +1373,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) - ret = config->funcs->atomic_check(state->dev, state); - - if (ret) { -- DRM_DEBUG_ATOMIC("atomic driver check for %p failed: %d\n", -- state, ret); -+ drm_dbg_atomic(dev, "atomic driver check for %p failed: %d\n", -+ state, ret); - return ret; - } - } -@@ -1365,8 +1382,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) - if (!state->allow_modeset) { - for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) { - if (drm_atomic_crtc_needs_modeset(new_crtc_state)) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] requires full modeset\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "[CRTC:%d:%s] requires full modeset\n", -+ crtc->base.id, crtc->name); - return -EINVAL; - } - } -@@ -1388,8 +1405,9 @@ int drm_atomic_check_only(struct drm_atomic_state *state) - * so compositors know what's going on. - */ - if (affected_crtc != requested_crtc) { -- DRM_DEBUG_ATOMIC("driver added CRTC to commit: requested 0x%x, affected 0x%0x\n", -- requested_crtc, affected_crtc); -+ drm_dbg_atomic(dev, -+ "driver added CRTC to commit: requested 0x%x, affected 0x%0x\n", -+ requested_crtc, affected_crtc); - WARN(!state->allow_modeset, "adding CRTC not allowed without modesets: requested 0x%x, affected 0x%0x\n", - requested_crtc, affected_crtc); - } -@@ -1421,7 +1439,7 @@ int drm_atomic_commit(struct drm_atomic_state *state) - if (ret) - return ret; - -- DRM_DEBUG_ATOMIC("committing %p\n", state); -+ drm_dbg_atomic(state->dev, "committing %p\n", state); - - return config->funcs->atomic_commit(state->dev, state, false); - } -@@ -1450,7 +1468,7 @@ int drm_atomic_nonblocking_commit(struct drm_atomic_state *state) - if (ret) - return ret; - -- DRM_DEBUG_ATOMIC("committing %p nonblocking\n", state); -+ drm_dbg_atomic(state->dev, "committing %p nonblocking\n", state); - - return config->funcs->atomic_commit(state->dev, state, true); - } -@@ -1647,11 +1665,11 @@ void drm_atomic_print_new_state(const struct drm_atomic_state *state, - int i; - - if (!p) { -- DRM_ERROR("invalid drm printer\n"); -+ drm_err(state->dev, "invalid drm printer\n"); - return; - } - -- DRM_DEBUG_ATOMIC("checking %p\n", state); -+ drm_dbg_atomic(state->dev, "checking %p\n", state); - - for_each_new_plane_in_state(state, plane, plane_state, i) - drm_atomic_plane_print_state(p, plane_state); -diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index 5ba316391381d..d0a8c22cbc4b8 100644 ---- a/drivers/gpu/drm/drm_atomic_helper.c -+++ b/drivers/gpu/drm/drm_atomic_helper.c -@@ -132,9 +132,10 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, - - if (new_encoder) { - if (encoder_mask & drm_encoder_mask(new_encoder)) { -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] on [CONNECTOR:%d:%s] already assigned\n", -- new_encoder->base.id, new_encoder->name, -- connector->base.id, connector->name); -+ drm_dbg_atomic(connector->dev, -+ "[ENCODER:%d:%s] on [CONNECTOR:%d:%s] already assigned\n", -+ new_encoder->base.id, new_encoder->name, -+ connector->base.id, connector->name); - - return -EINVAL; - } -@@ -169,11 +170,12 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, - continue; - - if (!disable_conflicting_encoders) { -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] in use on [CRTC:%d:%s] by [CONNECTOR:%d:%s]\n", -- encoder->base.id, encoder->name, -- connector->state->crtc->base.id, -- connector->state->crtc->name, -- connector->base.id, connector->name); -+ drm_dbg_atomic(connector->dev, -+ "[ENCODER:%d:%s] in use on [CRTC:%d:%s] by [CONNECTOR:%d:%s]\n", -+ encoder->base.id, encoder->name, -+ connector->state->crtc->base.id, -+ connector->state->crtc->name, -+ connector->base.id, connector->name); - ret = -EINVAL; - goto out; - } -@@ -184,10 +186,11 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, - goto out; - } - -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] in use on [CRTC:%d:%s], disabling [CONNECTOR:%d:%s]\n", -- encoder->base.id, encoder->name, -- new_conn_state->crtc->base.id, new_conn_state->crtc->name, -- connector->base.id, connector->name); -+ drm_dbg_atomic(connector->dev, -+ "[ENCODER:%d:%s] in use on [CRTC:%d:%s], disabling [CONNECTOR:%d:%s]\n", -+ encoder->base.id, encoder->name, -+ new_conn_state->crtc->base.id, new_conn_state->crtc->name, -+ connector->base.id, connector->name); - - crtc_state = drm_atomic_get_new_crtc_state(state, new_conn_state->crtc); - -@@ -268,9 +271,10 @@ steal_encoder(struct drm_atomic_state *state, - - encoder_crtc = old_connector_state->crtc; - -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] in use on [CRTC:%d:%s], stealing it\n", -- encoder->base.id, encoder->name, -- encoder_crtc->base.id, encoder_crtc->name); -+ drm_dbg_atomic(encoder->dev, -+ "[ENCODER:%d:%s] in use on [CRTC:%d:%s], stealing it\n", -+ encoder->base.id, encoder->name, -+ encoder_crtc->base.id, encoder_crtc->name); - - set_best_encoder(state, new_connector_state, NULL); - -@@ -291,9 +295,8 @@ update_connector_routing(struct drm_atomic_state *state, - struct drm_encoder *new_encoder; - struct drm_crtc_state *crtc_state; - -- DRM_DEBUG_ATOMIC("Updating routing for [CONNECTOR:%d:%s]\n", -- connector->base.id, -- connector->name); -+ drm_dbg_atomic(connector->dev, "Updating routing for [CONNECTOR:%d:%s]\n", -+ connector->base.id, connector->name); - - if (old_connector_state->crtc != new_connector_state->crtc) { - if (old_connector_state->crtc) { -@@ -308,9 +311,8 @@ update_connector_routing(struct drm_atomic_state *state, - } - - if (!new_connector_state->crtc) { -- DRM_DEBUG_ATOMIC("Disabling [CONNECTOR:%d:%s]\n", -- connector->base.id, -- connector->name); -+ drm_dbg_atomic(connector->dev, "Disabling [CONNECTOR:%d:%s]\n", -+ connector->base.id, connector->name); - - set_best_encoder(state, new_connector_state, NULL); - -@@ -339,8 +341,9 @@ update_connector_routing(struct drm_atomic_state *state, - */ - if (!state->duplicated && drm_connector_is_unregistered(connector) && - crtc_state->active) { -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] is not registered\n", -- connector->base.id, connector->name); -+ drm_dbg_atomic(connector->dev, -+ "[CONNECTOR:%d:%s] is not registered\n", -+ connector->base.id, connector->name); - return -EINVAL; - } - -@@ -354,31 +357,33 @@ update_connector_routing(struct drm_atomic_state *state, - new_encoder = drm_connector_get_single_encoder(connector); - - if (!new_encoder) { -- DRM_DEBUG_ATOMIC("No suitable encoder found for [CONNECTOR:%d:%s]\n", -- connector->base.id, -- connector->name); -+ drm_dbg_atomic(connector->dev, -+ "No suitable encoder found for [CONNECTOR:%d:%s]\n", -+ connector->base.id, connector->name); - return -EINVAL; - } - - if (!drm_encoder_crtc_ok(new_encoder, new_connector_state->crtc)) { -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] incompatible with [CRTC:%d:%s]\n", -- new_encoder->base.id, -- new_encoder->name, -- new_connector_state->crtc->base.id, -- new_connector_state->crtc->name); -+ drm_dbg_atomic(connector->dev, -+ "[ENCODER:%d:%s] incompatible with [CRTC:%d:%s]\n", -+ new_encoder->base.id, -+ new_encoder->name, -+ new_connector_state->crtc->base.id, -+ new_connector_state->crtc->name); - return -EINVAL; - } - - if (new_encoder == new_connector_state->best_encoder) { - set_best_encoder(state, new_connector_state, new_encoder); - -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] keeps [ENCODER:%d:%s], now on [CRTC:%d:%s]\n", -- connector->base.id, -- connector->name, -- new_encoder->base.id, -- new_encoder->name, -- new_connector_state->crtc->base.id, -- new_connector_state->crtc->name); -+ drm_dbg_atomic(connector->dev, -+ "[CONNECTOR:%d:%s] keeps [ENCODER:%d:%s], now on [CRTC:%d:%s]\n", -+ connector->base.id, -+ connector->name, -+ new_encoder->base.id, -+ new_encoder->name, -+ new_connector_state->crtc->base.id, -+ new_connector_state->crtc->name); - - return 0; - } -@@ -389,13 +394,14 @@ update_connector_routing(struct drm_atomic_state *state, - - crtc_state->connectors_changed = true; - -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n", -- connector->base.id, -- connector->name, -- new_encoder->base.id, -- new_encoder->name, -- new_connector_state->crtc->base.id, -- new_connector_state->crtc->name); -+ drm_dbg_atomic(connector->dev, -+ "[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n", -+ connector->base.id, -+ connector->name, -+ new_encoder->base.id, -+ new_encoder->name, -+ new_connector_state->crtc->base.id, -+ new_connector_state->crtc->name); - - return 0; - } -@@ -443,7 +449,7 @@ mode_fixup(struct drm_atomic_state *state) - new_crtc_state, - new_conn_state); - if (ret) { -- DRM_DEBUG_ATOMIC("Bridge atomic check failed\n"); -+ drm_dbg_atomic(encoder->dev, "Bridge atomic check failed\n"); - return ret; - } - -@@ -451,16 +457,18 @@ mode_fixup(struct drm_atomic_state *state) - ret = funcs->atomic_check(encoder, new_crtc_state, - new_conn_state); - if (ret) { -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] check failed\n", -- encoder->base.id, encoder->name); -+ drm_dbg_atomic(encoder->dev, -+ "[ENCODER:%d:%s] check failed\n", -+ encoder->base.id, encoder->name); - return ret; - } - } else if (funcs && funcs->mode_fixup) { - ret = funcs->mode_fixup(encoder, &new_crtc_state->mode, - &new_crtc_state->adjusted_mode); - if (!ret) { -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] fixup failed\n", -- encoder->base.id, encoder->name); -+ drm_dbg_atomic(encoder->dev, -+ "[ENCODER:%d:%s] fixup failed\n", -+ encoder->base.id, encoder->name); - return -EINVAL; - } - } -@@ -483,8 +491,8 @@ mode_fixup(struct drm_atomic_state *state) - ret = funcs->mode_fixup(crtc, &new_crtc_state->mode, - &new_crtc_state->adjusted_mode); - if (!ret) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] fixup failed\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, "[CRTC:%d:%s] fixup failed\n", -+ crtc->base.id, crtc->name); - return -EINVAL; - } - } -@@ -502,8 +510,9 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, - - ret = drm_encoder_mode_valid(encoder, mode); - if (ret != MODE_OK) { -- DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] mode_valid() failed\n", -- encoder->base.id, encoder->name); -+ drm_dbg_atomic(encoder->dev, -+ "[ENCODER:%d:%s] mode_valid() failed\n", -+ encoder->base.id, encoder->name); - return ret; - } - -@@ -511,14 +520,14 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, - ret = drm_bridge_chain_mode_valid(bridge, &connector->display_info, - mode); - if (ret != MODE_OK) { -- DRM_DEBUG_ATOMIC("[BRIDGE] mode_valid() failed\n"); -+ drm_dbg_atomic(encoder->dev, "[BRIDGE] mode_valid() failed\n"); - return ret; - } - - ret = drm_crtc_mode_valid(crtc, mode); - if (ret != MODE_OK) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] mode_valid() failed\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(encoder->dev, "[CRTC:%d:%s] mode_valid() failed\n", -+ crtc->base.id, crtc->name); - return ret; - } - -@@ -619,14 +628,14 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, - WARN_ON(!drm_modeset_is_locked(&crtc->mutex)); - - if (!drm_mode_equal(&old_crtc_state->mode, &new_crtc_state->mode)) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] mode changed\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "[CRTC:%d:%s] mode changed\n", -+ crtc->base.id, crtc->name); - new_crtc_state->mode_changed = true; - } - - if (old_crtc_state->enable != new_crtc_state->enable) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enable changed\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "[CRTC:%d:%s] enable changed\n", -+ crtc->base.id, crtc->name); - - /* - * For clarity this assignment is done here, but -@@ -641,14 +650,14 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, - } - - if (old_crtc_state->active != new_crtc_state->active) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] active changed\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "[CRTC:%d:%s] active changed\n", -+ crtc->base.id, crtc->name); - new_crtc_state->active_changed = true; - } - - if (new_crtc_state->enable != has_connectors) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enabled/connectors mismatch\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "[CRTC:%d:%s] enabled/connectors mismatch\n", -+ crtc->base.id, crtc->name); - - return -EINVAL; - } -@@ -708,10 +717,11 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, - if (!drm_atomic_crtc_needs_modeset(new_crtc_state)) - continue; - -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] needs all connectors, enable: %c, active: %c\n", -- crtc->base.id, crtc->name, -- new_crtc_state->enable ? 'y' : 'n', -- new_crtc_state->active ? 'y' : 'n'); -+ drm_dbg_atomic(dev, -+ "[CRTC:%d:%s] needs all connectors, enable: %c, active: %c\n", -+ crtc->base.id, crtc->name, -+ new_crtc_state->enable ? 'y' : 'n', -+ new_crtc_state->active ? 'y' : 'n'); - - ret = drm_atomic_add_affected_connectors(state, crtc); - if (ret != 0) -@@ -818,7 +828,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, - } - - if (!crtc_state->enable && !can_update_disabled) { -- DRM_DEBUG_KMS("Cannot update plane of a disabled CRTC.\n"); -+ drm_dbg_kms(plane_state->crtc->dev, -+ "Cannot update plane of a disabled CRTC.\n"); - return -EINVAL; - } - -@@ -828,7 +839,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, - hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale); - vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale); - if (hscale < 0 || vscale < 0) { -- DRM_DEBUG_KMS("Invalid scaling of plane\n"); -+ drm_dbg_kms(plane_state->crtc->dev, -+ "Invalid scaling of plane\n"); - drm_rect_debug_print("src: ", &plane_state->src, true); - drm_rect_debug_print("dst: ", &plane_state->dst, false); - return -ERANGE; -@@ -852,7 +864,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, - return 0; - - if (!can_position && !drm_rect_equals(dst, &clip)) { -- DRM_DEBUG_KMS("Plane must cover entire CRTC\n"); -+ drm_dbg_kms(plane_state->crtc->dev, -+ "Plane must cover entire CRTC\n"); - drm_rect_debug_print("dst: ", dst, false); - drm_rect_debug_print("clip: ", &clip, false); - return -EINVAL; -@@ -904,8 +917,9 @@ drm_atomic_helper_check_planes(struct drm_device *dev, - - ret = funcs->atomic_check(plane, state); - if (ret) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] atomic driver check failed\n", -- plane->base.id, plane->name); -+ drm_dbg_atomic(plane->dev, -+ "[PLANE:%d:%s] atomic driver check failed\n", -+ plane->base.id, plane->name); - return ret; - } - } -@@ -920,8 +934,9 @@ drm_atomic_helper_check_planes(struct drm_device *dev, - - ret = funcs->atomic_check(crtc, state); - if (ret) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] atomic driver check failed\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, -+ "[CRTC:%d:%s] atomic driver check failed\n", -+ crtc->base.id, crtc->name); - return ret; - } - } -@@ -1059,8 +1074,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) - - funcs = encoder->helper_private; - -- DRM_DEBUG_ATOMIC("disabling [ENCODER:%d:%s]\n", -- encoder->base.id, encoder->name); -+ drm_dbg_atomic(dev, "disabling [ENCODER:%d:%s]\n", -+ encoder->base.id, encoder->name); - - /* - * Each encoder has at most one connector (since we always steal -@@ -1097,8 +1112,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) - - funcs = crtc->helper_private; - -- DRM_DEBUG_ATOMIC("disabling [CRTC:%d:%s]\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "disabling [CRTC:%d:%s]\n", -+ crtc->base.id, crtc->name); - - - /* Right function depends upon target state. */ -@@ -1248,8 +1263,8 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) - funcs = crtc->helper_private; - - if (new_crtc_state->enable && funcs->mode_set_nofb) { -- DRM_DEBUG_ATOMIC("modeset on [CRTC:%d:%s]\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "modeset on [CRTC:%d:%s]\n", -+ crtc->base.id, crtc->name); - - funcs->mode_set_nofb(crtc); - } -@@ -1273,8 +1288,8 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) - if (!new_crtc_state->mode_changed) - continue; - -- DRM_DEBUG_ATOMIC("modeset on [ENCODER:%d:%s]\n", -- encoder->base.id, encoder->name); -+ drm_dbg_atomic(dev, "modeset on [ENCODER:%d:%s]\n", -+ encoder->base.id, encoder->name); - - /* - * Each encoder has at most one connector (since we always steal -@@ -1376,8 +1391,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, - funcs = crtc->helper_private; - - if (new_crtc_state->enable) { -- DRM_DEBUG_ATOMIC("enabling [CRTC:%d:%s]\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(dev, "enabling [CRTC:%d:%s]\n", -+ crtc->base.id, crtc->name); - if (funcs->atomic_enable) - funcs->atomic_enable(crtc, old_state); - else if (funcs->commit) -@@ -1400,8 +1415,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, - encoder = new_conn_state->best_encoder; - funcs = encoder->helper_private; - -- DRM_DEBUG_ATOMIC("enabling [ENCODER:%d:%s]\n", -- encoder->base.id, encoder->name); -+ drm_dbg_atomic(dev, "enabling [ENCODER:%d:%s]\n", -+ encoder->base.id, encoder->name); - - /* - * Each encoder has at most one connector (since we always steal -@@ -1570,8 +1585,8 @@ void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev, - - ret = wait_for_completion_timeout(&commit->flip_done, 10 * HZ); - if (ret == 0) -- DRM_ERROR("[CRTC:%d:%s] flip_done timed out\n", -- crtc->base.id, crtc->name); -+ drm_err(dev, "[CRTC:%d:%s] flip_done timed out\n", -+ crtc->base.id, crtc->name); - } - - if (old_state->fake_commit) -@@ -1758,8 +1773,9 @@ int drm_atomic_helper_async_check(struct drm_device *dev, - */ - if (old_plane_state->commit && - !try_wait_for_completion(&old_plane_state->commit->hw_done)) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] inflight previous commit preventing async commit\n", -- plane->base.id, plane->name); -+ drm_dbg_atomic(dev, -+ "[PLANE:%d:%s] inflight previous commit preventing async commit\n", -+ plane->base.id, plane->name); - return -EBUSY; - } - -@@ -1981,8 +1997,9 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock) - */ - if (!completed && nonblock) { - spin_unlock(&crtc->commit_lock); -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] busy with a previous commit\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, -+ "[CRTC:%d:%s] busy with a previous commit\n", -+ crtc->base.id, crtc->name); - - return -EBUSY; - } -@@ -2004,8 +2021,8 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock) - ret = wait_for_completion_interruptible_timeout(&stall_commit->cleanup_done, - 10*HZ); - if (ret == 0) -- DRM_ERROR("[CRTC:%d:%s] cleanup_done timed out\n", -- crtc->base.id, crtc->name); -+ drm_err(crtc->dev, "[CRTC:%d:%s] cleanup_done timed out\n", -+ crtc->base.id, crtc->name); - - drm_crtc_commit_put(stall_commit); - -@@ -2169,8 +2186,9 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, - */ - if (nonblock && old_conn_state->commit && - !try_wait_for_completion(&old_conn_state->commit->flip_done)) { -- DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] busy with a previous commit\n", -- conn->base.id, conn->name); -+ drm_dbg_atomic(conn->dev, -+ "[CONNECTOR:%d:%s] busy with a previous commit\n", -+ conn->base.id, conn->name); - - return -EBUSY; - } -@@ -2190,8 +2208,9 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, - */ - if (nonblock && old_plane_state->commit && - !try_wait_for_completion(&old_plane_state->commit->flip_done)) { -- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] busy with a previous commit\n", -- plane->base.id, plane->name); -+ drm_dbg_atomic(plane->dev, -+ "[PLANE:%d:%s] busy with a previous commit\n", -+ plane->base.id, plane->name); - - return -EBUSY; - } -@@ -2237,22 +2256,25 @@ void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *old_state) - for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) { - ret = drm_crtc_commit_wait(old_crtc_state->commit); - if (ret) -- DRM_ERROR("[CRTC:%d:%s] commit wait timed out\n", -- crtc->base.id, crtc->name); -+ drm_err(crtc->dev, -+ "[CRTC:%d:%s] commit wait timed out\n", -+ crtc->base.id, crtc->name); - } - - for_each_old_connector_in_state(old_state, conn, old_conn_state, i) { - ret = drm_crtc_commit_wait(old_conn_state->commit); - if (ret) -- DRM_ERROR("[CONNECTOR:%d:%s] commit wait timed out\n", -- conn->base.id, conn->name); -+ drm_err(conn->dev, -+ "[CONNECTOR:%d:%s] commit wait timed out\n", -+ conn->base.id, conn->name); - } - - for_each_old_plane_in_state(old_state, plane, old_plane_state, i) { - ret = drm_crtc_commit_wait(old_plane_state->commit); - if (ret) -- DRM_ERROR("[PLANE:%d:%s] commit wait timed out\n", -- plane->base.id, plane->name); -+ drm_err(plane->dev, -+ "[PLANE:%d:%s] commit wait timed out\n", -+ plane->base.id, plane->name); - } - } - EXPORT_SYMBOL(drm_atomic_helper_wait_for_dependencies); -@@ -3139,7 +3161,9 @@ void drm_atomic_helper_shutdown(struct drm_device *dev) - - ret = drm_atomic_helper_disable_all(dev, &ctx); - if (ret) -- DRM_ERROR("Disabling all crtc's during unload failed with %i\n", ret); -+ drm_err(dev, -+ "Disabling all crtc's during unload failed with %i\n", -+ ret); - - DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); - } -@@ -3399,8 +3423,9 @@ static int page_flip_common(struct drm_atomic_state *state, - /* Make sure we don't accidentally do a full modeset. */ - state->allow_modeset = false; - if (!crtc_state->active) { -- DRM_DEBUG_ATOMIC("[CRTC:%d:%s] disabled, rejecting legacy flip\n", -- crtc->base.id, crtc->name); -+ drm_dbg_atomic(crtc->dev, -+ "[CRTC:%d:%s] disabled, rejecting legacy flip\n", -+ crtc->base.id, crtc->name); - return -EINVAL; - } - -diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c -index f195c70131373..adf6a3c272e72 100644 ---- a/drivers/gpu/drm/drm_atomic_uapi.c -+++ b/drivers/gpu/drm/drm_atomic_uapi.c -@@ -775,7 +775,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, - state->scaling_mode = val; - } else if (property == config->content_protection_property) { - if (val == DRM_MODE_CONTENT_PROTECTION_ENABLED) { -- DRM_DEBUG_KMS("only drivers can set CP Enabled\n"); -+ drm_dbg_kms(dev, "only drivers can set CP Enabled\n"); - return -EINVAL; - } - state->content_protection = val; -diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c -index 60a6b21474b14..6e433d465f41d 100644 ---- a/drivers/gpu/drm/drm_auth.c -+++ b/drivers/gpu/drm/drm_auth.c -@@ -106,7 +106,7 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) - auth->magic = file_priv->magic; - mutex_unlock(&dev->master_mutex); - -- DRM_DEBUG("%u\n", auth->magic); -+ drm_dbg_core(dev, "%u\n", auth->magic); - - return ret < 0 ? ret : 0; - } -@@ -117,7 +117,7 @@ int drm_authmagic(struct drm_device *dev, void *data, - struct drm_auth *auth = data; - struct drm_file *file; - -- DRM_DEBUG("%u\n", auth->magic); -+ drm_dbg_core(dev, "%u\n", auth->magic); - - mutex_lock(&dev->master_mutex); - file = idr_find(&file_priv->master->magic_map, auth->magic); -@@ -274,7 +274,9 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, - } - - if (file_priv->master->lessor != NULL) { -- DRM_DEBUG_LEASE("Attempt to set lessee %d as master\n", file_priv->master->lessee_id); -+ drm_dbg_lease(dev, -+ "Attempt to set lessee %d as master\n", -+ file_priv->master->lessee_id); - ret = -EINVAL; - goto out_unlock; - } -@@ -315,7 +317,9 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, - } - - if (file_priv->master->lessor != NULL) { -- DRM_DEBUG_LEASE("Attempt to drop lessee %d as master\n", file_priv->master->lessee_id); -+ drm_dbg_lease(dev, -+ "Attempt to drop lessee %d as master\n", -+ file_priv->master->lessee_id); - ret = -EINVAL; - goto out_unlock; - } --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index a438ee3fc3a..006ad579de0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -57,7 +57,6 @@ iio-adc-ad7192-correct-reference-voltage.patch perf-add-irq-and-exception-return-branch-types.patch perf-x86-move-branch-classifier.patch perf-x86-lbr-filter-vsyscall-addresses.patch -drm-get-rid-of-drm_debug_-log-calls-in-drm-core-file.patch drm-atomic-helper-relax-unregistered-connector-check.patch powerpc-32s-remove-capability-to-disable-kuep-at-boo.patch powerpc-32s-do-kuep_lock-and-kuep_unlock-in-assembly.patch