archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 03:04:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: rename intel_plane_initial.h to intel_initial_plane.h

Browse source 
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>
This commit is contained in:
Jani Nikula 2025-12-15 17:28:17 +02:00
parent 6a3e94ff05
commit b99690ffbc
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/i915/display/intel_display.c
View file

@ -100,6 +100,7 @@
#include "intel_frontbuffer.h"
#include "intel_hdmi.h"
#include "intel_hotplug.h"
#include "intel_initial_plane.h"
#include "intel_link_bw.h"
#include "intel_lt_phy.h"
#include "intel_lvds.h"
@ -113,7 +114,6 @@
#include "intel_pfit.h"
#include "intel_pipe_crc.h"
#include "intel_plane.h"
#include "intel_plane_initial.h"
#include "intel_pmdemand.h"
#include "intel_pps.h"
#include "intel_psr.h"
@ -639,7 +639,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
if ((crtc_state->active_planes & ~BIT(PLANE_CURSOR)) == 0 &&
hsw_ips_disable(crtc_state)) {
crtc_state->ips_enabled = false;
intel_plane_initial_vblank_wait(crtc);
intel_initial_plane_vblank_wait(crtc);
}
/*
@ -653,7 +653,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
*/
if (HAS_GMCH(display) &&
intel_set_memory_cxsr(display, false))
intel_plane_initial_vblank_wait(crtc);
intel_initial_plane_vblank_wait(crtc);
/*
* Gen2 reports pipe underruns whenever all planes are disabled.
@ -663,7 +663,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
intel_set_cpu_fifo_underrun_reporting(display, crtc->pipe, false);
intel_plane_disable_arm(NULL, plane, crtc_state);
intel_plane_initial_vblank_wait(crtc);
intel_initial_plane_vblank_wait(crtc);
}
unsigned int

2
drivers/gpu/drm/i915/display/intel_display_driver.c
View file

@ -54,11 +54,11 @@
#include "intel_hdcp.h"
#include "intel_hotplug.h"
#include "intel_hti.h"
#include "intel_initial_plane.h"
#include "intel_modeset_lock.h"
#include "intel_modeset_setup.h"
#include "intel_opregion.h"
#include "intel_overlay.h"
#include "intel_plane_initial.h"
#include "intel_pmdemand.h"
#include "intel_pps.h"
#include "intel_psr.h"

6
drivers/gpu/drm/i915/display/intel_plane_initial.h → drivers/gpu/drm/i915/display/intel_initial_plane.h
View file

@ -3,13 +3,13 @@
* Copyright © 2021 Intel Corporation
*/
#ifndef __INTEL_PLANE_INITIAL_H__
#define __INTEL_PLANE_INITIAL_H__
#ifndef __INTEL_INITIAL_PLANE_H__
#define __INTEL_INITIAL_PLANE_H__
struct intel_crtc;
struct intel_display;
void intel_initial_plane_config(struct intel_display *display);
void intel_plane_initial_vblank_wait(struct intel_crtc *crtc);
void intel_initial_plane_vblank_wait(struct intel_crtc *crtc);
#endif

6
drivers/gpu/drm/i915/i915_initial_plane.c
View file

@ -11,14 +11,14 @@
#include "display/intel_display_types.h"
#include "display/intel_fb.h"
#include "display/intel_frontbuffer.h"
#include "display/intel_initial_plane.h"
#include "display/intel_plane.h"
#include "display/intel_plane_initial.h"
#include "gem/i915_gem_lmem.h"
#include "gem/i915_gem_region.h"
#include "i915_drv.h"
void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
void intel_initial_plane_vblank_wait(struct intel_crtc *crtc)
{
intel_crtc_wait_for_next_vblank(crtc);
}
@ -436,7 +436,7 @@ void intel_initial_plane_config(struct intel_display *display)
intel_find_initial_plane_obj(crtc, plane_configs);
if (display->funcs.display->fixup_initial_plane_config(crtc, plane_config))
intel_plane_initial_vblank_wait(crtc);
intel_initial_plane_vblank_wait(crtc);
plane_config_fini(plane_config);
}

6
drivers/gpu/drm/xe/display/xe_initial_plane.c
View file

@ -19,15 +19,15 @@
#include "intel_fb.h"
#include "intel_fb_pin.h"
#include "intel_frontbuffer.h"
#include "intel_initial_plane.h"
#include "intel_plane.h"
#include "intel_plane_initial.h"
#include "xe_bo.h"
#include "xe_vram_types.h"
#include "xe_wa.h"
#include <generated/xe_device_wa_oob.h>
void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
void intel_initial_plane_vblank_wait(struct intel_crtc *crtc)
{
/* Early xe has no irq */
struct xe_device *xe = to_xe_device(crtc->base.dev);
@ -314,7 +314,7 @@ void intel_initial_plane_config(struct intel_display *display)
intel_find_initial_plane_obj(crtc, plane_configs);
if (display->funcs.display->fixup_initial_plane_config(crtc, plane_config))
intel_plane_initial_vblank_wait(crtc);
intel_initial_plane_vblank_wait(crtc);
plane_config_fini(plane_config);
}