Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: Don't pass crtc_state to foo_plane_ctl() & co.
The *_plane_ctl() functions only consider the state of the
plane (the state of the crtc is handled by the corresponding
*_plane_ctl_crtc()), and thus they don't need the crtc_state
at all. Don't pass it in.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250717171353.23090-7-ville.syrjala@linux.intel.com
+16
-25
+2
-3
drivers/gpu/drm/i915/display/i9xx_plane.c
+2
-3
drivers/gpu/drm/i915/display/i9xx_plane.c
···
155
155
i9xx_plane == PLANE_C;
156
156
}
157
157
158
-
static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state,
159
-
const struct intel_plane_state *plane_state)
158
+
static u32 i9xx_plane_ctl(const struct intel_plane_state *plane_state)
160
159
{
161
160
struct intel_display *display = to_intel_display(plane_state);
162
161
const struct drm_framebuffer *fb = plane_state->hw.fb;
···
354
355
if (ret)
355
356
return ret;
356
357
357
-
plane_state->ctl = i9xx_plane_ctl(crtc_state, plane_state);
358
+
plane_state->ctl = i9xx_plane_ctl(plane_state);
358
359
359
360
return 0;
360
361
}
+4
-6
drivers/gpu/drm/i915/display/intel_cursor.c
+4
-6
drivers/gpu/drm/i915/display/intel_cursor.c
···
205
205
return cntl;
206
206
}
207
207
208
-
static u32 i845_cursor_ctl(const struct intel_crtc_state *crtc_state,
209
-
const struct intel_plane_state *plane_state)
208
+
static u32 i845_cursor_ctl(const struct intel_plane_state *plane_state)
210
209
{
211
210
return CURSOR_ENABLE |
212
211
CURSOR_FORMAT_ARGB |
···
265
266
return -EINVAL;
266
267
}
267
268
268
-
plane_state->ctl = i845_cursor_ctl(crtc_state, plane_state);
269
+
plane_state->ctl = i845_cursor_ctl(plane_state);
269
270
270
271
return 0;
271
272
}
···
397
398
return cntl;
398
399
}
399
400
400
-
static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,
401
-
const struct intel_plane_state *plane_state)
401
+
static u32 i9xx_cursor_ctl(const struct intel_plane_state *plane_state)
402
402
{
403
403
struct intel_display *display = to_intel_display(plane_state);
404
404
u32 cntl = 0;
···
524
526
return -EINVAL;
525
527
}
526
528
527
-
plane_state->ctl = i9xx_cursor_ctl(crtc_state, plane_state);
529
+
plane_state->ctl = i9xx_cursor_ctl(plane_state);
528
530
529
531
return 0;
530
532
}
+6
-9
drivers/gpu/drm/i915/display/intel_sprite.c
+6
-9
drivers/gpu/drm/i915/display/intel_sprite.c
···
264
264
return sprctl;
265
265
}
266
266
267
-
static u32 vlv_sprite_ctl(const struct intel_crtc_state *crtc_state,
268
-
const struct intel_plane_state *plane_state)
267
+
static u32 vlv_sprite_ctl(const struct intel_plane_state *plane_state)
269
268
{
270
269
const struct drm_framebuffer *fb = plane_state->hw.fb;
271
270
unsigned int rotation = plane_state->hw.rotation;
···
659
660
(display->platform.ivybridge || display->platform.haswell);
660
661
}
661
662
662
-
static u32 ivb_sprite_ctl(const struct intel_crtc_state *crtc_state,
663
-
const struct intel_plane_state *plane_state)
663
+
static u32 ivb_sprite_ctl(const struct intel_plane_state *plane_state)
664
664
{
665
665
struct intel_display *display = to_intel_display(plane_state);
666
666
const struct drm_framebuffer *fb = plane_state->hw.fb;
···
1008
1010
return dvscntr;
1009
1011
}
1010
1012
1011
-
static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,
1012
-
const struct intel_plane_state *plane_state)
1013
+
static u32 g4x_sprite_ctl(const struct intel_plane_state *plane_state)
1013
1014
{
1014
1015
struct intel_display *display = to_intel_display(plane_state);
1015
1016
const struct drm_framebuffer *fb = plane_state->hw.fb;
···
1375
1378
return ret;
1376
1379
1377
1380
if (DISPLAY_VER(display) >= 7)
1378
-
plane_state->ctl = ivb_sprite_ctl(crtc_state, plane_state);
1381
+
plane_state->ctl = ivb_sprite_ctl(plane_state);
1379
1382
else
1380
-
plane_state->ctl = g4x_sprite_ctl(crtc_state, plane_state);
1383
+
plane_state->ctl = g4x_sprite_ctl(plane_state);
1381
1384
1382
1385
return 0;
1383
1386
}
···
1427
1430
if (ret)
1428
1431
return ret;
1429
1432
1430
-
plane_state->ctl = vlv_sprite_ctl(crtc_state, plane_state);
1433
+
plane_state->ctl = vlv_sprite_ctl(plane_state);
1431
1434
1432
1435
return 0;
1433
1436
}
+4
-7
drivers/gpu/drm/i915/display/skl_universal_plane.c
+4
-7
drivers/gpu/drm/i915/display/skl_universal_plane.c
···
1166
1166
return plane_ctl;
1167
1167
}
1168
1168
1169
-
static u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
1170
-
const struct intel_plane_state *plane_state)
1169
+
static u32 skl_plane_ctl(const struct intel_plane_state *plane_state)
1171
1170
{
1172
1171
struct intel_display *display = to_intel_display(plane_state);
1173
1172
const struct drm_framebuffer *fb = plane_state->hw.fb;
···
1224
1225
return plane_color_ctl;
1225
1226
}
1226
1227
1227
-
static u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
1228
-
const struct intel_plane_state *plane_state)
1228
+
static u32 glk_plane_color_ctl(const struct intel_plane_state *plane_state)
1229
1229
{
1230
1230
struct intel_display *display = to_intel_display(plane_state);
1231
1231
const struct drm_framebuffer *fb = plane_state->hw.fb;
···
2353
2355
plane_state->damage = DRM_RECT_INIT(0, 0, 0, 0);
2354
2356
}
2355
2357
2356
-
plane_state->ctl = skl_plane_ctl(crtc_state, plane_state);
2358
+
plane_state->ctl = skl_plane_ctl(plane_state);
2357
2359
2358
2360
if (DISPLAY_VER(display) >= 10)
2359
-
plane_state->color_ctl = glk_plane_color_ctl(crtc_state,
2360
-
plane_state);
2361
+
plane_state->color_ctl = glk_plane_color_ctl(plane_state);
2361
2362
2362
2363
if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier) &&
2363
2364
icl_is_hdr_plane(display, plane->id))