Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_atomic.c

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 3ea2106c8d7d7d67dd2fa9bd3f3e8d4ed269a1b9..c85dcfd69158d77ce691fad9698f2bb2235b906c 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2014 Red Hat
  * Copyright (C) 2014 Intel Corp.
+ * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1609,9 +1610,20 @@ commit:
 }
 EXPORT_SYMBOL(__drm_atomic_helper_set_config);
 
-void drm_atomic_print_state(const struct drm_atomic_state *state)
+/**
+ * drm_atomic_print_new_state - prints drm atomic state
+ * @state: atomic configuration to check
+ * @p: drm printer
+ *
+ * This functions prints the drm atomic state snapshot using the drm printer
+ * which is passed to it. This snapshot can be used for debugging purposes.
+ *
+ * Note that this function looks into the new state objects and hence its not
+ * safe to be used after the call to drm_atomic_helper_commit_hw_done().
+ */
+void drm_atomic_print_new_state(const struct drm_atomic_state *state,
+               struct drm_printer *p)
 {
-       struct drm_printer p = drm_info_printer(state->dev->dev);
        struct drm_plane *plane;
        struct drm_plane_state *plane_state;
        struct drm_crtc *crtc;
@@ -1620,17 +1632,23 @@ void drm_atomic_print_state(const struct drm_atomic_state *state)
        struct drm_connector_state *connector_state;
        int i;
 
+       if (!p) {
+               DRM_ERROR("invalid drm printer\n");
+               return;
+       }
+
        DRM_DEBUG_ATOMIC("checking %p\n", state);
 
        for_each_new_plane_in_state(state, plane, plane_state, i)
-               drm_atomic_plane_print_state(&p, plane_state);
+               drm_atomic_plane_print_state(p, plane_state);
 
        for_each_new_crtc_in_state(state, crtc, crtc_state, i)
-               drm_atomic_crtc_print_state(&p, crtc_state);
+               drm_atomic_crtc_print_state(p, crtc_state);
 
        for_each_new_connector_in_state(state, connector, connector_state, i)
-               drm_atomic_connector_print_state(&p, connector_state);
+               drm_atomic_connector_print_state(p, connector_state);
 }
+EXPORT_SYMBOL(drm_atomic_print_new_state);
 
 static void __drm_state_dump(struct drm_device *dev, struct drm_printer *p,
                             bool take_locks)