drm/i915/display: split out high level display entry points
Subsystems (3)
cover drm/i915/display: split out high level display entry points
Add intel_display_driver.[ch] and move the high level display code entry points there. Also split out intel_display_reset.[ch]. And declutter intel_display.c by nearly 700 lines.
BR,
Jani.
Jani Nikula (10):
drm/i915/display: remove intel_display_commit_duplicated_state() drm/i915/display: start high level display driver file drm/i915/display: move intel_modeset_probe_defer() to
intel_display_driver.[ch]
drm/i915/display: rename intel_modeset_probe_defer() ->
intel_display_driver_probe_defer()
drm/i915/display: move modeset probe/remove functions to
intel_display_driver.c
drm/i915/display: rename intel_display_driver_* functions drm/i915/display: add intel_display_reset.[ch] drm/i915/display: move display suspend/resume to
intel_display_driver.[ch]
drm/i915/display: rename intel_display_driver_suspend/resume functions drm/i915/display: add intel_display_driver_early_probe()
drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/display/intel_display.c | 691 +----------------- drivers/gpu/drm/i915/display/intel_display.h | 31 +- .../drm/i915/display/intel_display_driver.c | 581 +++++++++++++++ .../drm/i915/display/intel_display_driver.h | 36 + .../drm/i915/display/intel_display_reset.c | 135 ++++ .../drm/i915/display/intel_display_reset.h | 14 + drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- drivers/gpu/drm/i915/i915_driver.c | 30 +- drivers/gpu/drm/i915/i915_pci.c | 3 +- 10 files changed, 816 insertions(+), 713 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.h create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.h
Signature · 1 line
2.39.2
PATCH 1/10 drm/i915/display: remove intel_display_commit_duplicated_state()
This seems like an unnecessary wrapper layer. Removing it will be helpful later.
--- drivers/gpu/drm/i915/display/intel_display.c | 28 +++++++------------- 1 file changed, 10 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +10 -18
@@ -701,20 +701,6 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)return y; } -static int -intel_display_commit_duplicated_state (struct intel_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx) -{ -struct drm_i915_private *i915 =to_i915 (state->base.dev); -int ret; - - ret =drm_atomic_helper_commit_duplicated_state (&state->base, ctx); - -drm_WARN_ON (&i915->drm, ret == -EDEADLK ); - -return ret; -} - static int __intel_display_resume(struct drm_i915_private *i915, struct drm_atomic_state *state,
@@ -722,7 +708,7 @@ __intel_display_resume(struct drm_i915_private *i915, {struct drm_crtc_state *crtc_state;struct drm_crtc *crtc; -int i; +int ret, i;intel_modeset_setup_hw_state (i915, ctx);intel_vga_redisable (i915);
@@ -748,7 +734,11 @@ __intel_display_resume(struct drm_i915_private *i915,if (!HAS_GMCH (i915))to_intel_atomic_state (state)->skip_intermediate_wm = true; -return intel_display_commit_duplicated_state (to_intel_atomic_state (state), ctx); + ret =drm_atomic_helper_commit_duplicated_state (state, ctx); + +drm_WARN_ON (&i915->drm, ret == -EDEADLK ); + +return ret; }static bool gpu_reset_clobbers_display (struct drm_i915_private *dev_priv)
@@ -839,10 +829,12 @@ void intel_display_finish_reset(struct drm_i915_private *i915)/* reset doesn't touch the display */ if (!gpu_reset_clobbers_display (i915)) {/* for testing only restore the display */ - ret =intel_display_commit_duplicated_state (to_intel_atomic_state (state), ctx); -if (ret) + ret =drm_atomic_helper_commit_duplicated_state (state, ctx); +if (ret) { +drm_WARN_ON (&i915->drm, ret == -EDEADLK );drm_err (&i915->drm,"Restoring old state failed with %i\n" , ret); + } }else {/* * The display has been reset as well,
Signature · 1 line
2.39.2
PATCH 2/10 drm/i915/display: start high level display driver file
In reply to Jani NikulaThe only way to truly clean up intel_display.[ch] is to move stuff out of them until there's absolutely nothing left.
Start moving the high level display driver entry points, i.e. functions called from top level driver code only, to a new file, which we'll call intel_display_driver.c. The intention is that there's no low-level display code or details here. This is an in-between layer.
Initially, move intel_display_driver_register() and intel_display_driver_unregister() there.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 53 -------------- drivers/gpu/drm/i915/display/intel_display.h | 3 - .../drm/i915/display/intel_display_driver.c | 71 +++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 15 ++++ drivers/gpu/drm/i915/i915_driver.c | 1 + 6 files changed, 88 insertions(+), 56 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -237,6 +237,7 @@ i915-y += \ display/intel_crtc_state_dump.o \ display/intel_cursor.o \ display/intel_display.o \ + display/intel_display_driver.o \ display/intel_display_power.o \ display/intel_display_power_map.o \ display/intel_display_power_well.o \
drivers/gpu/drm/i915/display/intel_display.c +0 -53
71 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +0 -3
@@ -518,9 +518,6 @@ void intel_set_plane_visible(struct intel_crtc_state *crtc_state, bool visible);void intel_plane_fixup_bitmasks (struct intel_crtc_state *crtc_state); -void intel_display_driver_register (struct drm_i915_private *i915); -void intel_display_driver_unregister (struct drm_i915_private *i915); -void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */
drivers/gpu/drm/i915/display/intel_display_driver.c new file +71 -0
71 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_driver.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2022-2023 Intel Corporation +*/ + +#ifndef __INTEL_DISPLAY_DRIVER_H__ +#define __INTEL_DISPLAY_DRIVER_H__ + +struct drm_i915_private ; + +void intel_display_driver_register (struct drm_i915_private *i915); +void intel_display_driver_unregister (struct drm_i915_private *i915); + +#endif /* __INTEL_DISPLAY_DRIVER_H__ */ +
drivers/gpu/drm/i915/i915_driver.c +1 -0
@@ -48,6 +48,7 @@#include "display/intel_acpi.h" #include "display/intel_bw.h" #include "display/intel_cdclk.h" +#include "display/intel_display_driver.h" #include "display/intel_display_types.h" #include "display/intel_dmc.h" #include "display/intel_dp.h"
Signature · 1 line
2.39.2
PATCH 3/10 drm/i915/display: move intel_modeset_probe_defer() to intel_display_driver.[ch]
In reply to Jani NikulaHigh level display functionality only called from driver top level code.
--- drivers/gpu/drm/i915/display/intel_display.c | 23 ------------------- drivers/gpu/drm/i915/display/intel_display.h | 1 - .../drm/i915/display/intel_display_driver.c | 23 +++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 1 + 5 files changed, 28 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -23
@@ -31,7 +31,6 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/string_helpers.h> -#include <linux/vga_switcheroo.h> #include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h>
@@ -40,7 +39,6 @@#include <drm/drm_damage_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fourcc.h> -#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_probe_helper.h> #include <drm/drm_rect.h>
@@ -8810,27 +8808,6 @@ void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)intel_bios_driver_remove (i915); } -bool intel_modeset_probe_defer (struct pci_dev *pdev) -{ -struct drm_privacy_screen *privacy_screen; - -/* -* apple-gmux is needed on dual GPU MacBook Pro -* to probe the panel if we're the inactive GPU. -*/ -if (vga_switcheroo_client_probe_defer (pdev)) -return true; - -/* If the LCD panel has a privacy-screen, wait for it */ - privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); -if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) -return true; - -drm_privacy_screen_put (privacy_screen); - -return false; -} -bool intel_scanout_needs_vtd_wa (struct drm_i915_private *i915) {return DISPLAY_VER (i915) >=6 &&i915_vtd_active (i915);
drivers/gpu/drm/i915/display/intel_display.h +0 -1
@@ -521,7 +521,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */ -bool intel_modeset_probe_defer (struct pci_dev *pdev);void intel_modeset_init_hw (struct drm_i915_private *i915);int intel_modeset_init_noirq (struct drm_i915_private *i915);int intel_modeset_init_nogem (struct drm_i915_private *i915);
drivers/gpu/drm/i915/display/intel_display_driver.c +23 -0
@@ -7,8 +7,10 @@* details here. */ +#include <linux/vga_switcheroo.h> #include <acpi/video.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_probe_helper.h> #include "i915_drv.h"
@@ -19,6 +21,27 @@#include "intel_fbdev.h" #include "intel_opregion.h" +bool intel_modeset_probe_defer (struct pci_dev *pdev) +{ +struct drm_privacy_screen *privacy_screen; + +/* +* apple-gmux is needed on dual GPU MacBook Pro +* to probe the panel if we're the inactive GPU. +*/ +if (vga_switcheroo_client_probe_defer (pdev)) +return true; + +/* If the LCD panel has a privacy-screen, wait for it */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return true; + +drm_privacy_screen_put (privacy_screen); + +return false; +} +void intel_display_driver_register (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))
drivers/gpu/drm/i915/display/intel_display_driver.h +4 -0
@@ -6,8 +6,12 @@#ifndef __INTEL_DISPLAY_DRIVER_H__#define __INTEL_DISPLAY_DRIVER_H__ +#include <linux/types.h> +struct drm_i915_private ; +struct pci_dev ; +bool intel_modeset_probe_defer (struct pci_dev *pdev);void intel_display_driver_register (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -27,6 +27,7 @@#include <drm/i915_pciids.h> #include "display/intel_display.h" +#include "display/intel_display_driver.h" #include "gt/intel_gt_regs.h" #include "gt/intel_sa_media.h"
Signature · 1 line
2.39.2
PATCH 4/10 drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer()
In reply to Jani NikulaFollow the usual naming conventions.
--- drivers/gpu/drm/i915/display/intel_display_driver.c | 2 +- drivers/gpu/drm/i915/display/intel_display_driver.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display_driver.c +1 -1
@@ -21,7 +21,7 @@#include "intel_fbdev.h" #include "intel_opregion.h" -bool intel_modeset_probe_defer (struct pci_dev *pdev) +bool intel_display_driver_probe_defer (struct pci_dev *pdev) {struct drm_privacy_screen *privacy_screen;
drivers/gpu/drm/i915/display/intel_display_driver.h +1 -1
@@ -11,7 +11,7 @@struct drm_i915_private ;struct pci_dev ; -bool intel_modeset_probe_defer (struct pci_dev *pdev); +bool intel_display_driver_probe_defer (struct pci_dev *pdev);void intel_display_driver_register (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);
drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -1355,7 +1355,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return -ENXIO ;/* Detect if we need to wait for other drivers early on */ -if (intel_modeset_probe_defer (pdev)) +if (intel_display_driver_probe_defer (pdev))return -EPROBE_DEFER ; err =i915_driver_probe (pdev, ent);
Signature · 1 line
2.39.2
PATCH 5/10 drm/i915/display: move modeset probe/remove functions to intel_display_driver.c
In reply to Jani NikulaHigh level display functionality only called from driver top level code.
--- drivers/gpu/drm/i915/display/intel_display.c | 373 +---------------- drivers/gpu/drm/i915/display/intel_display.h | 23 +- .../drm/i915/display/intel_display_driver.c | 374 ++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 7 + 4 files changed, 408 insertions(+), 369 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +11 -362
@@ -54,7 +54,6 @@#include "i9xx_plane.h" #include "i9xx_wm.h" #include "icl_dsi.h" -#include "intel_acpi.h" #include "intel_atomic.h" #include "intel_atomic_plane.h" #include "intel_audio.h"
@@ -67,6 +66,7 @@#include "intel_crtc_state_dump.h" #include "intel_ddi.h" #include "intel_de.h" +#include "intel_display_driver.h" #include "intel_display_power.h" #include "intel_display_types.h" #include "intel_dmc.h"
@@ -86,11 +86,8 @@#include "intel_fdi.h" #include "intel_fifo_underrun.h" #include "intel_frontbuffer.h" -#include "intel_gmbus.h" -#include "intel_hdcp.h" #include "intel_hdmi.h" #include "intel_hotplug.h" -#include "intel_hti.h" #include "intel_lvds.h" #include "intel_lvds_regs.h" #include "intel_modeset_setup.h"
@@ -104,7 +101,6 @@#include "intel_plane_initial.h" #include "intel_pps.h" #include "intel_psr.h" -#include "intel_quirks.h" #include "intel_sdvo.h" #include "intel_snps_phy.h" #include "intel_tc.h"
@@ -174,7 +170,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,return hpll; } -static void intel_update_czclk (struct drm_i915_private *dev_priv) +void intel_update_czclk (struct drm_i915_private *dev_priv) {if (!(IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)))return ;
@@ -2582,7 +2578,7 @@ intel_link_compute_m_n(u16 bits_per_pixel, int nlanes, 0x80000); } -static void intel_panel_sanitize_ssc (struct drm_i915_private *dev_priv) +void intel_panel_sanitize_ssc (struct drm_i915_private *dev_priv) {/* * There may be no VBT; and if the BIOS enabled SSC we can
@@ -7225,7 +7221,7 @@ static void intel_atomic_helper_free_state(struct drm_i915_private *dev_priv)drm_atomic_state_put (&state->base); } -static void intel_atomic_helper_free_state_worker (struct work_struct *work) +void intel_atomic_helper_free_state_worker (struct work_struct *work) {struct drm_i915_private *dev_priv =container_of (work,typeof (*dev_priv), display.atomic_helper.free_work);
@@ -7573,9 +7569,8 @@ static void intel_atomic_track_fbs(struct intel_atomic_state *state) plane->frontbuffer_bit); } -static int intel_atomic_commit (struct drm_device *dev, -struct drm_atomic_state *_state, -bool nonblock) +int intel_atomic_commit (struct drm_device *dev,struct drm_atomic_state *_state, +bool nonblock) {struct intel_atomic_state *state =to_intel_atomic_state (_state);struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -7677,19 +7672,6 @@ void intel_plane_destroy(struct drm_plane *plane)kfree (to_intel_plane (plane)); } -static void intel_plane_possible_crtcs_init (struct drm_i915_private *dev_priv) -{ -struct intel_plane *plane; - -for_each_intel_plane (&dev_priv->drm, plane) { -struct intel_crtc *crtc =intel_crtc_for_pipe (dev_priv, - plane->pipe); - - plane->base.possible_crtcs =drm_crtc_mask (&crtc->base); - } -} - -int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {
@@ -7769,7 +7751,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)return true; } -static void intel_setup_outputs (struct drm_i915_private *dev_priv) +void intel_setup_outputs (struct drm_i915_private *dev_priv) {struct intel_encoder *encoder;bool dpd_is_edp = false;
@@ -8021,9 +8003,8 @@ static int max_dotclock(struct drm_i915_private *i915)return max_dotclock; } -static enum drm_mode_status -intel_mode_valid (struct drm_device *dev, -const struct drm_display_mode *mode) +enum drm_mode_status intel_mode_valid (struct drm_device *dev, +const struct drm_display_mode *mode) {struct drm_i915_private *dev_priv =to_i915 (dev);int hdisplay_max, htotal_max;
@@ -8163,18 +8144,6 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,return MODE_OK ; } -static const struct drm_mode_config_funcs intel_mode_funcs = { - .fb_create = intel_user_framebuffer_create, - .get_format_info = intel_fb_get_format_info, - .output_poll_changed = intel_fbdev_output_poll_changed, - .mode_valid = intel_mode_valid, - .atomic_check = intel_atomic_check, - .atomic_commit = intel_atomic_commit, - .atomic_state_alloc = intel_atomic_state_alloc, - .atomic_state_clear = intel_atomic_state_clear, - .atomic_state_free = intel_atomic_state_free, -}; -static const struct intel_display_funcs skl_display_funcs = { .get_pipe_config = hsw_get_pipe_config, .crtc_enable = hsw_crtc_enable,
@@ -8246,21 +8215,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)intel_fdi_init_hook (dev_priv); } -void intel_modeset_init_hw (struct drm_i915_private *i915) -{ -struct intel_cdclk_state *cdclk_state; - -if (!HAS_DISPLAY (i915)) -return ; - - cdclk_state =to_intel_cdclk_state (i915->display.cdclk.obj.state); - -intel_update_cdclk (i915); -intel_cdclk_dump_config (i915, &i915->display.cdclk.hw,"Current CDCLK" ); - cdclk_state->logical = cdclk_state->actual = i915->display.cdclk.hw; -} - -static int intel_initial_commit (struct drm_device *dev) +int intel_initial_commit (struct drm_device *dev) {struct drm_atomic_state *state =NULL ;struct drm_modeset_acquire_ctx ctx;
@@ -8339,246 +8294,6 @@ static int intel_initial_commit(struct drm_device *dev)return ret; } -static const struct drm_mode_config_helper_funcs intel_mode_config_funcs = { - .atomic_commit_setup = drm_dp_mst_atomic_setup_commit, -}; - -static void intel_mode_config_init (struct drm_i915_private *i915) -{ -struct drm_mode_config *mode_config = &i915->drm.mode_config; - -drm_mode_config_init (&i915->drm); -INIT_LIST_HEAD (&i915->display.global.obj_list); - - mode_config->min_width =0 ; - mode_config->min_height =0 ; - - mode_config->preferred_depth =24 ; - mode_config->prefer_shadow =1 ; - - mode_config->funcs = &intel_mode_funcs; - mode_config->helper_private = &intel_mode_config_funcs; - - mode_config->async_page_flip =HAS_ASYNC_FLIPS (i915); - -/* -* Maximum framebuffer dimensions, chosen to match -* the maximum render engine surface size on gen4+. -*/ -if (DISPLAY_VER (i915) >=7 ) { - mode_config->max_width =16384 ; - mode_config->max_height =16384 ; - }else if (DISPLAY_VER (i915) >=4 ) { - mode_config->max_width =8192 ; - mode_config->max_height =8192 ; - }else if (DISPLAY_VER (i915) ==3 ) { - mode_config->max_width =4096 ; - mode_config->max_height =4096 ; - }else { - mode_config->max_width =2048 ; - mode_config->max_height =2048 ; - } - -if (IS_I845G (i915) ||IS_I865G (i915)) { - mode_config->cursor_width =IS_I845G (i915) ?64 :512 ; - mode_config->cursor_height =1023 ; - }else if (IS_I830 (i915) ||IS_I85X (i915) || -IS_I915G (i915) ||IS_I915GM (i915)) { - mode_config->cursor_width =64 ; - mode_config->cursor_height =64 ; - }else { - mode_config->cursor_width =256 ; - mode_config->cursor_height =256 ; - } -} - -static void intel_mode_config_cleanup (struct drm_i915_private *i915) -{ -intel_atomic_global_obj_cleanup (i915); -drm_mode_config_cleanup (&i915->drm); -} - -/* part #1: call before irq install */ -int intel_modeset_init_noirq (struct drm_i915_private *i915) -{ -int ret; - -if (i915_inject_probe_failure (i915)) -return -ENODEV ; - -if (HAS_DISPLAY (i915)) { - ret =drm_vblank_init (&i915->drm, -INTEL_NUM_PIPES (i915)); -if (ret) -return ret; - } - -intel_bios_init (i915); - - ret =intel_vga_register (i915); -if (ret) - goto cleanup_bios; - -/* FIXME: completely on the wrong abstraction layer */ - ret =intel_power_domains_init (i915); -if (ret <0 ) - goto cleanup_vga; - -intel_power_domains_init_hw (i915, false); - -if (!HAS_DISPLAY (i915)) -return 0 ; - -intel_dmc_init (i915); - - i915->display.wq.modeset =alloc_ordered_workqueue ("i915_modeset" ,0 ); - i915->display.wq.flip =alloc_workqueue ("i915_flip" ,WQ_HIGHPRI | -WQ_UNBOUND ,WQ_UNBOUND_MAX_ACTIVE ); - -intel_mode_config_init (i915); - - ret =intel_cdclk_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - - ret =intel_color_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - - ret =intel_dbuf_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - - ret =intel_bw_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - -init_llist_head (&i915->display.atomic_helper.free_list); -INIT_WORK (&i915->display.atomic_helper.free_work, - intel_atomic_helper_free_state_worker); - -intel_init_quirks (i915); - -intel_fbc_init (i915); - -return 0 ; - -cleanup_vga_client_pw_domain_dmc: -intel_dmc_fini (i915); -intel_power_domains_driver_remove (i915); -cleanup_vga: -intel_vga_unregister (i915); -cleanup_bios: -intel_bios_driver_remove (i915); - -return ret; -} - -/* part #2: call after irq install, but before gem init */ -int intel_modeset_init_nogem (struct drm_i915_private *i915) -{ -struct drm_device *dev = &i915->drm; -enum pipe pipe; -struct intel_crtc *crtc; -int ret; - -if (!HAS_DISPLAY (i915)) -return 0 ; - -intel_wm_init (i915); - -intel_panel_sanitize_ssc (i915); - -intel_pps_setup (i915); - -intel_gmbus_setup (i915); - -drm_dbg_kms (&i915->drm,"%d display pipe%s available.\n" , -INTEL_NUM_PIPES (i915), -INTEL_NUM_PIPES (i915) >1 ?"s" :"" ); - -for_each_pipe (i915, pipe) { - ret =intel_crtc_init (i915, pipe); -if (ret) { -intel_mode_config_cleanup (i915); -return ret; - } - } - -intel_plane_possible_crtcs_init (i915); -intel_shared_dpll_init (i915); -intel_fdi_pll_freq_update (i915); - -intel_update_czclk (i915); -intel_modeset_init_hw (i915); -intel_dpll_update_ref_clks (i915); - -intel_hdcp_component_init (i915); - -if (i915->display.cdclk.max_cdclk_freq ==0 ) -intel_update_max_cdclk (i915); - -intel_hti_init (i915); - -/* Just disable it once at startup */ -intel_vga_disable (i915); -intel_setup_outputs (i915); - -drm_modeset_lock_all (dev); -intel_modeset_setup_hw_state (i915, dev->mode_config.acquire_ctx); -intel_acpi_assign_connector_fwnodes (i915); -drm_modeset_unlock_all (dev); - -for_each_intel_crtc (dev, crtc) { -if (!to_intel_crtc_state (crtc->base.state)->uapi.active) -continue ; -intel_crtc_initial_plane_config (crtc); - } - -/* -* Make sure hardware watermarks really match the state we read out. -* Note that we need to do this after reconstructing the BIOS fb's -* since the watermark calculation done here will use pstate->fb. -*/ -if (!HAS_GMCH (i915)) -ilk_wm_sanitize (i915); - -return 0 ; -} - -/* part #3: call after gem init */ -int intel_modeset_init (struct drm_i915_private *i915) -{ -int ret; - -if (!HAS_DISPLAY (i915)) -return 0 ; - -/* -* Force all active planes to recompute their states. So that on -* mode_setcrtc after probe, all the intel_plane_state variables -* are already calculated and there is no assert_plane warnings -* during bootup. -*/ - ret =intel_initial_commit (&i915->drm); -if (ret) -drm_dbg_kms (&i915->drm,"Initial modeset failed, %d\n" , ret); - -intel_overlay_setup (i915); - - ret =intel_fbdev_init (&i915->drm); -if (ret) -return ret; - -/* Only enable hotplug handling once the fbdev is fully set up. */ -intel_hpd_init (i915); -intel_hpd_poll_disable (i915); - -skl_watermark_ipc_init (i915); - -return 0 ; -} -void i830_enable_pipe (struct drm_i915_private *dev_priv,enum pipe pipe) {struct intel_crtc *crtc =intel_crtc_for_pipe (dev_priv, pipe);
@@ -8724,7 +8439,7 @@ void intel_display_resume(struct drm_device *dev)drm_atomic_state_put (state); } -static void intel_hpd_poll_fini (struct drm_i915_private *i915) +void intel_hpd_poll_fini (struct drm_i915_private *i915) {struct intel_connector *connector;struct drm_connector_list_iter conn_iter;
@@ -8742,72 +8457,6 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915)drm_connector_list_iter_end (&conn_iter); } -/* part #1: call before irq uninstall */ -void intel_modeset_driver_remove (struct drm_i915_private *i915) -{ -if (!HAS_DISPLAY (i915)) -return ; - -flush_workqueue (i915->display.wq.flip); -flush_workqueue (i915->display.wq.modeset); - -flush_work (&i915->display.atomic_helper.free_work); -drm_WARN_ON (&i915->drm, !llist_empty (&i915->display.atomic_helper.free_list)); - -/* -* MST topology needs to be suspended so we don't have any calls to -* fbdev after it's finalized. MST will be destroyed later as part of -* drm_mode_config_cleanup() -*/ -intel_dp_mst_suspend (i915); -} - -/* part #2: call after irq uninstall */ -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915) -{ -if (!HAS_DISPLAY (i915)) -return ; - -/* -* Due to the hpd irq storm handling the hotplug work can re-arm the -* poll handlers. Hence disable polling after hpd handling is shut down. -*/ -intel_hpd_poll_fini (i915); - -/* poll work can call into fbdev, hence clean that up afterwards */ -intel_fbdev_fini (i915); - -intel_unregister_dsm_handler (); - -/* flush any delayed tasks or pending work */ -flush_scheduled_work (); - -intel_hdcp_component_fini (i915); - -intel_mode_config_cleanup (i915); - -intel_overlay_cleanup (i915); - -intel_gmbus_teardown (i915); - -destroy_workqueue (i915->display.wq.flip); -destroy_workqueue (i915->display.wq.modeset); - -intel_fbc_cleanup (i915); -} - -/* part #3: call after gem init */ -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915) -{ -intel_dmc_fini (i915); - -intel_power_domains_driver_remove (i915); - -intel_vga_unregister (i915); - -intel_bios_driver_remove (i915); -} -bool intel_scanout_needs_vtd_wa (struct drm_i915_private *i915) {return DISPLAY_VER (i915) >=6 &&i915_vtd_active (i915);
drivers/gpu/drm/i915/display/intel_display.h +16 -7
@@ -63,6 +63,7 @@ struct intel_power_domain_mask;struct intel_remapped_info ;struct intel_rotation_info ;struct pci_dev ; +struct work_struct ;#define pipe_name (p) ((p) + 'A')
@@ -521,13 +522,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */ -void intel_modeset_init_hw (struct drm_i915_private *i915); -int intel_modeset_init_noirq (struct drm_i915_private *i915); -int intel_modeset_init_nogem (struct drm_i915_private *i915); -int intel_modeset_init (struct drm_i915_private *i915); -void intel_modeset_driver_remove (struct drm_i915_private *i915); -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915); -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_resume (struct drm_device *dev);int intel_modeset_all_pipes (struct intel_atomic_state *state,const char *reason);
@@ -536,6 +530,21 @@ void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,void intel_modeset_put_crtc_power_domains (struct intel_crtc *crtc,struct intel_power_domain_mask *domains); +/* interface for intel_display_driver.c */ +void intel_setup_outputs (struct drm_i915_private *i915); +void intel_sanitize_watermarks (struct drm_i915_private *i915); +int intel_initial_commit (struct drm_device *dev); +void intel_panel_sanitize_ssc (struct drm_i915_private *i915); +void intel_update_czclk (struct drm_i915_private *i915); +void intel_atomic_helper_free_state_worker (struct work_struct *work); +enum drm_mode_status intel_mode_valid (struct drm_device *dev, +const struct drm_display_mode *mode); +int intel_atomic_commit (struct drm_device *dev,struct drm_atomic_state *_state, +bool nonblock); +int intel_atomic_check (struct drm_device *dev,struct drm_atomic_state *_state); + +void intel_hpd_poll_fini (struct drm_i915_private *i915); +/* modesetting asserts */ void assert_transcoder (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,bool state);
drivers/gpu/drm/i915/display/intel_display_driver.c +374 -0
403 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_driver.h +7 -0
@@ -12,7 +12,14 @@ struct drm_i915_private;struct pci_dev ;bool intel_display_driver_probe_defer (struct pci_dev *pdev); +void intel_modeset_init_hw (struct drm_i915_private *i915); +int intel_modeset_init_noirq (struct drm_i915_private *i915); +int intel_modeset_init_nogem (struct drm_i915_private *i915); +int intel_modeset_init (struct drm_i915_private *i915);void intel_display_driver_register (struct drm_i915_private *i915); +void intel_modeset_driver_remove (struct drm_i915_private *i915); +void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915); +void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);#endif /* __INTEL_DISPLAY_DRIVER_H__ */
Signature · 1 line
2.39.2
PATCH 6/10 drm/i915/display: rename intel_display_driver_* functions
In reply to Jani NikulaFollow the usual naming conventions.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- .../drm/i915/display/intel_display_driver.c | 16 +++++++------- .../drm/i915/display/intel_display_driver.h | 14 ++++++------- drivers/gpu/drm/i915/i915_driver.c | 21 ++++++++++--------- 4 files changed, 27 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -833,7 +833,7 @@ void intel_display_finish_reset(struct drm_i915_private *i915)* so need a full re-initialization. */ intel_pps_unlock_regs_wa (i915); -intel_modeset_init_hw (i915); +intel_display_driver_init_hw (i915);intel_clock_gating_init (i915);intel_hpd_init (i915);
drivers/gpu/drm/i915/display/intel_display_driver.c +8 -8
@@ -72,7 +72,7 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev)return false; } -void intel_modeset_init_hw (struct drm_i915_private *i915) +void intel_display_driver_init_hw (struct drm_i915_private *i915) {struct intel_cdclk_state *cdclk_state;
@@ -170,7 +170,7 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) }/* part #1: call before irq install */ -int intel_modeset_init_noirq (struct drm_i915_private *i915) +int intel_display_driver_probe_noirq (struct drm_i915_private *i915) {int ret;
@@ -246,7 +246,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) }/* part #2: call after irq install, but before gem init */ -int intel_modeset_init_nogem (struct drm_i915_private *i915) +int intel_display_driver_probe_nogem (struct drm_i915_private *i915) {struct drm_device *dev = &i915->drm;enum pipe pipe;
@@ -281,7 +281,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)intel_fdi_pll_freq_update (i915);intel_update_czclk (i915); -intel_modeset_init_hw (i915); +intel_display_driver_init_hw (i915);intel_dpll_update_ref_clks (i915);intel_hdcp_component_init (i915);
@@ -318,7 +318,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) }/* part #3: call after gem init */ -int intel_modeset_init (struct drm_i915_private *i915) +int intel_display_driver_probe (struct drm_i915_private *i915) {int ret;
@@ -382,7 +382,7 @@ void intel_display_driver_register(struct drm_i915_private *i915) }/* part #1: call before irq uninstall */ -void intel_modeset_driver_remove (struct drm_i915_private *i915) +void intel_display_driver_remove (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))return ;
@@ -402,7 +402,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915) }/* part #2: call after irq uninstall */ -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915) +void intel_display_driver_remove_noirq (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))return ;
@@ -436,7 +436,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915) }/* part #3: call after gem init */ -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915) +void intel_display_driver_remove_nogem (struct drm_i915_private *i915) {intel_dmc_fini (i915);
drivers/gpu/drm/i915/display/intel_display_driver.h +7 -7
@@ -12,14 +12,14 @@ struct drm_i915_private;struct pci_dev ;bool intel_display_driver_probe_defer (struct pci_dev *pdev); -void intel_modeset_init_hw (struct drm_i915_private *i915); -int intel_modeset_init_noirq (struct drm_i915_private *i915); -int intel_modeset_init_nogem (struct drm_i915_private *i915); -int intel_modeset_init (struct drm_i915_private *i915); +void intel_display_driver_init_hw (struct drm_i915_private *i915); +int intel_display_driver_probe_noirq (struct drm_i915_private *i915); +int intel_display_driver_probe_nogem (struct drm_i915_private *i915); +int intel_display_driver_probe (struct drm_i915_private *i915);void intel_display_driver_register (struct drm_i915_private *i915); -void intel_modeset_driver_remove (struct drm_i915_private *i915); -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915); -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915); +void intel_display_driver_remove (struct drm_i915_private *i915); +void intel_display_driver_remove_noirq (struct drm_i915_private *i915); +void intel_display_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);#endif /* __INTEL_DISPLAY_DRIVER_H__ */
drivers/gpu/drm/i915/i915_driver.c +11 -10
@@ -791,7 +791,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret <0 ) goto out_cleanup_mmio; - ret =intel_modeset_init_noirq (i915); + ret =intel_display_driver_probe_noirq (i915);if (ret <0 ) goto out_cleanup_hw;
@@ -799,7 +799,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto out_cleanup_modeset; - ret =intel_modeset_init_nogem (i915); + ret =intel_display_driver_probe_nogem (i915);if (ret) goto out_cleanup_irq;
@@ -809,7 +809,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)intel_pxp_init (i915); - ret =intel_modeset_init (i915); + ret =intel_display_driver_probe (i915);if (ret) goto out_cleanup_gem;
@@ -829,14 +829,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)i915_gem_driver_release (i915); out_cleanup_modeset2:/* FIXME clean up the error path */ -intel_modeset_driver_remove (i915); +intel_display_driver_remove (i915);intel_irq_uninstall (i915); -intel_modeset_driver_remove_noirq (i915); +intel_display_driver_remove_noirq (i915); goto out_cleanup_modeset; out_cleanup_irq:intel_irq_uninstall (i915); out_cleanup_modeset: -intel_modeset_driver_remove_nogem (i915); +intel_display_driver_remove_nogem (i915); out_cleanup_hw:i915_driver_hw_remove (i915);intel_memory_regions_driver_release (i915);
@@ -872,16 +872,16 @@ void i915_driver_remove(struct drm_i915_private *i915)intel_gvt_driver_remove (i915); -intel_modeset_driver_remove (i915); +intel_display_driver_remove (i915);intel_irq_uninstall (i915); -intel_modeset_driver_remove_noirq (i915); +intel_display_driver_remove_noirq (i915);i915_reset_error_state (i915);i915_gem_driver_remove (i915); -intel_modeset_driver_remove_nogem (i915); +intel_display_driver_remove_nogem (i915);i915_driver_hw_remove (i915);
@@ -1244,7 +1244,8 @@ static int i915_drm_resume(struct drm_device *dev)i915_gem_resume (dev_priv); -intel_modeset_init_hw (dev_priv); +intel_display_driver_init_hw (dev_priv); +intel_clock_gating_init (dev_priv);intel_hpd_init (dev_priv);
Signature · 1 line
2.39.2
PATCH 7/10 drm/i915/display: add intel_display_reset.[ch]
In reply to Jani NikulaSplit out the display reset functionality to a separate file to declutter intel_display.c. Rename the functions accordingly. The minor downside is having to expose __intel_display_resume().
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 123 +--------------- drivers/gpu/drm/i915/display/intel_display.h | 8 +- .../drm/i915/display/intel_display_reset.c | 135 ++++++++++++++++++ .../drm/i915/display/intel_display_reset.h | 14 ++ drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- 6 files changed, 160 insertions(+), 127 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -241,6 +241,7 @@ i915-y += \ display/intel_display_power.o \ display/intel_display_power_map.o \ display/intel_display_power_well.o \ + display/intel_display_reset.o \ display/intel_display_rps.o \ display/intel_dmc.o \ display/intel_dpio_phy.o \
drivers/gpu/drm/i915/display/intel_display.c +1 -122
135 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +6 -2
@@ -468,8 +468,6 @@ intel_framebuffer_create(struct drm_i915_gem_object *obj,bool intel_fuzzy_clock_check (int clock1,int clock2); -void intel_display_prepare_reset (struct drm_i915_private *dev_priv); -void intel_display_finish_reset (struct drm_i915_private *dev_priv);void intel_zero_m_n (struct intel_link_m_n *m_n); void intel_set_m_n(struct drm_i915_private *i915, const struct intel_link_m_n *m_n,
@@ -545,6 +543,12 @@ int intel_atomic_check(struct drm_device *dev, struct drm_atomic_state *_state);void intel_hpd_poll_fini (struct drm_i915_private *i915); +/* interface for intel_display_reset.c */ +int +__intel_display_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx); +/* modesetting asserts */ void assert_transcoder (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,bool state);
drivers/gpu/drm/i915/display/intel_display_reset.c new file +135 -0
135 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_reset.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2023 Intel Corporation +*/ + +#ifndef __INTEL_RESET_H__ +#define __INTEL_RESET_H__ + +struct drm_i915_private ; + +void intel_display_reset_prepare (struct drm_i915_private *i915); +void intel_display_reset_finish (struct drm_i915_private *i915); + +#endif /* __INTEL_RESET_H__ */
drivers/gpu/drm/i915/gt/intel_reset.c +3 -3
@@ -7,7 +7,7 @@#include <linux/stop_machine.h> #include <linux/string_helpers.h> -#include "display/intel_display.h" +#include "display/intel_display_reset.h" #include "display/intel_overlay.h" #include "gem/i915_gem_context.h"
@@ -1370,11 +1370,11 @@ static void intel_gt_reset_global(struct intel_gt *gt,/* Use a watchdog to ensure that our reset completes */ intel_wedge_on_timeout(&w, gt, 60 * HZ) { -intel_display_prepare_reset (gt->i915); +intel_display_reset_prepare (gt->i915);intel_gt_reset (gt, engine_mask, reason); -intel_display_finish_reset (gt->i915); +intel_display_reset_finish (gt->i915); }if (!test_bit (I915_WEDGED , >->reset.flags))
Signature · 1 line
2.39.2
PATCH 8/10 drm/i915/display: move display suspend/resume to intel_display_driver.[ch]
In reply to Jani NikulaHigh level display functionality only called from driver top level code.
--- drivers/gpu/drm/i915/display/intel_display.c | 102 ------------------ drivers/gpu/drm/i915/display/intel_display.h | 8 -- .../drm/i915/display/intel_display_driver.c | 101 +++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 10 ++ 4 files changed, 111 insertions(+), 110 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -102
@@ -693,46 +693,6 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)return y; } -int -__intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx) -{ -struct drm_crtc_state *crtc_state; -struct drm_crtc *crtc; -int ret, i; - -intel_modeset_setup_hw_state (i915, ctx); -intel_vga_redisable (i915); - -if (!state) -return 0 ; - -/* -* We've duplicated the state, pointers to the old state are invalid. -* -* Don't attempt to use the old state until we commit the duplicated state. -*/ -for_each_new_crtc_in_state (state, crtc, crtc_state, i) { -/* -* Force recalculation even if we restore -* current state. With fast modeset this may not result -* in a modeset when the state is compatible. -*/ - crtc_state->mode_changed = true; - } - -/* ignore any reset values/BIOS leftovers in the WM registers */ -if (!HAS_GMCH (i915)) -to_intel_atomic_state (state)->skip_intermediate_wm = true; - - ret =drm_atomic_helper_commit_duplicated_state (state, ctx); - -drm_WARN_ON (&i915->drm, ret == -EDEADLK ); - -return ret; -} -static void icl_set_pipe_chicken (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);
@@ -2104,30 +2064,6 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state,i830_enable_pipe (dev_priv, pipe); } - -/* -* turn all crtc's off, but do not adjust state -* This has to be paired with a call to intel_modeset_setup_hw_state. -*/ -int intel_display_suspend (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state; -int ret; - -if (!HAS_DISPLAY (dev_priv)) -return 0 ; - - state =drm_atomic_helper_suspend (dev); - ret =PTR_ERR_OR_ZERO (state); -if (ret) -drm_err (&dev_priv->drm,"Suspending crtc's failed with %i\n" , - ret); -else - dev_priv->display.restore.modeset_state = state; -return ret; -} -void intel_encoder_destroy (struct drm_encoder *encoder) {struct intel_encoder *intel_encoder =to_intel_encoder (encoder);
@@ -8280,44 +8216,6 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)intel_de_posting_read (dev_priv,DPLL (pipe)); } -void intel_display_resume (struct drm_device *dev) -{ -struct drm_i915_private *i915 =to_i915 (dev); -struct drm_atomic_state *state = i915->display.restore.modeset_state; -struct drm_modeset_acquire_ctx ctx; -int ret; - -if (!HAS_DISPLAY (i915)) -return ; - - i915->display.restore.modeset_state =NULL ; -if (state) - state->acquire_ctx = &ctx; - -drm_modeset_acquire_init (&ctx,0 ); - -while (1 ) { - ret =drm_modeset_lock_all_ctx (dev, &ctx); -if (ret != -EDEADLK ) -break ; - -drm_modeset_backoff (&ctx); - } - -if (!ret) - ret =__intel_display_resume (i915, state, &ctx); - -skl_watermark_ipc_update (i915); -drm_modeset_drop_locks (&ctx); -drm_modeset_acquire_fini (&ctx); - -if (ret) -drm_err (&i915->drm, -"Restoring old state failed with %i\n" , ret); -if (state) -drm_atomic_state_put (state); -} -void intel_hpd_poll_fini (struct drm_i915_private *i915) {struct intel_connector *connector;
drivers/gpu/drm/i915/display/intel_display.h +0 -8
@@ -438,7 +438,6 @@ void intel_add_fb_offsets(int *x, int *y,unsigned int intel_rotation_info_size (const struct intel_rotation_info *rot_info);unsigned int intel_remapped_info_size (const struct intel_remapped_info *rem_info);bool intel_has_pending_fb_unpin (struct drm_i915_private *dev_priv); -int intel_display_suspend (struct drm_device *dev);void intel_encoder_destroy (struct drm_encoder *encoder);struct drm_display_mode *intel_encoder_current_mode (struct intel_encoder *encoder);
@@ -520,7 +519,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */ -void intel_display_resume (struct drm_device *dev);int intel_modeset_all_pipes (struct intel_atomic_state *state,const char *reason); void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,
@@ -543,12 +541,6 @@ int intel_atomic_check(struct drm_device *dev, struct drm_atomic_state *_state);void intel_hpd_poll_fini (struct drm_i915_private *i915); -/* interface for intel_display_reset.c */ -int -__intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx); -/* modesetting asserts */ void assert_transcoder (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,bool state);
drivers/gpu/drm/i915/display/intel_display_driver.c +101 -0
104 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_driver.h +10 -0
@@ -8,7 +8,10 @@#include <linux/types.h> +struct drm_atomic_state ; +struct drm_device ;struct drm_i915_private ; +struct drm_modeset_acquire_ctx ;struct pci_dev ;bool intel_display_driver_probe_defer (struct pci_dev *pdev);
@@ -21,6 +24,13 @@ void intel_display_driver_remove(struct drm_i915_private *i915);void intel_display_driver_remove_noirq (struct drm_i915_private *i915);void intel_display_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915); +int intel_display_suspend (struct drm_device *dev); +void intel_display_resume (struct drm_device *dev); + +/* interface for intel_display_reset.c */ +int __intel_display_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx);#endif /* __INTEL_DISPLAY_DRIVER_H__ */
Signature · 1 line
2.39.2
PATCH 9/10 drm/i915/display: rename intel_display_driver_suspend/resume functions
In reply to Jani NikulaFollow the usual naming conventions. Switch to i915 arguments and naming while at it.
--- .../drm/i915/display/intel_display_driver.c | 24 +++++++++---------- .../drm/i915/display/intel_display_driver.h | 11 ++++----- .../drm/i915/display/intel_display_reset.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 6 ++--- 4 files changed, 20 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/display/intel_display_driver.c +11 -13
@@ -471,29 +471,28 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)* turn all crtc's off, but do not adjust state * This has to be paired with a call to intel_modeset_setup_hw_state. */ -int intel_display_suspend (struct drm_device *dev) +int intel_display_driver_suspend (struct drm_i915_private *i915) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_atomic_state *state;int ret; -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (i915))return 0 ; - state =drm_atomic_helper_suspend (dev); + state =drm_atomic_helper_suspend (&i915->drm); ret =PTR_ERR_OR_ZERO (state);if (ret) -drm_err (&dev_priv->drm,"Suspending crtc's failed with %i\n" , +drm_err (&i915->drm,"Suspending crtc's failed with %i\n" , ret);else - dev_priv->display.restore.modeset_state = state; + i915->display.restore.modeset_state = state;return ret; }int -__intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx) +__intel_display_driver_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx) {struct drm_crtc_state *crtc_state;struct drm_crtc *crtc;
@@ -530,9 +529,8 @@ __intel_display_resume(struct drm_i915_private *i915,return ret; } -void intel_display_resume (struct drm_device *dev) +void intel_display_driver_resume (struct drm_i915_private *i915) { -struct drm_i915_private *i915 =to_i915 (dev);struct drm_atomic_state *state = i915->display.restore.modeset_state;struct drm_modeset_acquire_ctx ctx;int ret;
@@ -547,7 +545,7 @@ void intel_display_resume(struct drm_device *dev)drm_modeset_acquire_init (&ctx,0 );while (1 ) { - ret =drm_modeset_lock_all_ctx (dev, &ctx); + ret =drm_modeset_lock_all_ctx (&i915->drm, &ctx);if (ret != -EDEADLK )break ;
@@ -555,7 +553,7 @@ void intel_display_resume(struct drm_device *dev) }if (!ret) - ret =__intel_display_resume (i915, state, &ctx); + ret =__intel_display_driver_resume (i915, state, &ctx);skl_watermark_ipc_update (i915);drm_modeset_drop_locks (&ctx);
drivers/gpu/drm/i915/display/intel_display_driver.h +5 -6
@@ -9,7 +9,6 @@#include <linux/types.h> struct drm_atomic_state ; -struct drm_device ;struct drm_i915_private ;struct drm_modeset_acquire_ctx ;struct pci_dev ;
@@ -24,13 +23,13 @@ void intel_display_driver_remove(struct drm_i915_private *i915);void intel_display_driver_remove_noirq (struct drm_i915_private *i915);void intel_display_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915); -int intel_display_suspend (struct drm_device *dev); -void intel_display_resume (struct drm_device *dev); +int intel_display_driver_suspend (struct drm_i915_private *i915); +void intel_display_driver_resume (struct drm_i915_private *i915);/* interface for intel_display_reset.c */ -int __intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx); +int __intel_display_driver_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx);#endif /* __INTEL_DISPLAY_DRIVER_H__ */
drivers/gpu/drm/i915/display/intel_display_reset.c +1 -1
@@ -117,7 +117,7 @@ void intel_display_reset_finish(struct drm_i915_private *i915)intel_clock_gating_init (i915);intel_hpd_init (i915); - ret =__intel_display_resume (i915, state, ctx); + ret =__intel_display_driver_resume (i915, state, ctx);if (ret)drm_err (&i915->drm,"Restoring old state failed with %i\n" , ret);
drivers/gpu/drm/i915/i915_driver.c +3 -3
@@ -1053,7 +1053,7 @@ static int i915_drm_prepare(struct drm_device *dev)intel_pxp_suspend_prepare (i915->pxp);/* -* NB intel_display_suspend() may issue new requests after we've +* NB intel_display_driver_suspend() may issue new requests after we've * ostensibly marked the GPU as ready-to-sleep here. We need to * split out that work and pull it forward so that after point, * the GPU is not woken again.
@@ -1077,7 +1077,7 @@ static int i915_drm_suspend(struct drm_device *dev)pci_save_state (pdev); -intel_display_suspend (dev); +intel_display_driver_suspend (dev_priv);intel_dp_mst_suspend (dev_priv);
@@ -1251,7 +1251,7 @@ static int i915_drm_resume(struct drm_device *dev)/* MST sideband requires HPD interrupts enabled */ intel_dp_mst_resume (dev_priv); -intel_display_resume (dev); +intel_display_driver_resume (dev_priv);intel_hpd_poll_disable (dev_priv);if (HAS_DISPLAY (dev_priv))
Signature · 1 line
2.39.2
PATCH 10/10 drm/i915/display: add intel_display_driver_early_probe()
In reply to Jani NikulaAdd intel_display_driver_early_probe() as the early probe call to replace intel_init_display_hooks(). The latter will be "demoted" to setting up hooks in intel_display.c only.
--- drivers/gpu/drm/i915/display/intel_display.c | 11 ----------- .../gpu/drm/i915/display/intel_display_driver.c | 14 ++++++++++++++ .../gpu/drm/i915/display/intel_display_driver.h | 1 + drivers/gpu/drm/i915/i915_driver.c | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -11
@@ -8005,15 +8005,6 @@ static const struct intel_display_funcs i9xx_display_funcs = {*/ void intel_init_display_hooks (struct drm_i915_private *dev_priv) { -if (!HAS_DISPLAY (dev_priv)) -return ; - -intel_color_init_hooks (dev_priv); -intel_init_cdclk_hooks (dev_priv); -intel_audio_hooks_init (dev_priv); - -intel_dpll_init_clock_hook (dev_priv); -if (DISPLAY_VER (dev_priv) >=9 ) { dev_priv->display.funcs.display = &skl_display_funcs; }else if (HAS_DDI (dev_priv)) {
@@ -8026,8 +8017,6 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }else { dev_priv->display.funcs.display = &i9xx_display_funcs; } - -intel_fdi_init_hook (dev_priv); }int intel_initial_commit (struct drm_device *dev)
drivers/gpu/drm/i915/display/intel_display_driver.c +14 -0
@@ -32,6 +32,7 @@#include "intel_display_types.h" #include "intel_dmc.h" #include "intel_dp.h" +#include "intel_dpll.h" #include "intel_dpll_mgr.h" #include "intel_fb.h" #include "intel_fbc.h"
@@ -169,6 +170,19 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) } } +void intel_display_driver_early_probe (struct drm_i915_private *i915) +{ +if (!HAS_DISPLAY (i915)) +return ; + +intel_color_init_hooks (i915); +intel_init_cdclk_hooks (i915); +intel_audio_hooks_init (i915); +intel_dpll_init_clock_hook (i915); +intel_init_display_hooks (i915); +intel_fdi_init_hook (i915); +} +/* part #1: call before irq install */ int intel_display_driver_probe_noirq (struct drm_i915_private *i915) {
drivers/gpu/drm/i915/display/intel_display_driver.h +1 -0
@@ -15,6 +15,7 @@ struct pci_dev;bool intel_display_driver_probe_defer (struct pci_dev *pdev);void intel_display_driver_init_hw (struct drm_i915_private *i915); +void intel_display_driver_early_probe (struct drm_i915_private *i915);int intel_display_driver_probe_noirq (struct drm_i915_private *i915);int intel_display_driver_probe_nogem (struct drm_i915_private *i915);int intel_display_driver_probe (struct drm_i915_private *i915);
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -252,7 +252,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_detect_pch (dev_priv);intel_irq_init (dev_priv); -intel_init_display_hooks (dev_priv); +intel_display_driver_early_probe (dev_priv);intel_clock_gating_hooks_init (dev_priv);intel_detect_preproduction_hw (dev_priv);
Signature · 1 line
2.39.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: split out high level display entry points
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: split out high level display entry points
URL : https://patchwork.freedesktop.org/series/116431/
State : warning
== Summary ==
Error: dim checkpatch failedfbb7502dc824 drm/i915/display: remove intel_display_commit_duplicated_state() f16b8371b8f4 drm/i915/display: start high level display driver file
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:124: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #124:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 180 lines checked8a9ef874b10f drm/i915/display: move intel_modeset_probe_defer() to intel_display_driver.[ch] 43949ccaacb2 drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer() e5556962b69b drm/i915/display: move modeset probe/remove functions to intel_display_driver.c -:617: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided
#617: FILE: drivers/gpu/drm/i915/display/intel_display_driver.c:86:
+ cdclk_state->logical = cdclk_state->actual = i915->display.cdclk.hw;
total: 0 errors, 0 warnings, 1 checks, 929 lines checked96de27eb41aa drm/i915/display: rename intel_display_driver_* functions a02c04b793b4 drm/i915/display: add intel_display_reset.[ch]
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:192: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #192:
new file mode 100644
-:234: WARNING:MEMORY_BARRIER: memory barrier without comment #234: FILE: drivers/gpu/drm/i915/display/intel_display_reset.c:38:
+ smp_mb__after_atomic();
total: 0 errors, 2 warnings, 0 checks, 332 lines checkedffc17a84f51d drm/i915/display: move display suspend/resume to intel_display_driver.[ch] 607713a78bc3 drm/i915/display: rename intel_display_driver_suspend/resume functions 4bad69e7cd40 drm/i915/display: add intel_display_driver_early_probe()
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: split out high level display entry points
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: split out high level display entry points
URL : https://patchwork.freedesktop.org/series/116431/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately. +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1:
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: split out high level display entry points
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: split out high level display entry points
URL : https://patchwork.freedesktop.org/series/116431/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13001 -> Patchwork_116431v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/index.html
Participating hosts (36 -> 35)
------------------------------
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_116431v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-1: [PASS][1] -> [ABORT][2] ([i915#6687] / [i915#7978])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/bat-rpls-1/igt@gem_exec_suspend@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/bat-rpls-1/igt@gem_exec_suspend@[email protected]
* igt@i915_pm_rps@basic-api:
- bat-dg2-11: [PASS][3] -> [FAIL][4] ([i915#8308])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/bat-dg2-11/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/bat-dg2-11/igt@[email protected]
* igt@i915_selftest@live@migrate:
- bat-dg2-11: [PASS][5] -> [DMESG-WARN][6] ([i915#7699])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/bat-dg2-11/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/bat-dg2-11/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@reset:
- bat-rpls-2: [PASS][7] -> [ABORT][8] ([i915#4983] / [i915#7913])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/bat-rpls-2/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rpls-1: [PASS][9] -> [DMESG-FAIL][10] ([i915#6367])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/bat-rpls-1/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/bat-rpls-1/igt@i915_selftest@[email protected]
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#8308]: https://gitlab.freedesktop.org/drm/intel/issues/8308
Build changes
-------------
* Linux: CI_DRM_13001 -> Patchwork_116431v1
CI-20190529: 20190529
CI_DRM_13001: 8366fd94bd551dd4b283708a23fa9b90f3a24b9e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7253: 1a619e8dbc6ca887f2ae24b2d7f1ac536342f58c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116431v1: 8366fd94bd551dd4b283708a23fa9b90f3a24b9e @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
5bd0f29239f9 drm/i915/display: add intel_display_driver_early_probe()a4b7f535dcc7 drm/i915/display: rename intel_display_driver_suspend/resume functions e98ba3c94399 drm/i915/display: move display suspend/resume to intel_display_driver.[ch] d453e80588d3 drm/i915/display: add intel_display_reset.[ch]dba6f6eb4ac3 drm/i915/display: rename intel_display_driver_* functions6bcb9e3f6f74 drm/i915/display: move modeset probe/remove functions to intel_display_driver.c d8cc26c6c668 drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer() 07539c75c344 drm/i915/display: move intel_modeset_probe_defer() to intel_display_driver.[ch] 3f8138dd141d drm/i915/display: start high level display driver filefce1d4ac8964 drm/i915/display: remove intel_display_commit_duplicated_state()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/index.html
Re: [Intel-gfx] [PATCH 05/10] drm/i915/display: move modeset probe/remove functions to intel_display_driver.c
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:31)
Quoted 528 lines
High level display functionality only called from driver top level code.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 373 +---------------- drivers/gpu/drm/i915/display/intel_display.h | 23 +- .../drm/i915/display/intel_display_driver.c | 374 ++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 7 + 4 files changed, 408 insertions(+), 369 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +11
-362@@ -54,7 +54,6 @@#include "i9xx_plane.h" #include "i9xx_wm.h" #include "icl_dsi.h" -#include "intel_acpi.h" #include "intel_atomic.h" #include "intel_atomic_plane.h" #include "intel_audio.h" @@ -67,6 +66,7 @@#include "intel_crtc_state_dump.h" #include "intel_ddi.h" #include "intel_de.h" +#include "intel_display_driver.h" #include "intel_display_power.h" #include "intel_display_types.h" #include "intel_dmc.h" @@ -86,11 +86,8 @@#include "intel_fdi.h" #include "intel_fifo_underrun.h" #include "intel_frontbuffer.h" -#include "intel_gmbus.h" -#include "intel_hdcp.h" #include "intel_hdmi.h" #include "intel_hotplug.h" -#include "intel_hti.h" #include "intel_lvds.h" #include "intel_lvds_regs.h" #include "intel_modeset_setup.h" @@ -104,7 +101,6 @@#include "intel_plane_initial.h" #include "intel_pps.h" #include "intel_psr.h" -#include "intel_quirks.h" #include "intel_sdvo.h" #include "intel_snps_phy.h" #include "intel_tc.h" @@ -174,7 +170,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,return hpll; } -static void intel_update_czclk (struct drm_i915_private *dev_priv) +void intel_update_czclk (struct drm_i915_private *dev_priv) {if (!(IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)))return ;@@ -2582,7 +2578,7 @@ intel_link_compute_m_n(u16 bits_per_pixel, int nlanes, 0x80000); } -static void intel_panel_sanitize_ssc (struct drm_i915_private *dev_priv) +void intel_panel_sanitize_ssc (struct drm_i915_private *dev_priv) {/* * There may be no VBT; and if the BIOS enabled SSC we can @@ -7225,7 +7221,7 @@ static void intel_atomic_helper_free_state(struct drm_i915_private *dev_priv)drm_atomic_state_put (&state->base); } -static void intel_atomic_helper_free_state_worker (struct work_struct *work) +void intel_atomic_helper_free_state_worker (struct work_struct *work) {struct drm_i915_private *dev_priv =container_of (work,typeof (*dev_priv), display.atomic_helper.free_work);@@ -7573,9 +7569,8 @@ static void intel_atomic_track_fbs(struct intel_atomic_state *state) plane->frontbuffer_bit); } -static int intel_atomic_commit (struct drm_device *dev, -struct drm_atomic_state *_state, -bool nonblock) +int intel_atomic_commit (struct drm_device *dev,struct drm_atomic_state *_state, +bool nonblock) {struct intel_atomic_state *state =to_intel_atomic_state (_state);struct drm_i915_private *dev_priv =to_i915 (dev);@@ -7677,19 +7672,6 @@ void intel_plane_destroy(struct drm_plane *plane)kfree (to_intel_plane (plane)); } -static void intel_plane_possible_crtcs_init (struct drm_i915_private *dev_priv) -{ -struct intel_plane *plane; - -for_each_intel_plane (&dev_priv->drm, plane) { -struct intel_crtc *crtc =intel_crtc_for_pipe (dev_priv, - plane->pipe); - - plane->base.possible_crtcs =drm_crtc_mask (&crtc->base); - } -} - -int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {@@ -7769,7 +7751,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)return true; } -static void intel_setup_outputs (struct drm_i915_private *dev_priv) +void intel_setup_outputs (struct drm_i915_private *dev_priv) {struct intel_encoder *encoder;bool dpd_is_edp = false;@@ -8021,9 +8003,8 @@ static int max_dotclock(struct drm_i915_private *i915)return max_dotclock; } -static enum drm_mode_status -intel_mode_valid (struct drm_device *dev, -const struct drm_display_mode *mode) +enum drm_mode_status intel_mode_valid (struct drm_device *dev, +const struct drm_display_mode *mode) {struct drm_i915_private *dev_priv =to_i915 (dev);int hdisplay_max, htotal_max;@@ -8163,18 +8144,6 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,return MODE_OK ; } -static const struct drm_mode_config_funcs intel_mode_funcs = { - .fb_create = intel_user_framebuffer_create, - .get_format_info = intel_fb_get_format_info, - .output_poll_changed = intel_fbdev_output_poll_changed, - .mode_valid = intel_mode_valid, - .atomic_check = intel_atomic_check, - .atomic_commit = intel_atomic_commit, - .atomic_state_alloc = intel_atomic_state_alloc, - .atomic_state_clear = intel_atomic_state_clear, - .atomic_state_free = intel_atomic_state_free, -}; -static const struct intel_display_funcs skl_display_funcs = { .get_pipe_config = hsw_get_pipe_config, .crtc_enable = hsw_crtc_enable,@@ -8246,21 +8215,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)intel_fdi_init_hook (dev_priv); } -void intel_modeset_init_hw (struct drm_i915_private *i915) -{ -struct intel_cdclk_state *cdclk_state; - -if (!HAS_DISPLAY (i915)) -return ; - - cdclk_state =to_intel_cdclk_state (i915->display.cdclk.obj.state); - -intel_update_cdclk (i915); -intel_cdclk_dump_config (i915, &i915->display.cdclk.hw,"Current CDCLK" ); - cdclk_state->logical = cdclk_state->actual = i915->display.cdclk.hw; -} - -static int intel_initial_commit (struct drm_device *dev) +int intel_initial_commit (struct drm_device *dev) {struct drm_atomic_state *state =NULL ;struct drm_modeset_acquire_ctx ctx;@@ -8339,246 +8294,6 @@ static int intel_initial_commit(struct drm_device *dev)return ret; } -static const struct drm_mode_config_helper_funcs intel_mode_config_funcs = { - .atomic_commit_setup = drm_dp_mst_atomic_setup_commit, -}; - -static void intel_mode_config_init (struct drm_i915_private *i915) -{ -struct drm_mode_config *mode_config = &i915->drm.mode_config; - -drm_mode_config_init (&i915->drm); -INIT_LIST_HEAD (&i915->display.global.obj_list); - - mode_config->min_width =0 ; - mode_config->min_height =0 ; - - mode_config->preferred_depth =24 ; - mode_config->prefer_shadow =1 ; - - mode_config->funcs = &intel_mode_funcs; - mode_config->helper_private = &intel_mode_config_funcs; - - mode_config->async_page_flip =HAS_ASYNC_FLIPS (i915); - -/* -* Maximum framebuffer dimensions, chosen to match -* the maximum render engine surface size on gen4+. -*/ -if (DISPLAY_VER (i915) >=7 ) { - mode_config->max_width =16384 ; - mode_config->max_height =16384 ; - }else if (DISPLAY_VER (i915) >=4 ) { - mode_config->max_width =8192 ; - mode_config->max_height =8192 ; - }else if (DISPLAY_VER (i915) ==3 ) { - mode_config->max_width =4096 ; - mode_config->max_height =4096 ; - }else { - mode_config->max_width =2048 ; - mode_config->max_height =2048 ; - } - -if (IS_I845G (i915) ||IS_I865G (i915)) { - mode_config->cursor_width =IS_I845G (i915) ?64 :512 ; - mode_config->cursor_height =1023 ; - }else if (IS_I830 (i915) ||IS_I85X (i915) || -IS_I915G (i915) ||IS_I915GM (i915)) { - mode_config->cursor_width =64 ; - mode_config->cursor_height =64 ; - }else { - mode_config->cursor_width =256 ; - mode_config->cursor_height =256 ; - } -} - -static void intel_mode_config_cleanup (struct drm_i915_private *i915) -{ -intel_atomic_global_obj_cleanup (i915); -drm_mode_config_cleanup (&i915->drm); -} - -/* part #1: call before irq install */ -int intel_modeset_init_noirq (struct drm_i915_private *i915) -{ -int ret; - -if (i915_inject_probe_failure (i915)) -return -ENODEV ; - -if (HAS_DISPLAY (i915)) { - ret =drm_vblank_init (&i915->drm, -INTEL_NUM_PIPES (i915)); -if (ret) -return ret; - } - -intel_bios_init (i915); - - ret =intel_vga_register (i915); -if (ret) - goto cleanup_bios; - -/* FIXME: completely on the wrong abstraction layer */ - ret =intel_power_domains_init (i915); -if (ret <0 ) - goto cleanup_vga; - -intel_power_domains_init_hw (i915, false); - -if (!HAS_DISPLAY (i915)) -return 0 ; - -intel_dmc_init (i915); - - i915->display.wq.modeset =alloc_ordered_workqueue ("i915_modeset" ,0 ); - i915->display.wq.flip =alloc_workqueue ("i915_flip" ,WQ_HIGHPRI | -WQ_UNBOUND ,WQ_UNBOUND_MAX_ACTIVE ); - -intel_mode_config_init (i915); - - ret =intel_cdclk_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - - ret =intel_color_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - - ret =intel_dbuf_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - - ret =intel_bw_init (i915); -if (ret) - goto cleanup_vga_client_pw_domain_dmc; - -init_llist_head (&i915->display.atomic_helper.free_list); -INIT_WORK (&i915->display.atomic_helper.free_work, - intel_atomic_helper_free_state_worker); - -intel_init_quirks (i915); - -intel_fbc_init (i915); - -return 0 ; - -cleanup_vga_client_pw_domain_dmc: -intel_dmc_fini (i915); -intel_power_domains_driver_remove (i915); -cleanup_vga: -intel_vga_unregister (i915); -cleanup_bios: -intel_bios_driver_remove (i915); - -return ret; -} - -/* part #2: call after irq install, but before gem init */ -int intel_modeset_init_nogem (struct drm_i915_private *i915) -{ -struct drm_device *dev = &i915->drm; -enum pipe pipe; -struct intel_crtc *crtc; -int ret; - -if (!HAS_DISPLAY (i915)) -return 0 ; - -intel_wm_init (i915); - -intel_panel_sanitize_ssc (i915); - -intel_pps_setup (i915); - -intel_gmbus_setup (i915); - -drm_dbg_kms (&i915->drm,"%d display pipe%s available.\n" , -INTEL_NUM_PIPES (i915), -INTEL_NUM_PIPES (i915) >1 ?"s" :"" ); - -for_each_pipe (i915, pipe) { - ret =intel_crtc_init (i915, pipe); -if (ret) { -intel_mode_config_cleanup (i915); -return ret; - } - } - -intel_plane_possible_crtcs_init (i915); -intel_shared_dpll_init (i915); -intel_fdi_pll_freq_update (i915); - -intel_update_czclk (i915); -intel_modeset_init_hw (i915); -intel_dpll_update_ref_clks (i915); - -intel_hdcp_component_init (i915); - -if (i915->display.cdclk.max_cdclk_freq ==0 ) -intel_update_max_cdclk (i915); - -intel_hti_init (i915); - -/* Just disable it once at startup */ -intel_vga_disable (i915); -intel_setup_outputs (i915); - -drm_modeset_lock_all (dev); -intel_modeset_setup_hw_state (i915, dev->mode_config.acquire_ctx); -intel_acpi_assign_connector_fwnodes (i915); -drm_modeset_unlock_all (dev); - -for_each_intel_crtc (dev, crtc) { -if (!to_intel_crtc_state (crtc->base.state)->uapi.active) -continue ; -intel_crtc_initial_plane_config (crtc); - } - -/* -* Make sure hardware watermarks really match the state we read out. -* Note that we need to do this after reconstructing the BIOS fb's -* since the watermark calculation done here will use pstate->fb. -*/ -if (!HAS_GMCH (i915)) -ilk_wm_sanitize (i915); - -return 0 ; -} - -/* part #3: call after gem init */ -int intel_modeset_init (struct drm_i915_private *i915) -{ -int ret; - -if (!HAS_DISPLAY (i915)) -return 0 ; - -/* -* Force all active planes to recompute their states. So that on -* mode_setcrtc after probe, all the intel_plane_state variables -* are already calculated and there is no assert_plane warnings -* during bootup. -*/ - ret =intel_initial_commit (&i915->drm); -if (ret) -drm_dbg_kms (&i915->drm,"Initial modeset failed, %d\n" , ret); - -intel_overlay_setup (i915); - - ret =intel_fbdev_init (&i915->drm); -if (ret) -return ret; - -/* Only enable hotplug handling once the fbdev is fully set up. */ -intel_hpd_init (i915); -intel_hpd_poll_disable (i915); - -skl_watermark_ipc_init (i915); - -return 0 ; -} -void i830_enable_pipe (struct drm_i915_private *dev_priv,enum pipe pipe) {struct intel_crtc *crtc =intel_crtc_for_pipe (dev_priv, pipe);@@ -8724,7 +8439,7 @@ void intel_display_resume(struct drm_device *dev)drm_atomic_state_put (state); } -static void intel_hpd_poll_fini (struct drm_i915_private *i915) +void intel_hpd_poll_fini (struct drm_i915_private *i915) {struct intel_connector *connector;struct drm_connector_list_iter conn_iter;@@ -8742,72 +8457,6 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915)drm_connector_list_iter_end (&conn_iter); } -/* part #1: call before irq uninstall */ -void intel_modeset_driver_remove (struct drm_i915_private *i915) -{ -if (!HAS_DISPLAY (i915)) -return ; - -flush_workqueue (i915->display.wq.flip); -flush_workqueue (i915->display.wq.modeset); - -flush_work (&i915->display.atomic_helper.free_work); -drm_WARN_ON (&i915->drm, !llist_empty (&i915->display.atomic_helper.free_list)); - -/* -* MST topology needs to be suspended so we don't have any calls to -* fbdev after it's finalized. MST will be destroyed later as part of -* drm_mode_config_cleanup() -*/ -intel_dp_mst_suspend (i915); -} - -/* part #2: call after irq uninstall */ -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915) -{ -if (!HAS_DISPLAY (i915)) -return ; - -/* -* Due to the hpd irq storm handling the hotplug work can re-arm the -* poll handlers. Hence disable polling after hpd handling is shut down. -*/ -intel_hpd_poll_fini (i915); - -/* poll work can call into fbdev, hence clean that up afterwards */ -intel_fbdev_fini (i915); - -intel_unregister_dsm_handler (); - -/* flush any delayed tasks or pending work */ -flush_scheduled_work (); - -intel_hdcp_component_fini (i915); - -intel_mode_config_cleanup (i915); - -intel_overlay_cleanup (i915); - -intel_gmbus_teardown (i915); - -destroy_workqueue (i915->display.wq.flip); -destroy_workqueue (i915->display.wq.modeset); - -intel_fbc_cleanup (i915); -} - -/* part #3: call after gem init */ -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915) -{ -intel_dmc_fini (i915); - -intel_power_domains_driver_remove (i915); - -intel_vga_unregister (i915); - -intel_bios_driver_remove (i915); -} -bool intel_scanout_needs_vtd_wa (struct drm_i915_private *i915) {return DISPLAY_VER (i915) >=6 &&i915_vtd_active (i915);drivers/gpu/drm/i915/display/intel_display.h +1
-7@@ -63,6 +63,7 @@ struct intel_power_domain_mask;struct intel_remapped_info ;struct intel_rotation_info ;struct pci_dev ; +struct work_struct ;#define pipe_name (p) ((p) + 'A')@@ -521,13 +522,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */ -void intel_modeset_init_hw (struct drm_i915_private *i915); -int intel_modeset_init_noirq (struct drm_i915_private *i915); -int intel_modeset_init_nogem (struct drm_i915_private *i915); -int intel_modeset_init (struct drm_i915_private *i915); -void intel_modeset_driver_remove (struct drm_i915_private *i915); -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915); -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_resume (struct drm_device *dev);int intel_modeset_all_pipes (struct intel_atomic_state *state,const char *reason);
drivers/gpu/drm/i915/display/intel_display.h void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state, · line 535
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.h +3
-0@@ -536,6 +530,21 @@ void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,void intel_modeset_put_crtc_power_domains (struct intel_crtc *crtc,struct intel_power_domain_mask *domains); +/* interface for intel_display_driver.c */ +void intel_setup_outputs (struct drm_i915_private *i915); +void intel_sanitize_watermarks (struct drm_i915_private *i915);
I can't find the implementation for this one and it seems it is not being called anywhere.
--
Gustavo Sousa
Quoted 447 lines
drivers/gpu/drm/i915/display/intel_display.h +12
-0+int intel_initial_commit (struct drm_device *dev); +void intel_panel_sanitize_ssc (struct drm_i915_private *i915); +void intel_update_czclk (struct drm_i915_private *i915); +void intel_atomic_helper_free_state_worker (struct work_struct *work); +enum drm_mode_status intel_mode_valid (struct drm_device *dev, +const struct drm_display_mode *mode); +int intel_atomic_commit (struct drm_device *dev,struct drm_atomic_state *_state, +bool nonblock); +int intel_atomic_check (struct drm_device *dev,struct drm_atomic_state *_state); + +void intel_hpd_poll_fini (struct drm_i915_private *i915); +/* modesetting asserts */ void assert_transcoder (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,bool state);drivers/gpu/drm/i915/display/intel_display_driver.c +374
-0@@ -9,17 +9,47 @@#include <linux/vga_switcheroo.h> #include <acpi/video.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_mode_config.h> #include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "i915_drv.h" +#include "i9xx_wm.h" #include "intel_acpi.h" +#include "intel_atomic.h" #include "intel_audio.h" +#include "intel_bios.h" +#include "intel_bw.h" +#include "intel_cdclk.h" +#include "intel_color.h" +#include "intel_crtc.h" #include "intel_display_debugfs.h" #include "intel_display_driver.h" +#include "intel_display_power.h" +#include "intel_display_types.h" +#include "intel_dmc.h" +#include "intel_dp.h" +#include "intel_dpll_mgr.h" +#include "intel_fb.h" +#include "intel_fbc.h" #include "intel_fbdev.h" +#include "intel_fdi.h" +#include "intel_gmbus.h" +#include "intel_hdcp.h" +#include "intel_hotplug.h" +#include "intel_hti.h" +#include "intel_modeset_setup.h" #include "intel_opregion.h" +#include "intel_overlay.h" +#include "intel_plane_initial.h" +#include "intel_pps.h" +#include "intel_quirks.h" +#include "intel_vga.h" +#include "intel_wm.h" +#include "skl_watermark.h" bool intel_display_driver_probe_defer (struct pci_dev *pdev) {@@ -42,6 +72,284 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev)return false; } +void intel_modeset_init_hw (struct drm_i915_private *i915) +{ +struct intel_cdclk_state *cdclk_state; + +if (!HAS_DISPLAY (i915)) +return ; + + cdclk_state =to_intel_cdclk_state (i915->display.cdclk.obj.state); + +intel_update_cdclk (i915); +intel_cdclk_dump_config (i915, &i915->display.cdclk.hw,"Current CDCLK" ); + cdclk_state->logical = cdclk_state->actual = i915->display.cdclk.hw; +} + +static const struct drm_mode_config_funcs intel_mode_funcs = { + .fb_create = intel_user_framebuffer_create, + .get_format_info = intel_fb_get_format_info, + .output_poll_changed = intel_fbdev_output_poll_changed, + .mode_valid = intel_mode_valid, + .atomic_check = intel_atomic_check, + .atomic_commit = intel_atomic_commit, + .atomic_state_alloc = intel_atomic_state_alloc, + .atomic_state_clear = intel_atomic_state_clear, + .atomic_state_free = intel_atomic_state_free, +}; + +static const struct drm_mode_config_helper_funcs intel_mode_config_funcs = { + .atomic_commit_setup = drm_dp_mst_atomic_setup_commit, +}; + +static void intel_mode_config_init (struct drm_i915_private *i915) +{ +struct drm_mode_config *mode_config = &i915->drm.mode_config; + +drm_mode_config_init (&i915->drm); +INIT_LIST_HEAD (&i915->display.global.obj_list); + + mode_config->min_width =0 ; + mode_config->min_height =0 ; + + mode_config->preferred_depth =24 ; + mode_config->prefer_shadow =1 ; + + mode_config->funcs = &intel_mode_funcs; + mode_config->helper_private = &intel_mode_config_funcs; + + mode_config->async_page_flip =HAS_ASYNC_FLIPS (i915); + +/* +* Maximum framebuffer dimensions, chosen to match +* the maximum render engine surface size on gen4+. +*/ +if (DISPLAY_VER (i915) >=7 ) { + mode_config->max_width =16384 ; + mode_config->max_height =16384 ; + }else if (DISPLAY_VER (i915) >=4 ) { + mode_config->max_width =8192 ; + mode_config->max_height =8192 ; + }else if (DISPLAY_VER (i915) ==3 ) { + mode_config->max_width =4096 ; + mode_config->max_height =4096 ; + }else { + mode_config->max_width =2048 ; + mode_config->max_height =2048 ; + } + +if (IS_I845G (i915) ||IS_I865G (i915)) { + mode_config->cursor_width =IS_I845G (i915) ?64 :512 ; + mode_config->cursor_height =1023 ; + }else if (IS_I830 (i915) ||IS_I85X (i915) || +IS_I915G (i915) ||IS_I915GM (i915)) { + mode_config->cursor_width =64 ; + mode_config->cursor_height =64 ; + }else { + mode_config->cursor_width =256 ; + mode_config->cursor_height =256 ; + } +} + +static void intel_mode_config_cleanup (struct drm_i915_private *i915) +{ +intel_atomic_global_obj_cleanup (i915); +drm_mode_config_cleanup (&i915->drm); +} + +static void intel_plane_possible_crtcs_init (struct drm_i915_private *dev_priv) +{ +struct intel_plane *plane; + +for_each_intel_plane (&dev_priv->drm, plane) { +struct intel_crtc *crtc =intel_crtc_for_pipe (dev_priv, + plane->pipe); + + plane->base.possible_crtcs =drm_crtc_mask (&crtc->base); + } +} + +/* part #1: call before irq install */ +int intel_modeset_init_noirq (struct drm_i915_private *i915) +{ +int ret; + +if (i915_inject_probe_failure (i915)) +return -ENODEV ; + +if (HAS_DISPLAY (i915)) { + ret =drm_vblank_init (&i915->drm, +INTEL_NUM_PIPES (i915)); +if (ret) +return ret; + } + +intel_bios_init (i915); + + ret =intel_vga_register (i915); +if (ret) + goto cleanup_bios; + +/* FIXME: completely on the wrong abstraction layer */ + ret =intel_power_domains_init (i915); +if (ret <0 ) + goto cleanup_vga; + +intel_power_domains_init_hw (i915, false); + +if (!HAS_DISPLAY (i915)) +return 0 ; + +intel_dmc_init (i915); + + i915->display.wq.modeset =alloc_ordered_workqueue ("i915_modeset" ,0 ); + i915->display.wq.flip =alloc_workqueue ("i915_flip" ,WQ_HIGHPRI | +WQ_UNBOUND ,WQ_UNBOUND_MAX_ACTIVE ); + +intel_mode_config_init (i915); + + ret =intel_cdclk_init (i915); +if (ret) + goto cleanup_vga_client_pw_domain_dmc; + + ret =intel_color_init (i915); +if (ret) + goto cleanup_vga_client_pw_domain_dmc; + + ret =intel_dbuf_init (i915); +if (ret) + goto cleanup_vga_client_pw_domain_dmc; + + ret =intel_bw_init (i915); +if (ret) + goto cleanup_vga_client_pw_domain_dmc; + +init_llist_head (&i915->display.atomic_helper.free_list); +INIT_WORK (&i915->display.atomic_helper.free_work, + intel_atomic_helper_free_state_worker); + +intel_init_quirks (i915); + +intel_fbc_init (i915); + +return 0 ; + +cleanup_vga_client_pw_domain_dmc: +intel_dmc_fini (i915); +intel_power_domains_driver_remove (i915); +cleanup_vga: +intel_vga_unregister (i915); +cleanup_bios: +intel_bios_driver_remove (i915); + +return ret; +} + +/* part #2: call after irq install, but before gem init */ +int intel_modeset_init_nogem (struct drm_i915_private *i915) +{ +struct drm_device *dev = &i915->drm; +enum pipe pipe; +struct intel_crtc *crtc; +int ret; + +if (!HAS_DISPLAY (i915)) +return 0 ; + +intel_wm_init (i915); + +intel_panel_sanitize_ssc (i915); + +intel_pps_setup (i915); + +intel_gmbus_setup (i915); + +drm_dbg_kms (&i915->drm,"%d display pipe%s available.\n" , +INTEL_NUM_PIPES (i915), +INTEL_NUM_PIPES (i915) >1 ?"s" :"" ); + +for_each_pipe (i915, pipe) { + ret =intel_crtc_init (i915, pipe); +if (ret) { +intel_mode_config_cleanup (i915); +return ret; + } + } + +intel_plane_possible_crtcs_init (i915); +intel_shared_dpll_init (i915); +intel_fdi_pll_freq_update (i915); + +intel_update_czclk (i915); +intel_modeset_init_hw (i915); +intel_dpll_update_ref_clks (i915); + +intel_hdcp_component_init (i915); + +if (i915->display.cdclk.max_cdclk_freq ==0 ) +intel_update_max_cdclk (i915); + +intel_hti_init (i915); + +/* Just disable it once at startup */ +intel_vga_disable (i915); +intel_setup_outputs (i915); + +drm_modeset_lock_all (dev); +intel_modeset_setup_hw_state (i915, dev->mode_config.acquire_ctx); +intel_acpi_assign_connector_fwnodes (i915); +drm_modeset_unlock_all (dev); + +for_each_intel_crtc (dev, crtc) { +if (!to_intel_crtc_state (crtc->base.state)->uapi.active) +continue ; +intel_crtc_initial_plane_config (crtc); + } + +/* +* Make sure hardware watermarks really match the state we read out. +* Note that we need to do this after reconstructing the BIOS fb's +* since the watermark calculation done here will use pstate->fb. +*/ +if (!HAS_GMCH (i915)) +ilk_wm_sanitize (i915); + +return 0 ; +} + +/* part #3: call after gem init */ +int intel_modeset_init (struct drm_i915_private *i915) +{ +int ret; + +if (!HAS_DISPLAY (i915)) +return 0 ; + +/* +* Force all active planes to recompute their states. So that on +* mode_setcrtc after probe, all the intel_plane_state variables +* are already calculated and there is no assert_plane warnings +* during bootup. +*/ + ret =intel_initial_commit (&i915->drm); +if (ret) +drm_dbg_kms (&i915->drm,"Initial modeset failed, %d\n" , ret); + +intel_overlay_setup (i915); + + ret =intel_fbdev_init (&i915->drm); +if (ret) +return ret; + +/* Only enable hotplug handling once the fbdev is fully set up. */ +intel_hpd_init (i915); +intel_hpd_poll_disable (i915); + +skl_watermark_ipc_init (i915); + +return 0 ; +} +void intel_display_driver_register (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))@@ -73,6 +381,72 @@ void intel_display_driver_register(struct drm_i915_private *i915)drm_kms_helper_poll_init (&i915->drm); } +/* part #1: call before irq uninstall */ +void intel_modeset_driver_remove (struct drm_i915_private *i915) +{ +if (!HAS_DISPLAY (i915)) +return ; + +flush_workqueue (i915->display.wq.flip); +flush_workqueue (i915->display.wq.modeset); + +flush_work (&i915->display.atomic_helper.free_work); +drm_WARN_ON (&i915->drm, !llist_empty (&i915->display.atomic_helper.free_list)); + +/* +* MST topology needs to be suspended so we don't have any calls to +* fbdev after it's finalized. MST will be destroyed later as part of +* drm_mode_config_cleanup() +*/ +intel_dp_mst_suspend (i915); +} + +/* part #2: call after irq uninstall */ +void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915) +{ +if (!HAS_DISPLAY (i915)) +return ; + +/* +* Due to the hpd irq storm handling the hotplug work can re-arm the +* poll handlers. Hence disable polling after hpd handling is shut down. +*/ +intel_hpd_poll_fini (i915); + +/* poll work can call into fbdev, hence clean that up afterwards */ +intel_fbdev_fini (i915); + +intel_unregister_dsm_handler (); + +/* flush any delayed tasks or pending work */ +flush_scheduled_work (); + +intel_hdcp_component_fini (i915); + +intel_mode_config_cleanup (i915); + +intel_overlay_cleanup (i915); + +intel_gmbus_teardown (i915); + +destroy_workqueue (i915->display.wq.flip); +destroy_workqueue (i915->display.wq.modeset); + +intel_fbc_cleanup (i915); +} + +/* part #3: call after gem init */ +void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915) +{ +intel_dmc_fini (i915); + +intel_power_domains_driver_remove (i915); + +intel_vga_unregister (i915); + +intel_bios_driver_remove (i915); +} +void intel_display_driver_unregister (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))drivers/gpu/drm/i915/display/intel_display_driver.h +7
-0@@ -12,7 +12,14 @@ struct drm_i915_private;struct pci_dev ;bool intel_display_driver_probe_defer (struct pci_dev *pdev); +void intel_modeset_init_hw (struct drm_i915_private *i915); +int intel_modeset_init_noirq (struct drm_i915_private *i915); +int intel_modeset_init_nogem (struct drm_i915_private *i915); +int intel_modeset_init (struct drm_i915_private *i915);void intel_display_driver_register (struct drm_i915_private *i915); +void intel_modeset_driver_remove (struct drm_i915_private *i915); +void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915); +void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);#endif /* __INTEL_DISPLAY_DRIVER_H__ */ Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 06/10] drm/i915/display: rename intel_display_driver_* functions
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:32)
Quoted 113 lines
Follow the usual naming conventions.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- .../drm/i915/display/intel_display_driver.c | 16 +++++++------- .../drm/i915/display/intel_display_driver.h | 14 ++++++------- drivers/gpu/drm/i915/i915_driver.c | 21 ++++++++++--------- 4 files changed, 27 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -833,7 +833,7 @@ void intel_display_finish_reset(struct drm_i915_private *i915)* so need a full re-initialization. */ intel_pps_unlock_regs_wa (i915); -intel_modeset_init_hw (i915); +intel_display_driver_init_hw (i915);intel_clock_gating_init (i915);intel_hpd_init (i915);drivers/gpu/drm/i915/display/intel_display_driver.c +8
-8@@ -72,7 +72,7 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev)return false; } -void intel_modeset_init_hw (struct drm_i915_private *i915) +void intel_display_driver_init_hw (struct drm_i915_private *i915) {struct intel_cdclk_state *cdclk_state;@@ -170,7 +170,7 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) }/* part #1: call before irq install */ -int intel_modeset_init_noirq (struct drm_i915_private *i915) +int intel_display_driver_probe_noirq (struct drm_i915_private *i915) {int ret;@@ -246,7 +246,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) }/* part #2: call after irq install, but before gem init */ -int intel_modeset_init_nogem (struct drm_i915_private *i915) +int intel_display_driver_probe_nogem (struct drm_i915_private *i915) {struct drm_device *dev = &i915->drm;enum pipe pipe;@@ -281,7 +281,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)intel_fdi_pll_freq_update (i915);intel_update_czclk (i915); -intel_modeset_init_hw (i915); +intel_display_driver_init_hw (i915);intel_dpll_update_ref_clks (i915);intel_hdcp_component_init (i915);@@ -318,7 +318,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) }/* part #3: call after gem init */ -int intel_modeset_init (struct drm_i915_private *i915) +int intel_display_driver_probe (struct drm_i915_private *i915) {int ret;@@ -382,7 +382,7 @@ void intel_display_driver_register(struct drm_i915_private *i915) }/* part #1: call before irq uninstall */ -void intel_modeset_driver_remove (struct drm_i915_private *i915) +void intel_display_driver_remove (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))return ;@@ -402,7 +402,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915) }/* part #2: call after irq uninstall */ -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915) +void intel_display_driver_remove_noirq (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))return ;@@ -436,7 +436,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915) }/* part #3: call after gem init */ -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915) +void intel_display_driver_remove_nogem (struct drm_i915_private *i915) {intel_dmc_fini (i915);drivers/gpu/drm/i915/display/intel_display_driver.h +2
-4@@ -12,14 +12,14 @@ struct drm_i915_private;struct pci_dev ;bool intel_display_driver_probe_defer (struct pci_dev *pdev); -void intel_modeset_init_hw (struct drm_i915_private *i915); -int intel_modeset_init_noirq (struct drm_i915_private *i915); -int intel_modeset_init_nogem (struct drm_i915_private *i915); -int intel_modeset_init (struct drm_i915_private *i915); +void intel_display_driver_init_hw (struct drm_i915_private *i915); +int intel_display_driver_probe_noirq (struct drm_i915_private *i915);
drivers/gpu/drm/i915/display/intel_display_driver.h struct drm_i915_private; · line 23
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display_driver.h +5
-3+int intel_display_driver_probe_nogem (struct drm_i915_private *i915); +int intel_display_driver_probe (struct drm_i915_private *i915);void intel_display_driver_register (struct drm_i915_private *i915); -void intel_modeset_driver_remove (struct drm_i915_private *i915); -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915); -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915); +void intel_display_driver_remove (struct drm_i915_private *i915); +void intel_display_driver_remove_noirq (struct drm_i915_private *i915); +void intel_display_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);
Looks like some comments need to be fixed now:
❯ git grep -w -e intel_modeset_init_hw -e intel_modeset_init_noirq -e intel_modeset_init_nogem -e intel_modeset_init -e intel_modeset_driver_remove -e intel_modeset_driver_remove_noirq -e intel_modeset_driver_remove_nogem
i915_driver.c: * - drive output discovery via intel_modeset_init()
i915_driver.c: * Modeset enabling in intel_modeset_init_hw() also needs working
i915_irq.c: * intel_modeset_driver_remove() calling us out of sequence.
--
Gustavo Sousa
Quoted 84 lines
drivers/gpu/drm/i915/display/intel_display_driver.h +0
-0#endif /* __INTEL_DISPLAY_DRIVER_H__ */ drivers/gpu/drm/i915/i915_driver.c +11
-10@@ -791,7 +791,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret <0 ) goto out_cleanup_mmio; - ret =intel_modeset_init_noirq (i915); + ret =intel_display_driver_probe_noirq (i915);if (ret <0 ) goto out_cleanup_hw;@@ -799,7 +799,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto out_cleanup_modeset; - ret =intel_modeset_init_nogem (i915); + ret =intel_display_driver_probe_nogem (i915);if (ret) goto out_cleanup_irq;@@ -809,7 +809,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)intel_pxp_init (i915); - ret =intel_modeset_init (i915); + ret =intel_display_driver_probe (i915);if (ret) goto out_cleanup_gem;@@ -829,14 +829,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)i915_gem_driver_release (i915); out_cleanup_modeset2:/* FIXME clean up the error path */ -intel_modeset_driver_remove (i915); +intel_display_driver_remove (i915);intel_irq_uninstall (i915); -intel_modeset_driver_remove_noirq (i915); +intel_display_driver_remove_noirq (i915); goto out_cleanup_modeset; out_cleanup_irq:intel_irq_uninstall (i915); out_cleanup_modeset: -intel_modeset_driver_remove_nogem (i915); +intel_display_driver_remove_nogem (i915); out_cleanup_hw:i915_driver_hw_remove (i915);intel_memory_regions_driver_release (i915);@@ -872,16 +872,16 @@ void i915_driver_remove(struct drm_i915_private *i915)intel_gvt_driver_remove (i915); -intel_modeset_driver_remove (i915); +intel_display_driver_remove (i915);intel_irq_uninstall (i915); -intel_modeset_driver_remove_noirq (i915); +intel_display_driver_remove_noirq (i915);i915_reset_error_state (i915);i915_gem_driver_remove (i915); -intel_modeset_driver_remove_nogem (i915); +intel_display_driver_remove_nogem (i915);i915_driver_hw_remove (i915);@@ -1244,7 +1244,8 @@ static int i915_drm_resume(struct drm_device *dev)i915_gem_resume (dev_priv); -intel_modeset_init_hw (dev_priv); +intel_display_driver_init_hw (dev_priv); +intel_clock_gating_init (dev_priv);intel_hpd_init (dev_priv);Signature · 1 line
2.39.2
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: split out high level display entry points
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: split out high level display entry points
URL : https://patchwork.freedesktop.org/series/116431/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13001_full -> Patchwork_116431v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Known issues
------------
Here are the changes found in Patchwork_116431v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-deadline:
- shard-glk: NOTRUN -> [FAIL][1] ([i915#2846])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk2/igt@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [PASS][2] -> [FAIL][3] ([i915#2842])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-glk3/igt@gem_exec_fair@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk6/igt@gem_exec_fair@[email protected]
* igt@gem_lmem_swapping@verify-ccs:
- shard-glk: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#4613])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk2/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][5] -> [ABORT][6] ([i915#5566]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-glk4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk9/igt@[email protected]
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#3886]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk2/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [PASS][8] -> [FAIL][9] ([i915#72])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-glk5/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk4/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-glk: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#658])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk2/igt@[email protected]
* igt@kms_vrr@negative-basic:
- shard-glk: NOTRUN -> [SKIP][11] ([fdo#109271]) +67 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk2/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][12] ([i915#2842]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-apl7/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-apl7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- {shard-rkl}: [FAIL][14] ([i915#2842]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-rkl-7/igt@gem_exec_fair@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-rkl-4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_suspend@basic-s4-devices@smem:
- {shard-tglu}: [ABORT][16] ([i915#7975]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-tglu-10/igt@gem_exec_suspend@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-tglu-5/igt@gem_exec_suspend@[email protected]
* igt@i915_pm_rpm@modeset-lpsp:
- {shard-rkl}: [SKIP][18] ([i915#1397]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-rkl-2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-rkl-7/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-async-flip:
- {shard-rkl}: [FAIL][20] ([i915#3743]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-rkl-7/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-rkl-4/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-glk: [FAIL][22] ([i915#2346]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@single-bo@pipe-b:
- {shard-rkl}: [INCOMPLETE][24] ([i915#8011]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13001/shard-rkl-7/igt@kms_cursor_legacy@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/shard-rkl-4/igt@kms_cursor_legacy@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3938]: https://gitlab.freedesktop.org/drm/intel/issues/3938
[i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#4884]: https://gitlab.freedesktop.org/drm/intel/issues/4884
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8150]: https://gitlab.freedesktop.org/drm/intel/issues/8150
[i915#8155]: https://gitlab.freedesktop.org/drm/intel/issues/8155
[i915#8247]: https://gitlab.freedesktop.org/drm/intel/issues/8247
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
Build changes
-------------
* Linux: CI_DRM_13001 -> Patchwork_116431v1
* Piglit: None -> piglit_4509
CI-20190529: 20190529
CI_DRM_13001: 8366fd94bd551dd4b283708a23fa9b90f3a24b9e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7253: 1a619e8dbc6ca887f2ae24b2d7f1ac536342f58c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116431v1: 8366fd94bd551dd4b283708a23fa9b90f3a24b9e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116431v1/index.html
Re: [Intel-gfx] [PATCH 01/10] drm/i915/display: remove intel_display_commit_duplicated_state()
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:27)
Quoted 4 lines
This seems like an unnecessary wrapper layer. Removing it will be helpful later.
Signed-off-by Jani Nikula <[email protected]>
Quoted 69 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 28 +++++++------------- 1 file changed, 10 insertions(+), 18 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +10
-18@@ -701,20 +701,6 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)return y; } -static int -intel_display_commit_duplicated_state (struct intel_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx) -{ -struct drm_i915_private *i915 =to_i915 (state->base.dev); -int ret; - - ret =drm_atomic_helper_commit_duplicated_state (&state->base, ctx); - -drm_WARN_ON (&i915->drm, ret == -EDEADLK ); - -return ret; -} - static int __intel_display_resume(struct drm_i915_private *i915, struct drm_atomic_state *state,@@ -722,7 +708,7 @@ __intel_display_resume(struct drm_i915_private *i915, {struct drm_crtc_state *crtc_state;struct drm_crtc *crtc; -int i; +int ret, i;intel_modeset_setup_hw_state (i915, ctx);intel_vga_redisable (i915);@@ -748,7 +734,11 @@ __intel_display_resume(struct drm_i915_private *i915,if (!HAS_GMCH (i915))to_intel_atomic_state (state)->skip_intermediate_wm = true; -return intel_display_commit_duplicated_state (to_intel_atomic_state (state), ctx); + ret =drm_atomic_helper_commit_duplicated_state (state, ctx); + +drm_WARN_ON (&i915->drm, ret == -EDEADLK ); + +return ret; }static bool gpu_reset_clobbers_display (struct drm_i915_private *dev_priv)@@ -839,10 +829,12 @@ void intel_display_finish_reset(struct drm_i915_private *i915)/* reset doesn't touch the display */ if (!gpu_reset_clobbers_display (i915)) {/* for testing only restore the display */ - ret =intel_display_commit_duplicated_state (to_intel_atomic_state (state), ctx); -if (ret) + ret =drm_atomic_helper_commit_duplicated_state (state, ctx); +if (ret) { +drm_WARN_ON (&i915->drm, ret == -EDEADLK );drm_err (&i915->drm,"Restoring old state failed with %i\n" , ret); + } }else {/* * The display has been reset as well, Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 02/10] drm/i915/display: start high level display driver file
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:28)
Quoted 8 lines
The only way to truly clean up intel_display.[ch] is to move stuff out of them until there's absolutely nothing left.
Start moving the high level display driver entry points, i.e. functions called from top level driver code only, to a new file, which we'll call
intel_display_driver.c. The intention is that there's no low-level display code or details here. This is an in-between layer.
Quoted 4 lines
Initially, move
intel_display_driver_register()andintel_display_driver_unregister()there.Signed-off-by Jani Nikula <[email protected]>
Quoted 228 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 53 -------------- drivers/gpu/drm/i915/display/intel_display.h | 3 - .../drm/i915/display/intel_display_driver.c | 71 +++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 15 ++++ drivers/gpu/drm/i915/i915_driver.c | 1 + 6 files changed, 88 insertions(+), 56 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -237,6 +237,7 @@ i915-y += \ display/intel_crtc_state_dump.o \ display/intel_cursor.o \ display/intel_display.o \ + display/intel_display_driver.o \ display/intel_display_power.o \ display/intel_display_power_map.o \ display/intel_display_power_well.o \drivers/gpu/drm/i915/display/intel_display.c +0
-53@@ -32,7 +32,6 @@#include <linux/slab.h> #include <linux/string_helpers.h> #include <linux/vga_switcheroo.h> -#include <acpi/video.h> #include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h> @@ -70,7 +69,6 @@#include "intel_crtc_state_dump.h" #include "intel_ddi.h" #include "intel_de.h" -#include "intel_display_debugfs.h" #include "intel_display_power.h" #include "intel_display_types.h" #include "intel_dmc.h" @@ -8833,57 +8831,6 @@ bool intel_modeset_probe_defer(struct pci_dev *pdev)return false; } -void intel_display_driver_register (struct drm_i915_private *i915) -{ -if (!HAS_DISPLAY (i915)) -return ; - -/* Must be done after probing outputs */ -intel_opregion_register (i915); -intel_acpi_video_register (i915); - -intel_audio_init (i915); - -intel_display_debugfs_register (i915); - -/* -* Some ports require correctly set-up hpd registers for -* detection to work properly (leading to ghost connected -* connector status), e.g. VGA on gm45. Hence we can only set -* up the initial fbdev config after hpd irqs are fully -* enabled. We do it last so that the async config cannot run -* before the connectors are registered. -*/ -intel_fbdev_initial_config_async (i915); - -/* -* We need to coordinate the hotplugs with the asynchronous -* fbdev configuration, for which we use the -* fbdev->async_cookie. -*/ -drm_kms_helper_poll_init (&i915->drm); -} - -void intel_display_driver_unregister (struct drm_i915_private *i915) -{ -if (!HAS_DISPLAY (i915)) -return ; - -intel_fbdev_unregister (i915); -intel_audio_deinit (i915); - -/* -* After flushing the fbdev (incl. a late async config which -* will have delayed queuing of a hotplug event), then flush -* the hotplug events. -*/ -drm_kms_helper_poll_fini (&i915->drm); -drm_atomic_helper_shutdown (&i915->drm); - -acpi_video_unregister (); -intel_opregion_unregister (i915); -} -bool intel_scanout_needs_vtd_wa (struct drm_i915_private *i915) {return DISPLAY_VER (i915) >=6 &&i915_vtd_active (i915);drivers/gpu/drm/i915/display/intel_display.h +0
-3@@ -518,9 +518,6 @@ void intel_set_plane_visible(struct intel_crtc_state *crtc_state, bool visible);void intel_plane_fixup_bitmasks (struct intel_crtc_state *crtc_state); -void intel_display_driver_register (struct drm_i915_private *i915); -void intel_display_driver_unregister (struct drm_i915_private *i915); -void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */ drivers/gpu/drm/i915/display/intel_display_driver.c new file +71
-0@@ -0,0 +1,71 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2022-2023 Intel Corporation +* +* High level display driver entry points. This is a layer between top level +* driver code and low level display functionality; no low level display code or +* details here. +*/ + +#include <acpi/video.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_probe_helper.h> + +#include "i915_drv.h" +#include "intel_acpi.h" +#include "intel_audio.h" +#include "intel_display_debugfs.h" +#include "intel_display_driver.h" +#include "intel_fbdev.h" +#include "intel_opregion.h" + +void intel_display_driver_register (struct drm_i915_private *i915) +{ +if (!HAS_DISPLAY (i915)) +return ; + +/* Must be done after probing outputs */ +intel_opregion_register (i915); +intel_acpi_video_register (i915); + +intel_audio_init (i915); + +intel_display_debugfs_register (i915); + +/* +* Some ports require correctly set-up hpd registers for +* detection to work properly (leading to ghost connected +* connector status), e.g. VGA on gm45. Hence we can only set +* up the initial fbdev config after hpd irqs are fully +* enabled. We do it last so that the async config cannot run +* before the connectors are registered. +*/ +intel_fbdev_initial_config_async (i915); + +/* +* We need to coordinate the hotplugs with the asynchronous +* fbdev configuration, for which we use the +* fbdev->async_cookie. +*/ +drm_kms_helper_poll_init (&i915->drm); +} + +void intel_display_driver_unregister (struct drm_i915_private *i915) +{ +if (!HAS_DISPLAY (i915)) +return ; + +intel_fbdev_unregister (i915); +intel_audio_deinit (i915); + +/* +* After flushing the fbdev (incl. a late async config which +* will have delayed queuing of a hotplug event), then flush +* the hotplug events. +*/ +drm_kms_helper_poll_fini (&i915->drm); +drm_atomic_helper_shutdown (&i915->drm); + +acpi_video_unregister (); +intel_opregion_unregister (i915); +}drivers/gpu/drm/i915/display/intel_display_driver.h new file +15
-0@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2022-2023 Intel Corporation +*/ + +#ifndef __INTEL_DISPLAY_DRIVER_H__ +#define __INTEL_DISPLAY_DRIVER_H__ + +struct drm_i915_private ; + +void intel_display_driver_register (struct drm_i915_private *i915); +void intel_display_driver_unregister (struct drm_i915_private *i915); + +#endif /* __INTEL_DISPLAY_DRIVER_H__ */ +drivers/gpu/drm/i915/i915_driver.c +1
-0@@ -48,6 +48,7 @@#include "display/intel_acpi.h" #include "display/intel_bw.h" #include "display/intel_cdclk.h" +#include "display/intel_display_driver.h" #include "display/intel_display_types.h" #include "display/intel_dmc.h" #include "display/intel_dp.h" Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 03/10] drm/i915/display: move intel_modeset_probe_defer() to intel_display_driver.[ch]
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:29)
Quoted 3 lines
High level display functionality only called from driver top level code.
Signed-off-by Jani Nikula <[email protected]>
Quoted 143 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 23 ------------------- drivers/gpu/drm/i915/display/intel_display.h | 1 - .../drm/i915/display/intel_display_driver.c | 23 +++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 1 + 5 files changed, 28 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +0
-23@@ -31,7 +31,6 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/string_helpers.h> -#include <linux/vga_switcheroo.h> #include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h> @@ -40,7 +39,6 @@#include <drm/drm_damage_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fourcc.h> -#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_probe_helper.h> #include <drm/drm_rect.h> @@ -8810,27 +8808,6 @@ void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)intel_bios_driver_remove (i915); } -bool intel_modeset_probe_defer (struct pci_dev *pdev) -{ -struct drm_privacy_screen *privacy_screen; - -/* -* apple-gmux is needed on dual GPU MacBook Pro -* to probe the panel if we're the inactive GPU. -*/ -if (vga_switcheroo_client_probe_defer (pdev)) -return true; - -/* If the LCD panel has a privacy-screen, wait for it */ - privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); -if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) -return true; - -drm_privacy_screen_put (privacy_screen); - -return false; -} -bool intel_scanout_needs_vtd_wa (struct drm_i915_private *i915) {return DISPLAY_VER (i915) >=6 &&i915_vtd_active (i915);drivers/gpu/drm/i915/display/intel_display.h +0
-1@@ -521,7 +521,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */ -bool intel_modeset_probe_defer (struct pci_dev *pdev);void intel_modeset_init_hw (struct drm_i915_private *i915);int intel_modeset_init_noirq (struct drm_i915_private *i915);int intel_modeset_init_nogem (struct drm_i915_private *i915);drivers/gpu/drm/i915/display/intel_display_driver.c +23
-0@@ -7,8 +7,10 @@* details here. */ +#include <linux/vga_switcheroo.h> #include <acpi/video.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_probe_helper.h> #include "i915_drv.h" @@ -19,6 +21,27 @@#include "intel_fbdev.h" #include "intel_opregion.h" +bool intel_modeset_probe_defer (struct pci_dev *pdev) +{ +struct drm_privacy_screen *privacy_screen; + +/* +* apple-gmux is needed on dual GPU MacBook Pro +* to probe the panel if we're the inactive GPU. +*/ +if (vga_switcheroo_client_probe_defer (pdev)) +return true; + +/* If the LCD panel has a privacy-screen, wait for it */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return true; + +drm_privacy_screen_put (privacy_screen); + +return false; +} +void intel_display_driver_register (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))drivers/gpu/drm/i915/display/intel_display_driver.h +4
-0@@ -6,8 +6,12 @@#ifndef __INTEL_DISPLAY_DRIVER_H__#define __INTEL_DISPLAY_DRIVER_H__ +#include <linux/types.h> +struct drm_i915_private ; +struct pci_dev ; +bool intel_modeset_probe_defer (struct pci_dev *pdev);void intel_display_driver_register (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -27,6 +27,7 @@#include <drm/i915_pciids.h> #include "display/intel_display.h" +#include "display/intel_display_driver.h" #include "gt/intel_gt_regs.h" #include "gt/intel_sa_media.h" Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 04/10] drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer()
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:30)
Quoted 3 lines
Follow the usual naming conventions.
Signed-off-by Jani Nikula <[email protected]>
Quoted 48 lines
--- drivers/gpu/drm/i915/display/intel_display_driver.c | 2 +- drivers/gpu/drm/i915/display/intel_display_driver.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_display_driver.c +1
-1@@ -21,7 +21,7 @@#include "intel_fbdev.h" #include "intel_opregion.h" -bool intel_modeset_probe_defer (struct pci_dev *pdev) +bool intel_display_driver_probe_defer (struct pci_dev *pdev) {struct drm_privacy_screen *privacy_screen;drivers/gpu/drm/i915/display/intel_display_driver.h +1
-1@@ -11,7 +11,7 @@struct drm_i915_private ;struct pci_dev ; -bool intel_modeset_probe_defer (struct pci_dev *pdev); +bool intel_display_driver_probe_defer (struct pci_dev *pdev);void intel_display_driver_register (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);drivers/gpu/drm/i915/i915_pci.c +1
-1@@ -1355,7 +1355,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return -ENXIO ;/* Detect if we need to wait for other drivers early on */ -if (intel_modeset_probe_defer (pdev)) +if (intel_display_driver_probe_defer (pdev))return -EPROBE_DEFER ; err =i915_driver_probe (pdev, ent);Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 07/10] drm/i915/display: add intel_display_reset.[ch]
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:33)
Quoted 5 lines
Split out the display reset functionality to a separate file to declutter
intel_display.c. Rename the functions accordingly. The minor downside is having to expose__intel_display_resume().Signed-off-by Jani Nikula <[email protected]>
Quoted 381 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 123 +--------------- drivers/gpu/drm/i915/display/intel_display.h | 8 +- .../drm/i915/display/intel_display_reset.c | 135 ++++++++++++++++++ .../drm/i915/display/intel_display_reset.h | 14 ++ drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- 6 files changed, 160 insertions(+), 127 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -241,6 +241,7 @@ i915-y += \ display/intel_display_power.o \ display/intel_display_power_map.o \ display/intel_display_power_well.o \ + display/intel_display_reset.o \ display/intel_display_rps.o \ display/intel_dmc.o \ display/intel_dpio_phy.o \drivers/gpu/drm/i915/display/intel_display.c +1
-122@@ -693,7 +693,7 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)return y; } -static int +int __intel_display_resume (struct drm_i915_private *i915,struct drm_atomic_state *state,struct drm_modeset_acquire_ctx *ctx)@@ -733,127 +733,6 @@ __intel_display_resume(struct drm_i915_private *i915,return ret; } -static bool gpu_reset_clobbers_display (struct drm_i915_private *dev_priv) -{ -return (INTEL_INFO (dev_priv)->gpu_reset_clobbers_display && -intel_has_gpu_reset (to_gt (dev_priv))); -} - -void intel_display_prepare_reset (struct drm_i915_private *dev_priv) -{ -struct drm_modeset_acquire_ctx *ctx = &dev_priv->display.restore.reset_ctx; -struct drm_atomic_state *state; -int ret; - -if (!HAS_DISPLAY (dev_priv)) -return ; - -/* reset doesn't touch the display */ -if (!dev_priv->params.force_reset_modeset_test && - !gpu_reset_clobbers_display (dev_priv)) -return ; - -/* We have a modeset vs reset deadlock, defensively unbreak it. */ -set_bit (I915_RESET_MODESET , &to_gt (dev_priv)->reset.flags); -smp_mb__after_atomic (); -wake_up_bit (&to_gt (dev_priv)->reset.flags,I915_RESET_MODESET ); - -if (atomic_read (&dev_priv->gpu_error.pending_fb_pin)) { -drm_dbg_kms (&dev_priv->drm, -"Modeset potentially stuck, unbreaking through wedging\n" ); -intel_gt_set_wedged (to_gt (dev_priv)); - } - -/* -* Need mode_config.mutex so that we don't -* trample ongoing ->detect() and whatnot. -*/ -mutex_lock (&dev_priv->drm.mode_config.mutex); -drm_modeset_acquire_init (ctx,0 ); -while (1 ) { - ret =drm_modeset_lock_all_ctx (&dev_priv->drm, ctx); -if (ret != -EDEADLK ) -break ; - -drm_modeset_backoff (ctx); - } -/* -* Disabling the crtcs gracefully seems nicer. Also the -* g33 docs say we should at least disable all the planes. -*/ - state =drm_atomic_helper_duplicate_state (&dev_priv->drm, ctx); -if (IS_ERR (state)) { - ret =PTR_ERR (state); -drm_err (&dev_priv->drm,"Duplicating state failed with %i\n" , - ret); -return ; - } - - ret =drm_atomic_helper_disable_all (&dev_priv->drm, ctx); -if (ret) { -drm_err (&dev_priv->drm,"Suspending crtc's failed with %i\n" , - ret); -drm_atomic_state_put (state); -return ; - } - - dev_priv->display.restore.modeset_state = state; - state->acquire_ctx = ctx; -} - -void intel_display_finish_reset (struct drm_i915_private *i915) -{ -struct drm_modeset_acquire_ctx *ctx = &i915->display.restore.reset_ctx; -struct drm_atomic_state *state; -int ret; - -if (!HAS_DISPLAY (i915)) -return ; - -/* reset doesn't touch the display */ -if (!test_bit (I915_RESET_MODESET , &to_gt (i915)->reset.flags)) -return ; - - state =fetch_and_zero (&i915->display.restore.modeset_state); -if (!state) - goto unlock; - -/* reset doesn't touch the display */ -if (!gpu_reset_clobbers_display (i915)) { -/* for testing only restore the display */ - ret =drm_atomic_helper_commit_duplicated_state (state, ctx); -if (ret) { -drm_WARN_ON (&i915->drm, ret == -EDEADLK ); -drm_err (&i915->drm, -"Restoring old state failed with %i\n" , ret); - } - }else { -/* -* The display has been reset as well, -* so need a full re-initialization. -*/ -intel_pps_unlock_regs_wa (i915); -intel_display_driver_init_hw (i915); -intel_clock_gating_init (i915); -intel_hpd_init (i915); - - ret =__intel_display_resume (i915, state, ctx); -if (ret) -drm_err (&i915->drm, -"Restoring old state failed with %i\n" , ret); - -intel_hpd_poll_disable (i915); - } - -drm_atomic_state_put (state); -unlock: -drm_modeset_drop_locks (ctx); -drm_modeset_acquire_fini (ctx); -mutex_unlock (&i915->drm.mode_config.mutex); - -clear_bit_unlock (I915_RESET_MODESET , &to_gt (i915)->reset.flags); -} -static void icl_set_pipe_chicken (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);drivers/gpu/drm/i915/display/intel_display.h +6
-2@@ -468,8 +468,6 @@ intel_framebuffer_create(struct drm_i915_gem_object *obj,bool intel_fuzzy_clock_check (int clock1,int clock2); -void intel_display_prepare_reset (struct drm_i915_private *dev_priv); -void intel_display_finish_reset (struct drm_i915_private *dev_priv);void intel_zero_m_n (struct intel_link_m_n *m_n); void intel_set_m_n(struct drm_i915_private *i915, const struct intel_link_m_n *m_n,@@ -545,6 +543,12 @@ int intel_atomic_check(struct drm_device *dev, struct drm_atomic_state *_state);void intel_hpd_poll_fini (struct drm_i915_private *i915); +/* interface for intel_display_reset.c */ +int +__intel_display_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx); +/* modesetting asserts */ void assert_transcoder (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,bool state);drivers/gpu/drm/i915/display/intel_display_reset.c new file +135
-0@@ -0,0 +1,135 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2023 Intel Corporation +*/ + +#include <drm/drm_atomic_helper.h> + +#include "i915_drv.h" +#include "intel_clock_gating.h" +#include "intel_display_driver.h" +#include "intel_display_reset.h" +#include "intel_display_types.h" +#include "intel_hotplug.h" +#include "intel_pps.h" + +static bool gpu_reset_clobbers_display (struct drm_i915_private *dev_priv) +{ +return (INTEL_INFO (dev_priv)->gpu_reset_clobbers_display && +intel_has_gpu_reset (to_gt (dev_priv))); +} + +void intel_display_reset_prepare (struct drm_i915_private *dev_priv) +{ +struct drm_modeset_acquire_ctx *ctx = &dev_priv->display.restore.reset_ctx; +struct drm_atomic_state *state; +int ret; + +if (!HAS_DISPLAY (dev_priv)) +return ; + +/* reset doesn't touch the display */ +if (!dev_priv->params.force_reset_modeset_test && + !gpu_reset_clobbers_display (dev_priv)) +return ; + +/* We have a modeset vs reset deadlock, defensively unbreak it. */ +set_bit (I915_RESET_MODESET , &to_gt (dev_priv)->reset.flags); +smp_mb__after_atomic (); +wake_up_bit (&to_gt (dev_priv)->reset.flags,I915_RESET_MODESET ); + +if (atomic_read (&dev_priv->gpu_error.pending_fb_pin)) { +drm_dbg_kms (&dev_priv->drm, +"Modeset potentially stuck, unbreaking through wedging\n" ); +intel_gt_set_wedged (to_gt (dev_priv)); + } + +/* +* Need mode_config.mutex so that we don't +* trample ongoing ->detect() and whatnot. +*/ +mutex_lock (&dev_priv->drm.mode_config.mutex); +drm_modeset_acquire_init (ctx,0 ); +while (1 ) { + ret =drm_modeset_lock_all_ctx (&dev_priv->drm, ctx); +if (ret != -EDEADLK ) +break ; + +drm_modeset_backoff (ctx); + } +/* +* Disabling the crtcs gracefully seems nicer. Also the +* g33 docs say we should at least disable all the planes. +*/ + state =drm_atomic_helper_duplicate_state (&dev_priv->drm, ctx); +if (IS_ERR (state)) { + ret =PTR_ERR (state); +drm_err (&dev_priv->drm,"Duplicating state failed with %i\n" , + ret); +return ; + } + + ret =drm_atomic_helper_disable_all (&dev_priv->drm, ctx); +if (ret) { +drm_err (&dev_priv->drm,"Suspending crtc's failed with %i\n" , + ret); +drm_atomic_state_put (state); +return ; + } + + dev_priv->display.restore.modeset_state = state; + state->acquire_ctx = ctx; +} + +void intel_display_reset_finish (struct drm_i915_private *i915) +{ +struct drm_modeset_acquire_ctx *ctx = &i915->display.restore.reset_ctx; +struct drm_atomic_state *state; +int ret; + +if (!HAS_DISPLAY (i915)) +return ; + +/* reset doesn't touch the display */ +if (!test_bit (I915_RESET_MODESET , &to_gt (i915)->reset.flags)) +return ; + + state =fetch_and_zero (&i915->display.restore.modeset_state); +if (!state) + goto unlock; + +/* reset doesn't touch the display */ +if (!gpu_reset_clobbers_display (i915)) { +/* for testing only restore the display */ + ret =drm_atomic_helper_commit_duplicated_state (state, ctx); +if (ret) { +drm_WARN_ON (&i915->drm, ret == -EDEADLK ); +drm_err (&i915->drm, +"Restoring old state failed with %i\n" , ret); + } + }else { +/* +* The display has been reset as well, +* so need a full re-initialization. +*/ +intel_pps_unlock_regs_wa (i915); +intel_display_driver_init_hw (i915); +intel_clock_gating_init (i915); +intel_hpd_init (i915); + + ret =__intel_display_resume (i915, state, ctx); +if (ret) +drm_err (&i915->drm, +"Restoring old state failed with %i\n" , ret); + +intel_hpd_poll_disable (i915); + } + +drm_atomic_state_put (state); +unlock: +drm_modeset_drop_locks (ctx); +drm_modeset_acquire_fini (ctx); +mutex_unlock (&i915->drm.mode_config.mutex); + +clear_bit_unlock (I915_RESET_MODESET , &to_gt (i915)->reset.flags); +}drivers/gpu/drm/i915/display/intel_display_reset.h new file +14
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2023 Intel Corporation +*/ + +#ifndef __INTEL_RESET_H__ +#define __INTEL_RESET_H__ + +struct drm_i915_private ; + +void intel_display_reset_prepare (struct drm_i915_private *i915); +void intel_display_reset_finish (struct drm_i915_private *i915); + +#endif /* __INTEL_RESET_H__ */ drivers/gpu/drm/i915/gt/intel_reset.c +3
-3@@ -7,7 +7,7 @@#include <linux/stop_machine.h> #include <linux/string_helpers.h> -#include "display/intel_display.h" +#include "display/intel_display_reset.h" #include "display/intel_overlay.h" #include "gem/i915_gem_context.h" @@ -1370,11 +1370,11 @@ static void intel_gt_reset_global(struct intel_gt *gt,/* Use a watchdog to ensure that our reset completes */ intel_wedge_on_timeout(&w, gt, 60 * HZ) { -intel_display_prepare_reset (gt->i915); +intel_display_reset_prepare (gt->i915);intel_gt_reset (gt, engine_mask, reason); -intel_display_finish_reset (gt->i915); +intel_display_reset_finish (gt->i915); }if (!test_bit (I915_WEDGED , >->reset.flags))Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 08/10] drm/i915/display: move display suspend/resume to intel_display_driver.[ch]
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:34)
Quoted 3 lines
High level display functionality only called from driver top level code.
Signed-off-by Jani Nikula <[email protected]>
Quoted 308 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 102 ------------------ drivers/gpu/drm/i915/display/intel_display.h | 8 -- .../drm/i915/display/intel_display_driver.c | 101 +++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 10 ++ 4 files changed, 111 insertions(+), 110 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +0
-102@@ -693,46 +693,6 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)return y; } -int -__intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx) -{ -struct drm_crtc_state *crtc_state; -struct drm_crtc *crtc; -int ret, i; - -intel_modeset_setup_hw_state (i915, ctx); -intel_vga_redisable (i915); - -if (!state) -return 0 ; - -/* -* We've duplicated the state, pointers to the old state are invalid. -* -* Don't attempt to use the old state until we commit the duplicated state. -*/ -for_each_new_crtc_in_state (state, crtc, crtc_state, i) { -/* -* Force recalculation even if we restore -* current state. With fast modeset this may not result -* in a modeset when the state is compatible. -*/ - crtc_state->mode_changed = true; - } - -/* ignore any reset values/BIOS leftovers in the WM registers */ -if (!HAS_GMCH (i915)) -to_intel_atomic_state (state)->skip_intermediate_wm = true; - - ret =drm_atomic_helper_commit_duplicated_state (state, ctx); - -drm_WARN_ON (&i915->drm, ret == -EDEADLK ); - -return ret; -} -static void icl_set_pipe_chicken (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);@@ -2104,30 +2064,6 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state,i830_enable_pipe (dev_priv, pipe); } - -/* -* turn all crtc's off, but do not adjust state -* This has to be paired with a call to intel_modeset_setup_hw_state. -*/ -int intel_display_suspend (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state; -int ret; - -if (!HAS_DISPLAY (dev_priv)) -return 0 ; - - state =drm_atomic_helper_suspend (dev); - ret =PTR_ERR_OR_ZERO (state); -if (ret) -drm_err (&dev_priv->drm,"Suspending crtc's failed with %i\n" , - ret); -else - dev_priv->display.restore.modeset_state = state; -return ret; -} -void intel_encoder_destroy (struct drm_encoder *encoder) {struct intel_encoder *intel_encoder =to_intel_encoder (encoder);@@ -8280,44 +8216,6 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)intel_de_posting_read (dev_priv,DPLL (pipe)); } -void intel_display_resume (struct drm_device *dev) -{ -struct drm_i915_private *i915 =to_i915 (dev); -struct drm_atomic_state *state = i915->display.restore.modeset_state; -struct drm_modeset_acquire_ctx ctx; -int ret; - -if (!HAS_DISPLAY (i915)) -return ; - - i915->display.restore.modeset_state =NULL ; -if (state) - state->acquire_ctx = &ctx; - -drm_modeset_acquire_init (&ctx,0 ); - -while (1 ) { - ret =drm_modeset_lock_all_ctx (dev, &ctx); -if (ret != -EDEADLK ) -break ; - -drm_modeset_backoff (&ctx); - } - -if (!ret) - ret =__intel_display_resume (i915, state, &ctx); - -skl_watermark_ipc_update (i915); -drm_modeset_drop_locks (&ctx); -drm_modeset_acquire_fini (&ctx); - -if (ret) -drm_err (&i915->drm, -"Restoring old state failed with %i\n" , ret); -if (state) -drm_atomic_state_put (state); -} -void intel_hpd_poll_fini (struct drm_i915_private *i915) {struct intel_connector *connector;drivers/gpu/drm/i915/display/intel_display.h +0
-8@@ -438,7 +438,6 @@ void intel_add_fb_offsets(int *x, int *y,unsigned int intel_rotation_info_size (const struct intel_rotation_info *rot_info);unsigned int intel_remapped_info_size (const struct intel_remapped_info *rem_info);bool intel_has_pending_fb_unpin (struct drm_i915_private *dev_priv); -int intel_display_suspend (struct drm_device *dev);void intel_encoder_destroy (struct drm_encoder *encoder);struct drm_display_mode *intel_encoder_current_mode (struct intel_encoder *encoder);@@ -520,7 +519,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);void intel_update_watermarks (struct drm_i915_private *i915);/* modesetting */ -void intel_display_resume (struct drm_device *dev);int intel_modeset_all_pipes (struct intel_atomic_state *state,const char *reason); void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,@@ -543,12 +541,6 @@ int intel_atomic_check(struct drm_device *dev, struct drm_atomic_state *_state);void intel_hpd_poll_fini (struct drm_i915_private *i915); -/* interface for intel_display_reset.c */ -int -__intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx); -/* modesetting asserts */ void assert_transcoder (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,bool state);drivers/gpu/drm/i915/display/intel_display_driver.c +101
-0@@ -466,3 +466,104 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)acpi_video_unregister ();intel_opregion_unregister (i915); } + +/* +* turn all crtc's off, but do not adjust state +* This has to be paired with a call to intel_modeset_setup_hw_state. +*/ +int intel_display_suspend (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_atomic_state *state; +int ret; + +if (!HAS_DISPLAY (dev_priv)) +return 0 ; + + state =drm_atomic_helper_suspend (dev); + ret =PTR_ERR_OR_ZERO (state); +if (ret) +drm_err (&dev_priv->drm,"Suspending crtc's failed with %i\n" , + ret); +else + dev_priv->display.restore.modeset_state = state; +return ret; +} + +int +__intel_display_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx) +{ +struct drm_crtc_state *crtc_state; +struct drm_crtc *crtc; +int ret, i; + +intel_modeset_setup_hw_state (i915, ctx); +intel_vga_redisable (i915); + +if (!state) +return 0 ; + +/* +* We've duplicated the state, pointers to the old state are invalid. +* +* Don't attempt to use the old state until we commit the duplicated state. +*/ +for_each_new_crtc_in_state (state, crtc, crtc_state, i) { +/* +* Force recalculation even if we restore +* current state. With fast modeset this may not result +* in a modeset when the state is compatible. +*/ + crtc_state->mode_changed = true; + } + +/* ignore any reset values/BIOS leftovers in the WM registers */ +if (!HAS_GMCH (i915)) +to_intel_atomic_state (state)->skip_intermediate_wm = true; + + ret =drm_atomic_helper_commit_duplicated_state (state, ctx); + +drm_WARN_ON (&i915->drm, ret == -EDEADLK ); + +return ret; +} + +void intel_display_resume (struct drm_device *dev) +{ +struct drm_i915_private *i915 =to_i915 (dev); +struct drm_atomic_state *state = i915->display.restore.modeset_state; +struct drm_modeset_acquire_ctx ctx; +int ret; + +if (!HAS_DISPLAY (i915)) +return ; + + i915->display.restore.modeset_state =NULL ; +if (state) + state->acquire_ctx = &ctx; + +drm_modeset_acquire_init (&ctx,0 ); + +while (1 ) { + ret =drm_modeset_lock_all_ctx (dev, &ctx); +if (ret != -EDEADLK ) +break ; + +drm_modeset_backoff (&ctx); + } + +if (!ret) + ret =__intel_display_resume (i915, state, &ctx); + +skl_watermark_ipc_update (i915); +drm_modeset_drop_locks (&ctx); +drm_modeset_acquire_fini (&ctx); + +if (ret) +drm_err (&i915->drm, +"Restoring old state failed with %i\n" , ret); +if (state) +drm_atomic_state_put (state); +}drivers/gpu/drm/i915/display/intel_display_driver.h +10
-0@@ -8,7 +8,10 @@#include <linux/types.h> +struct drm_atomic_state ; +struct drm_device ;struct drm_i915_private ; +struct drm_modeset_acquire_ctx ;struct pci_dev ;bool intel_display_driver_probe_defer (struct pci_dev *pdev);@@ -21,6 +24,13 @@ void intel_display_driver_remove(struct drm_i915_private *i915);void intel_display_driver_remove_noirq (struct drm_i915_private *i915);void intel_display_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915); +int intel_display_suspend (struct drm_device *dev); +void intel_display_resume (struct drm_device *dev); + +/* interface for intel_display_reset.c */ +int __intel_display_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx);#endif /* __INTEL_DISPLAY_DRIVER_H__ */ Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 09/10] drm/i915/display: rename intel_display_driver_suspend/resume functions
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:35)
Quoted 4 lines
Follow the usual naming conventions. Switch to i915 arguments and naming while at it.
Signed-off-by Jani Nikula <[email protected]>
Quoted 156 lines
--- .../drm/i915/display/intel_display_driver.c | 24 +++++++++---------- .../drm/i915/display/intel_display_driver.h | 11 ++++----- .../drm/i915/display/intel_display_reset.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 6 ++--- 4 files changed, 20 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/display/intel_display_driver.c +11
-13@@ -471,29 +471,28 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)* turn all crtc's off, but do not adjust state * This has to be paired with a call to intel_modeset_setup_hw_state. */ -int intel_display_suspend (struct drm_device *dev) +int intel_display_driver_suspend (struct drm_i915_private *i915) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_atomic_state *state;int ret; -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (i915))return 0 ; - state =drm_atomic_helper_suspend (dev); + state =drm_atomic_helper_suspend (&i915->drm); ret =PTR_ERR_OR_ZERO (state);if (ret) -drm_err (&dev_priv->drm,"Suspending crtc's failed with %i\n" , +drm_err (&i915->drm,"Suspending crtc's failed with %i\n" , ret);else - dev_priv->display.restore.modeset_state = state; + i915->display.restore.modeset_state = state;return ret; }int -__intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx) +__intel_display_driver_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx) {struct drm_crtc_state *crtc_state;struct drm_crtc *crtc;@@ -530,9 +529,8 @@ __intel_display_resume(struct drm_i915_private *i915,return ret; } -void intel_display_resume (struct drm_device *dev) +void intel_display_driver_resume (struct drm_i915_private *i915) { -struct drm_i915_private *i915 =to_i915 (dev);struct drm_atomic_state *state = i915->display.restore.modeset_state;struct drm_modeset_acquire_ctx ctx;int ret;@@ -547,7 +545,7 @@ void intel_display_resume(struct drm_device *dev)drm_modeset_acquire_init (&ctx,0 );while (1 ) { - ret =drm_modeset_lock_all_ctx (dev, &ctx); + ret =drm_modeset_lock_all_ctx (&i915->drm, &ctx);if (ret != -EDEADLK )break ;@@ -555,7 +553,7 @@ void intel_display_resume(struct drm_device *dev) }if (!ret) - ret =__intel_display_resume (i915, state, &ctx); + ret =__intel_display_driver_resume (i915, state, &ctx);skl_watermark_ipc_update (i915);drm_modeset_drop_locks (&ctx);drivers/gpu/drm/i915/display/intel_display_driver.h +5
-6@@ -9,7 +9,6 @@#include <linux/types.h> struct drm_atomic_state ; -struct drm_device ;struct drm_i915_private ;struct drm_modeset_acquire_ctx ;struct pci_dev ;@@ -24,13 +23,13 @@ void intel_display_driver_remove(struct drm_i915_private *i915);void intel_display_driver_remove_noirq (struct drm_i915_private *i915);void intel_display_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915); -int intel_display_suspend (struct drm_device *dev); -void intel_display_resume (struct drm_device *dev); +int intel_display_driver_suspend (struct drm_i915_private *i915); +void intel_display_driver_resume (struct drm_i915_private *i915);/* interface for intel_display_reset.c */ -int __intel_display_resume (struct drm_i915_private *i915, -struct drm_atomic_state *state, -struct drm_modeset_acquire_ctx *ctx); +int __intel_display_driver_resume (struct drm_i915_private *i915, +struct drm_atomic_state *state, +struct drm_modeset_acquire_ctx *ctx);#endif /* __INTEL_DISPLAY_DRIVER_H__ */ drivers/gpu/drm/i915/display/intel_display_reset.c +1
-1@@ -117,7 +117,7 @@ void intel_display_reset_finish(struct drm_i915_private *i915)intel_clock_gating_init (i915);intel_hpd_init (i915); - ret =__intel_display_resume (i915, state, ctx); + ret =__intel_display_driver_resume (i915, state, ctx);if (ret)drm_err (&i915->drm,"Restoring old state failed with %i\n" , ret);drivers/gpu/drm/i915/i915_driver.c +3
-3@@ -1053,7 +1053,7 @@ static int i915_drm_prepare(struct drm_device *dev)intel_pxp_suspend_prepare (i915->pxp);/* -* NB intel_display_suspend() may issue new requests after we've +* NB intel_display_driver_suspend() may issue new requests after we've * ostensibly marked the GPU as ready-to-sleep here. We need to * split out that work and pull it forward so that after point, * the GPU is not woken again. @@ -1077,7 +1077,7 @@ static int i915_drm_suspend(struct drm_device *dev)pci_save_state (pdev); -intel_display_suspend (dev); +intel_display_driver_suspend (dev_priv);intel_dp_mst_suspend (dev_priv);@@ -1251,7 +1251,7 @@ static int i915_drm_resume(struct drm_device *dev)/* MST sideband requires HPD interrupts enabled */ intel_dp_mst_resume (dev_priv); -intel_display_resume (dev); +intel_display_driver_resume (dev_priv);intel_hpd_poll_disable (dev_priv);if (HAS_DISPLAY (dev_priv))Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 10/10] drm/i915/display: add intel_display_driver_early_probe()
In reply to Jani NikulaQuoting Jani Nikula (2023-04-13 06:47:36)
Quoted 5 lines
Add
intel_display_driver_early_probe()as the early probe call to replaceintel_init_display_hooks(). The latter will be "demoted" to setting up hooks inintel_display.conly.Signed-off-by Jani Nikula <[email protected]>
Quoted 96 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 11 ----------- .../gpu/drm/i915/display/intel_display_driver.c | 14 ++++++++++++++ .../gpu/drm/i915/display/intel_display_driver.h | 1 + drivers/gpu/drm/i915/i915_driver.c | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +0
-11@@ -8005,15 +8005,6 @@ static const struct intel_display_funcs i9xx_display_funcs = {*/ void intel_init_display_hooks (struct drm_i915_private *dev_priv) { -if (!HAS_DISPLAY (dev_priv)) -return ; - -intel_color_init_hooks (dev_priv); -intel_init_cdclk_hooks (dev_priv); -intel_audio_hooks_init (dev_priv); - -intel_dpll_init_clock_hook (dev_priv); -if (DISPLAY_VER (dev_priv) >=9 ) { dev_priv->display.funcs.display = &skl_display_funcs; }else if (HAS_DDI (dev_priv)) {@@ -8026,8 +8017,6 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }else { dev_priv->display.funcs.display = &i9xx_display_funcs; } - -intel_fdi_init_hook (dev_priv); }int intel_initial_commit (struct drm_device *dev)drivers/gpu/drm/i915/display/intel_display_driver.c +14
-0@@ -32,6 +32,7 @@#include "intel_display_types.h" #include "intel_dmc.h" #include "intel_dp.h" +#include "intel_dpll.h" #include "intel_dpll_mgr.h" #include "intel_fb.h" #include "intel_fbc.h" @@ -169,6 +170,19 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) } } +void intel_display_driver_early_probe (struct drm_i915_private *i915) +{ +if (!HAS_DISPLAY (i915)) +return ; + +intel_color_init_hooks (i915); +intel_init_cdclk_hooks (i915); +intel_audio_hooks_init (i915); +intel_dpll_init_clock_hook (i915); +intel_init_display_hooks (i915); +intel_fdi_init_hook (i915); +} +/* part #1: call before irq install */ int intel_display_driver_probe_noirq (struct drm_i915_private *i915) {drivers/gpu/drm/i915/display/intel_display_driver.h +1
-0@@ -15,6 +15,7 @@ struct pci_dev;bool intel_display_driver_probe_defer (struct pci_dev *pdev);void intel_display_driver_init_hw (struct drm_i915_private *i915); +void intel_display_driver_early_probe (struct drm_i915_private *i915);int intel_display_driver_probe_noirq (struct drm_i915_private *i915);int intel_display_driver_probe_nogem (struct drm_i915_private *i915);int intel_display_driver_probe (struct drm_i915_private *i915);drivers/gpu/drm/i915/i915_driver.c +1
-1@@ -252,7 +252,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_detect_pch (dev_priv);intel_irq_init (dev_priv); -intel_init_display_hooks (dev_priv); +intel_display_driver_early_probe (dev_priv);intel_clock_gating_hooks_init (dev_priv);intel_detect_preproduction_hw (dev_priv);Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH 04/10] drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer()
In reply to Jani NikulaQuoted 14 lines · Jani Nikula
Follow the usual naming conventions.
Signed-off-by Jani Nikula <[email protected]>---
drivers/gpu/drm/i915/display/intel_display_driver.c | 2 +- drivers/gpu/drm/i915/display/intel_display_driver.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_display_driver.c +0
-0
drivers/gpu/drm/i915/display/intel_display_driver.c line 24
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display_driver.c +1
-1@@ -21,7 +21,7 @@#include "intel_fbdev.h" #include "intel_opregion.h" -bool intel_modeset_probe_defer (struct pci_dev *pdev) +bool intel_display_driver_probe_defer (struct pci_dev *pdev)
thanks much
Lucas De Marchi
Re: [Intel-gfx] [PATCH 06/10] drm/i915/display: rename intel_display_driver_* functions
In reply to Gustavo SousaQuoted 127 lines · Gustavo Sousa
Quoting Jani Nikula (2023-04-13 06:47:32)
Quoted 113 lines
Follow the usual naming conventions.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- .../drm/i915/display/intel_display_driver.c | 16 +++++++------- .../drm/i915/display/intel_display_driver.h | 14 ++++++------- drivers/gpu/drm/i915/i915_driver.c | 21 ++++++++++--------- 4 files changed, 27 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -833,7 +833,7 @@ void intel_display_finish_reset(struct drm_i915_private *i915)* so need a full re-initialization. */ intel_pps_unlock_regs_wa (i915); -intel_modeset_init_hw (i915); +intel_display_driver_init_hw (i915);intel_clock_gating_init (i915);intel_hpd_init (i915);drivers/gpu/drm/i915/display/intel_display_driver.c +8
-8@@ -72,7 +72,7 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev)return false; } -void intel_modeset_init_hw (struct drm_i915_private *i915) +void intel_display_driver_init_hw (struct drm_i915_private *i915) {struct intel_cdclk_state *cdclk_state;@@ -170,7 +170,7 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) }/* part #1: call before irq install */ -int intel_modeset_init_noirq (struct drm_i915_private *i915) +int intel_display_driver_probe_noirq (struct drm_i915_private *i915) {int ret;@@ -246,7 +246,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) }/* part #2: call after irq install, but before gem init */ -int intel_modeset_init_nogem (struct drm_i915_private *i915) +int intel_display_driver_probe_nogem (struct drm_i915_private *i915) {struct drm_device *dev = &i915->drm;enum pipe pipe;@@ -281,7 +281,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)intel_fdi_pll_freq_update (i915);intel_update_czclk (i915); -intel_modeset_init_hw (i915); +intel_display_driver_init_hw (i915);intel_dpll_update_ref_clks (i915);intel_hdcp_component_init (i915);@@ -318,7 +318,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) }/* part #3: call after gem init */ -int intel_modeset_init (struct drm_i915_private *i915) +int intel_display_driver_probe (struct drm_i915_private *i915) {int ret;@@ -382,7 +382,7 @@ void intel_display_driver_register(struct drm_i915_private *i915) }/* part #1: call before irq uninstall */ -void intel_modeset_driver_remove (struct drm_i915_private *i915) +void intel_display_driver_remove (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))return ;@@ -402,7 +402,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915) }/* part #2: call after irq uninstall */ -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915) +void intel_display_driver_remove_noirq (struct drm_i915_private *i915) {if (!HAS_DISPLAY (i915))return ;@@ -436,7 +436,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915) }/* part #3: call after gem init */ -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915) +void intel_display_driver_remove_nogem (struct drm_i915_private *i915) {intel_dmc_fini (i915);drivers/gpu/drm/i915/display/intel_display_driver.h +2
-4@@ -12,14 +12,14 @@ struct drm_i915_private;struct pci_dev ;bool intel_display_driver_probe_defer (struct pci_dev *pdev); -void intel_modeset_init_hw (struct drm_i915_private *i915); -int intel_modeset_init_noirq (struct drm_i915_private *i915); -int intel_modeset_init_nogem (struct drm_i915_private *i915); -int intel_modeset_init (struct drm_i915_private *i915); +void intel_display_driver_init_hw (struct drm_i915_private *i915); +int intel_display_driver_probe_noirq (struct drm_i915_private *i915);drivers/gpu/drm/i915/display/intel_display_driver.h struct drm_i915_private; · line 23
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display_driver.h +5
-3+int intel_display_driver_probe_nogem (struct drm_i915_private *i915); +int intel_display_driver_probe (struct drm_i915_private *i915);void intel_display_driver_register (struct drm_i915_private *i915); -void intel_modeset_driver_remove (struct drm_i915_private *i915); -void intel_modeset_driver_remove_noirq (struct drm_i915_private *i915); -void intel_modeset_driver_remove_nogem (struct drm_i915_private *i915); +void intel_display_driver_remove (struct drm_i915_private *i915); +void intel_display_driver_remove_noirq (struct drm_i915_private *i915); +void intel_display_driver_remove_nogem (struct drm_i915_private *i915);void intel_display_driver_unregister (struct drm_i915_private *i915);Looks like some comments need to be fixed now:
Quoted 4 lines
❯ git grep -w -e
intel_modeset_init_hw-eintel_modeset_init_noirq-eintel_modeset_init_nogem-eintel_modeset_init-eintel_modeset_driver_remove-eintel_modeset_driver_remove_noirq-eintel_modeset_driver_remove_nogem
i915_driver.c: * - drive output discovery viaintel_modeset_init()
i915_driver.c: * Modeset enabling inintel_modeset_init_hw()also needs working
i915_irq.c: *intel_modeset_driver_remove()calling us out of sequence.
Thanks, will fix.
BR,
Jani.
Quoted 88 lines
--
Gustavo SousaQuoted 84 lines
drivers/gpu/drm/i915/display/intel_display_driver.h +0
-0#endif /* __INTEL_DISPLAY_DRIVER_H__ */ drivers/gpu/drm/i915/i915_driver.c +11
-10@@ -791,7 +791,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret <0 ) goto out_cleanup_mmio; - ret =intel_modeset_init_noirq (i915); + ret =intel_display_driver_probe_noirq (i915);if (ret <0 ) goto out_cleanup_hw;@@ -799,7 +799,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto out_cleanup_modeset; - ret =intel_modeset_init_nogem (i915); + ret =intel_display_driver_probe_nogem (i915);if (ret) goto out_cleanup_irq;@@ -809,7 +809,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)intel_pxp_init (i915); - ret =intel_modeset_init (i915); + ret =intel_display_driver_probe (i915);if (ret) goto out_cleanup_gem;@@ -829,14 +829,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)i915_gem_driver_release (i915); out_cleanup_modeset2:/* FIXME clean up the error path */ -intel_modeset_driver_remove (i915); +intel_display_driver_remove (i915);intel_irq_uninstall (i915); -intel_modeset_driver_remove_noirq (i915); +intel_display_driver_remove_noirq (i915); goto out_cleanup_modeset; out_cleanup_irq:intel_irq_uninstall (i915); out_cleanup_modeset: -intel_modeset_driver_remove_nogem (i915); +intel_display_driver_remove_nogem (i915); out_cleanup_hw:i915_driver_hw_remove (i915);intel_memory_regions_driver_release (i915);@@ -872,16 +872,16 @@ void i915_driver_remove(struct drm_i915_private *i915)intel_gvt_driver_remove (i915); -intel_modeset_driver_remove (i915); +intel_display_driver_remove (i915);intel_irq_uninstall (i915); -intel_modeset_driver_remove_noirq (i915); +intel_display_driver_remove_noirq (i915);i915_reset_error_state (i915);i915_gem_driver_remove (i915); -intel_modeset_driver_remove_nogem (i915); +intel_display_driver_remove_nogem (i915);i915_driver_hw_remove (i915);@@ -1244,7 +1244,8 @@ static int i915_drm_resume(struct drm_device *dev)i915_gem_resume (dev_priv); -intel_modeset_init_hw (dev_priv); +intel_display_driver_init_hw (dev_priv); +intel_clock_gating_init (dev_priv);intel_hpd_init (dev_priv);Signature · 1 line
2.39.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 05/10] drm/i915/display: move modeset probe/remove functions to intel_display_driver.c
In reply to Gustavo SousaQuoted 7 lines · Gustavo Sousa
Quoting Jani Nikula (2023-04-13 06:47:31)
drivers/gpu/drm/i915/display/intel_display.h void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state, · line 535
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_display.h +3
-0+/* interface for intel_display_driver.c */ +void intel_setup_outputs (struct drm_i915_private *i915); +void intel_sanitize_watermarks (struct drm_i915_private *i915);I can't find the implementation for this one and it seems it is not being called anywhere.
Rebase leftover, thanks for catching this.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 05/10] drm/i915/display: move modeset probe/remove functions to intel_display_driver.c
In reply to Gustavo SousaQuoted 11 lines · Gustavo Sousa
Quoting Jani Nikula (2023-04-13 06:47:31)
drivers/gpu/drm/i915/display/intel_display.h void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state, · line 535
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_display.h +3
-0+/* interface for intel_display_driver.c */ +void intel_setup_outputs (struct drm_i915_private *i915); +void intel_sanitize_watermarks (struct drm_i915_private *i915);I can't find the implementation for this one and it seems it is not being called anywhere.
--
Gustavo Sousa
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_display.h void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state, · line 544
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_display.h +9
-0+int intel_initial_commit (struct drm_device *dev); +void intel_panel_sanitize_ssc (struct drm_i915_private *i915); +void intel_update_czclk (struct drm_i915_private *i915); +void intel_atomic_helper_free_state_worker (struct work_struct *work); +enum drm_mode_status intel_mode_valid (struct drm_device *dev, +const struct drm_display_mode *mode); +int intel_atomic_commit (struct drm_device *dev,struct drm_atomic_state *_state, +bool nonblock); +int intel_atomic_check (struct drm_device *dev,struct drm_atomic_state *_state);
This one's actually unnecessary too, a declaration for it was already added earlier.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center