Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: drop i915 param from i915_fence{, _context}_timeout()
The i915_fence_context_timeout() and i915_fence_timeout() functions both
have the struct drm_i915_private parameter, which is unused. It's likely
in preparation for something that just didn't end up happening.
Remove them, dropping the last struct drm_i915_private usage for xe
display build.
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patch.msgid.link/dce86cb031d523a95a96ed2bf9c93bb28e6b20ab.1767009044.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+8
-19
+1
-3
drivers/gpu/drm/i915/display/intel_display.c
+1
-3
drivers/gpu/drm/i915/display/intel_display.c
···
50
50
#include "g4x_hdmi.h"
51
51
#include "hsw_ips.h"
52
52
#include "i915_config.h"
53
-
#include "i915_drv.h"
54
53
#include "i915_reg.h"
55
54
#include "i9xx_plane.h"
56
55
#include "i9xx_plane_regs.h"
···
7164
7165
7165
7166
static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_state)
7166
7167
{
7167
-
struct drm_i915_private *i915 = to_i915(intel_state->base.dev);
7168
7168
struct drm_plane *plane;
7169
7169
struct drm_plane_state *new_plane_state;
7170
7170
long ret;
···
7172
7174
for_each_new_plane_in_state(&intel_state->base, plane, new_plane_state, i) {
7173
7175
if (new_plane_state->fence) {
7174
7176
ret = dma_fence_wait_timeout(new_plane_state->fence, false,
7175
-
i915_fence_timeout(i915));
7177
+
i915_fence_timeout());
7176
7178
if (ret <= 0)
7177
7179
break;
7178
7180
+1
-1
drivers/gpu/drm/i915/gem/i915_gem_clflush.c
+1
-1
drivers/gpu/drm/i915/gem/i915_gem_clflush.c
+1
-2
drivers/gpu/drm/i915/i915_config.c
+1
-2
drivers/gpu/drm/i915/i915_config.c
···
8
8
#include "i915_config.h"
9
9
#include "i915_jiffies.h"
10
10
11
-
unsigned long
12
-
i915_fence_context_timeout(const struct drm_i915_private *i915, u64 context)
11
+
unsigned long i915_fence_context_timeout(u64 context)
13
12
{
14
13
if (CONFIG_DRM_I915_FENCE_TIMEOUT && context)
15
14
return msecs_to_jiffies_timeout(CONFIG_DRM_I915_FENCE_TIMEOUT);
+3
-7
drivers/gpu/drm/i915/i915_config.h
+3
-7
drivers/gpu/drm/i915/i915_config.h
···
9
9
#include <linux/types.h>
10
10
#include <linux/limits.h>
11
11
12
-
struct drm_i915_private;
12
+
unsigned long i915_fence_context_timeout(u64 context);
13
13
14
-
unsigned long i915_fence_context_timeout(const struct drm_i915_private *i915,
15
-
u64 context);
16
-
17
-
static inline unsigned long
18
-
i915_fence_timeout(const struct drm_i915_private *i915)
14
+
static inline unsigned long i915_fence_timeout(void)
19
15
{
20
-
return i915_fence_context_timeout(i915, U64_MAX);
16
+
return i915_fence_context_timeout(U64_MAX);
21
17
}
22
18
23
19
#endif /* __I915_CONFIG_H__ */
+1
-2
drivers/gpu/drm/i915/i915_request.c
+1
-2
drivers/gpu/drm/i915/i915_request.c
+1
-4
drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
+1
-4
drivers/gpu/drm/xe/compat-i915-headers/i915_config.h