tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/reset: pass test only parameter to intel_display_reset_finish()
Deduplicate the gpu_reset_clobbers_display() part by passing the
information in from gt side.
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a36481db334fedcde50ae0e66c4d57825cae8cb7.1741001054.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+4
-12
+2
-10
drivers/gpu/drm/i915/display/intel_display_reset.c
+2
-10
drivers/gpu/drm/i915/display/intel_display_reset.c
···
14
14
#include "intel_hotplug.h"
15
15
#include "intel_pps.h"
16
16
17
-
static bool gpu_reset_clobbers_display(struct intel_display *display)
18
-
{
19
-
struct drm_i915_private *i915 = to_i915(display->drm);
20
-
21
-
return (INTEL_INFO(i915)->gpu_reset_clobbers_display &&
22
-
intel_has_gpu_reset(to_gt(i915)));
23
-
}
24
-
25
17
bool intel_display_reset_test(struct intel_display *display)
26
18
{
27
19
return display->params.force_reset_modeset_test;
···
75
83
return true;
76
84
}
77
85
78
-
void intel_display_reset_finish(struct intel_display *display)
86
+
void intel_display_reset_finish(struct intel_display *display, bool test_only)
79
87
{
80
88
struct drm_i915_private *i915 = to_i915(display->drm);
81
89
struct drm_modeset_acquire_ctx *ctx = &display->restore.reset_ctx;
···
90
98
goto unlock;
91
99
92
100
/* reset doesn't touch the display */
93
-
if (!gpu_reset_clobbers_display(display)) {
101
+
if (test_only) {
94
102
/* for testing only restore the display */
95
103
ret = drm_atomic_helper_commit_duplicated_state(state, ctx);
96
104
if (ret) {
+1
-1
drivers/gpu/drm/i915/display/intel_display_reset.h
+1
-1
drivers/gpu/drm/i915/display/intel_display_reset.h
···
12
12
13
13
bool intel_display_reset_test(struct intel_display *display);
14
14
bool intel_display_reset_prepare(struct intel_display *display);
15
-
void intel_display_reset_finish(struct intel_display *display);
15
+
void intel_display_reset_finish(struct intel_display *display, bool test_only);
16
16
17
17
#endif /* __INTEL_RESET_H__ */
+1
-1
drivers/gpu/drm/i915/gt/intel_reset.c
+1
-1
drivers/gpu/drm/i915/gt/intel_reset.c