Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: rename intel_plane_initial.h to intel_initial_plane.h
Follow the more naturally flowing naming. Rename both the header and the
vblank wait function.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/32c2d68a9ae7d2262ad2c63e873e522e67bc78df.1765812266.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+14
-14
+4
-4
drivers/gpu/drm/i915/display/intel_display.c
+4
-4
drivers/gpu/drm/i915/display/intel_display.c
···
100
100
#include "intel_frontbuffer.h"
101
101
#include "intel_hdmi.h"
102
102
#include "intel_hotplug.h"
103
+
#include "intel_initial_plane.h"
103
104
#include "intel_link_bw.h"
104
105
#include "intel_lt_phy.h"
105
106
#include "intel_lvds.h"
···
114
113
#include "intel_pfit.h"
115
114
#include "intel_pipe_crc.h"
116
115
#include "intel_plane.h"
117
-
#include "intel_plane_initial.h"
118
116
#include "intel_pmdemand.h"
119
117
#include "intel_pps.h"
120
118
#include "intel_psr.h"
···
639
639
if ((crtc_state->active_planes & ~BIT(PLANE_CURSOR)) == 0 &&
640
640
hsw_ips_disable(crtc_state)) {
641
641
crtc_state->ips_enabled = false;
642
-
intel_plane_initial_vblank_wait(crtc);
642
+
intel_initial_plane_vblank_wait(crtc);
643
643
}
644
644
645
645
/*
···
653
653
*/
654
654
if (HAS_GMCH(display) &&
655
655
intel_set_memory_cxsr(display, false))
656
-
intel_plane_initial_vblank_wait(crtc);
656
+
intel_initial_plane_vblank_wait(crtc);
657
657
658
658
/*
659
659
* Gen2 reports pipe underruns whenever all planes are disabled.
···
663
663
intel_set_cpu_fifo_underrun_reporting(display, crtc->pipe, false);
664
664
665
665
intel_plane_disable_arm(NULL, plane, crtc_state);
666
-
intel_plane_initial_vblank_wait(crtc);
666
+
intel_initial_plane_vblank_wait(crtc);
667
667
}
668
668
669
669
unsigned int
+1
-1
drivers/gpu/drm/i915/display/intel_display_driver.c
+1
-1
drivers/gpu/drm/i915/display/intel_display_driver.c
···
54
54
#include "intel_hdcp.h"
55
55
#include "intel_hotplug.h"
56
56
#include "intel_hti.h"
57
+
#include "intel_initial_plane.h"
57
58
#include "intel_modeset_lock.h"
58
59
#include "intel_modeset_setup.h"
59
60
#include "intel_opregion.h"
60
61
#include "intel_overlay.h"
61
-
#include "intel_plane_initial.h"
62
62
#include "intel_pmdemand.h"
63
63
#include "intel_pps.h"
64
64
#include "intel_psr.h"
+3
-3
drivers/gpu/drm/i915/display/intel_plane_initial.h
drivers/gpu/drm/i915/display/intel_initial_plane.h
+3
-3
drivers/gpu/drm/i915/display/intel_plane_initial.h
drivers/gpu/drm/i915/display/intel_initial_plane.h
···
3
3
* Copyright © 2021 Intel Corporation
4
4
*/
5
5
6
-
#ifndef __INTEL_PLANE_INITIAL_H__
7
-
#define __INTEL_PLANE_INITIAL_H__
6
+
#ifndef __INTEL_INITIAL_PLANE_H__
7
+
#define __INTEL_INITIAL_PLANE_H__
8
8
9
9
struct intel_crtc;
10
10
struct intel_display;
11
11
12
12
void intel_initial_plane_config(struct intel_display *display);
13
-
void intel_plane_initial_vblank_wait(struct intel_crtc *crtc);
13
+
void intel_initial_plane_vblank_wait(struct intel_crtc *crtc);
14
14
15
15
#endif
+3
-3
drivers/gpu/drm/i915/i915_initial_plane.c
+3
-3
drivers/gpu/drm/i915/i915_initial_plane.c
···
11
11
#include "display/intel_display_types.h"
12
12
#include "display/intel_fb.h"
13
13
#include "display/intel_frontbuffer.h"
14
+
#include "display/intel_initial_plane.h"
14
15
#include "display/intel_plane.h"
15
-
#include "display/intel_plane_initial.h"
16
16
#include "gem/i915_gem_lmem.h"
17
17
#include "gem/i915_gem_region.h"
18
18
19
19
#include "i915_drv.h"
20
20
21
-
void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
21
+
void intel_initial_plane_vblank_wait(struct intel_crtc *crtc)
22
22
{
23
23
intel_crtc_wait_for_next_vblank(crtc);
24
24
}
···
436
436
intel_find_initial_plane_obj(crtc, plane_configs);
437
437
438
438
if (display->funcs.display->fixup_initial_plane_config(crtc, plane_config))
439
-
intel_plane_initial_vblank_wait(crtc);
439
+
intel_initial_plane_vblank_wait(crtc);
440
440
441
441
plane_config_fini(plane_config);
442
442
}
+3
-3
drivers/gpu/drm/xe/display/xe_initial_plane.c
+3
-3
drivers/gpu/drm/xe/display/xe_initial_plane.c
···
19
19
#include "intel_fb.h"
20
20
#include "intel_fb_pin.h"
21
21
#include "intel_frontbuffer.h"
22
+
#include "intel_initial_plane.h"
22
23
#include "intel_plane.h"
23
-
#include "intel_plane_initial.h"
24
24
#include "xe_bo.h"
25
25
#include "xe_vram_types.h"
26
26
#include "xe_wa.h"
27
27
28
28
#include <generated/xe_device_wa_oob.h>
29
29
30
-
void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
30
+
void intel_initial_plane_vblank_wait(struct intel_crtc *crtc)
31
31
{
32
32
/* Early xe has no irq */
33
33
struct xe_device *xe = to_xe_device(crtc->base.dev);
···
314
314
intel_find_initial_plane_obj(crtc, plane_configs);
315
315
316
316
if (display->funcs.display->fixup_initial_plane_config(crtc, plane_config))
317
-
intel_plane_initial_vblank_wait(crtc);
317
+
intel_initial_plane_vblank_wait(crtc);
318
318
319
319
plane_config_fini(plane_config);
320
320
}