drm/i915/display: switch to intel_display_utils.h

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

drm/i915/display: switch to intel_display_utils.h

The remaining utils display needs from i915_utils.h are primarily
MISSING_CASE() and fetch_and_zero(), with a couple of
i915_inject_probe_failure() uses.

To avoid excessive churn, add duplicates of MISSING_CASE() and
fetch_and_zero() to intel_display_utils.h, and switch display to use the
display utils.

As long as there are display files that include i915_drv.h, which
includes i915_utils.h, we'll need #ifndef guards for MISSING_CASE() and
fetch_and_zero() in both utils headers. We can remove them once display
no longer depends on i915_drv.h.

A couple of files in display still need i915_utils.h for
i915_inject_probe_failure(). Annotate this. They will be handled
separately.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patch.msgid.link/79f9e31ca64c8c045834d48e20ceb0c515d1e9e1.1761146196.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula 5 months ago b062cf54 aaccf0ba

+65 -53

52 changed files

expand all collapse all

drivers

gpu

drm

i915

display

g4x_dp.c

i9xx_plane.c

icl_dsi.c

intel_acpi.c

intel_bios.c

intel_bw.c

intel_cdclk.c

intel_color.c

intel_combo_phy.c

intel_connector.c

intel_cursor.c

intel_cx0_phy.c

intel_ddi.c

intel_ddi_buf_trans.c

intel_display.c

intel_display_driver.c

intel_display_power.c

intel_display_utils.h

intel_dmc.c

intel_dp.c

intel_dp_aux.c

intel_dp_link_training.c

intel_dpio_phy.c

intel_dpll_mgr.c

intel_dsi_vbt.c

intel_dvo.c

intel_fb.c

intel_fbc.c

intel_fdi.c

intel_flipq.c

intel_hdcp.c

intel_hdcp_gsc.c

intel_hdmi.c

intel_hotplug.c

intel_hotplug_irq.c

intel_lspcon.c

intel_pch_refclk.c

intel_pfit.c

intel_pmdemand.c

intel_pps.c

intel_psr.c

intel_qp_tables.c

intel_snps_phy.c

intel_sprite.c

intel_tc.c

intel_vblank.c

intel_vdsc.c

skl_scaler.c

skl_universal_plane.c

skl_watermark.c

vlv_dsi.c

i915_utils.h

+1 -1

drivers/gpu/drm/i915/display/g4x_dp.c

reviewed

··· 11 11 12 12 #include "g4x_dp.h" 13 13 #include "i915_reg.h" 14 14 - #include "i915_utils.h" 15 14 #include "intel_audio.h" 16 15 #include "intel_backlight.h" 17 16 #include "intel_connector.h" ··· 19 20 #include "intel_display_power.h" 20 21 #include "intel_display_regs.h" 21 22 #include "intel_display_types.h" 23 23 + #include "intel_display_utils.h" 22 24 #include "intel_dp.h" 23 25 #include "intel_dp_aux.h" 24 26 #include "intel_dp_link_training.h"

+1 -1

drivers/gpu/drm/i915/display/i9xx_plane.c

reviewed

··· 11 11 #include <drm/drm_print.h> 12 12 13 13 #include "i915_reg.h" 14 14 - #include "i915_utils.h" 15 14 #include "i9xx_plane.h" 16 15 #include "i9xx_plane_regs.h" 17 16 #include "intel_atomic.h" ··· 18 19 #include "intel_display_irq.h" 19 20 #include "intel_display_regs.h" 20 21 #include "intel_display_types.h" 22 22 + #include "intel_display_utils.h" 21 23 #include "intel_fb.h" 22 24 #include "intel_fbc.h" 23 25 #include "intel_frontbuffer.h"

+1 -1

drivers/gpu/drm/i915/display/icl_dsi.c

reviewed

··· 35 35 #include <drm/drm_probe_helper.h> 36 36 37 37 #include "i915_reg.h" 38 38 - #include "i915_utils.h" 39 38 #include "icl_dsi.h" 40 39 #include "icl_dsi_regs.h" 41 40 #include "intel_atomic.h" ··· 47 48 #include "intel_ddi.h" 48 49 #include "intel_de.h" 49 50 #include "intel_display_regs.h" 51 51 + #include "intel_display_utils.h" 50 52 #include "intel_dsi.h" 51 53 #include "intel_dsi_vbt.h" 52 54 #include "intel_panel.h"

+1 -1

drivers/gpu/drm/i915/display/intel_acpi.c

reviewed

··· 11 11 12 12 #include <drm/drm_print.h> 13 13 14 14 - #include "i915_utils.h" 15 14 #include "intel_acpi.h" 16 15 #include "intel_display_core.h" 17 16 #include "intel_display_types.h" 17 17 + #include "intel_display_utils.h" 18 18 19 19 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */ 20 20 #define INTEL_DSM_FN_PLATFORM_MUX_INFO 1 /* No args */

+1 -1

drivers/gpu/drm/i915/display/intel_bios.c

reviewed

··· 36 36 #include "soc/intel_rom.h" 37 37 38 38 #include "i915_drv.h" 39 39 - #include "i915_utils.h" 40 39 #include "intel_display.h" 41 40 #include "intel_display_core.h" 42 41 #include "intel_display_rpm.h" 43 42 #include "intel_display_types.h" 43 43 + #include "intel_display_utils.h" 44 44 #include "intel_gmbus.h" 45 45 46 46 #define _INTEL_BIOS_PRIVATE

-1

drivers/gpu/drm/i915/display/intel_bw.c

reviewed

··· 7 7 8 8 #include "i915_drv.h" 9 9 #include "i915_reg.h" 10 10 - #include "i915_utils.h" 11 10 #include "intel_bw.h" 12 11 #include "intel_crtc.h" 13 12 #include "intel_display_core.h"

+1 -1

drivers/gpu/drm/i915/display/intel_cdclk.c

reviewed

··· 32 32 #include "hsw_ips.h" 33 33 #include "i915_drv.h" 34 34 #include "i915_reg.h" 35 35 - #include "i915_utils.h" 36 35 #include "intel_atomic.h" 37 36 #include "intel_audio.h" 38 37 #include "intel_cdclk.h" ··· 40 41 #include "intel_de.h" 41 42 #include "intel_display_regs.h" 42 43 #include "intel_display_types.h" 44 44 + #include "intel_display_utils.h" 43 45 #include "intel_mchbar_regs.h" 44 46 #include "intel_pci_config.h" 45 47 #include "intel_pcode.h"

+1 -1

drivers/gpu/drm/i915/display/intel_color.c

reviewed

··· 24 24 25 25 #include <drm/drm_print.h> 26 26 27 27 - #include "i915_utils.h" 28 27 #include "i9xx_plane_regs.h" 29 28 #include "intel_color.h" 30 29 #include "intel_color_regs.h" 31 30 #include "intel_de.h" 32 31 #include "intel_display_types.h" 32 32 + #include "intel_display_utils.h" 33 33 #include "intel_dsb.h" 34 34 #include "intel_vrr.h" 35 35

+1 -1

drivers/gpu/drm/i915/display/intel_combo_phy.c

reviewed

··· 5 5 6 6 #include <drm/drm_print.h> 7 7 8 8 - #include "i915_utils.h" 9 8 #include "intel_combo_phy.h" 10 9 #include "intel_combo_phy_regs.h" 11 10 #include "intel_de.h" 12 11 #include "intel_display_regs.h" 13 12 #include "intel_display_types.h" 13 13 + #include "intel_display_utils.h" 14 14 15 15 #define for_each_combo_phy(__display, __phy) \ 16 16 for ((__phy) = PHY_A; (__phy) < I915_MAX_PHYS; (__phy)++) \

+1 -1

drivers/gpu/drm/i915/display/intel_connector.c

reviewed

··· 31 31 #include <drm/drm_probe_helper.h> 32 32 33 33 #include "i915_drv.h" 34 34 - #include "i915_utils.h" 34 34 + #include "i915_utils.h" /* for i915_inject_probe_failure() */ 35 35 #include "intel_connector.h" 36 36 #include "intel_display_core.h" 37 37 #include "intel_display_debugfs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_cursor.c

reviewed

··· 12 12 #include <drm/drm_print.h> 13 13 #include <drm/drm_vblank.h> 14 14 15 15 - #include "i915_utils.h" 16 15 #include "intel_atomic.h" 17 16 #include "intel_cursor.h" 18 17 #include "intel_cursor_regs.h" 19 18 #include "intel_de.h" 20 19 #include "intel_display.h" 21 20 #include "intel_display_types.h" 21 21 + #include "intel_display_utils.h" 22 22 #include "intel_fb.h" 23 23 #include "intel_fb_pin.h" 24 24 #include "intel_frontbuffer.h"

+1 -1

drivers/gpu/drm/i915/display/intel_cx0_phy.c

reviewed

··· 8 8 9 9 #include <drm/drm_print.h> 10 10 11 11 - #include "i915_utils.h" 12 11 #include "intel_alpm.h" 13 12 #include "intel_cx0_phy.h" 14 13 #include "intel_cx0_phy_regs.h" ··· 15 16 #include "intel_ddi_buf_trans.h" 16 17 #include "intel_de.h" 17 18 #include "intel_display_types.h" 19 19 + #include "intel_display_utils.h" 18 20 #include "intel_dp.h" 19 21 #include "intel_hdmi.h" 20 22 #include "intel_panel.h"

-1

drivers/gpu/drm/i915/display/intel_ddi.c

reviewed

··· 35 35 #include <drm/drm_privacy_screen_consumer.h> 36 36 37 37 #include "i915_reg.h" 38 38 - #include "i915_utils.h" 39 38 #include "icl_dsi.h" 40 39 #include "intel_alpm.h" 41 40 #include "intel_audio.h"

+1 -1

drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c

reviewed

··· 3 3 * Copyright © 2020 Intel Corporation 4 4 */ 5 5 6 6 - #include "i915_utils.h" 7 6 #include "intel_cx0_phy.h" 8 7 #include "intel_ddi.h" 9 8 #include "intel_ddi_buf_trans.h" 10 9 #include "intel_de.h" 11 10 #include "intel_display_types.h" 11 11 + #include "intel_display_utils.h" 12 12 #include "intel_dp.h" 13 13 14 14 /* HDMI/DVI modes ignore everything but the last 2 items. So we share

-1

drivers/gpu/drm/i915/display/intel_display.c

reviewed

··· 51 51 #include "i915_config.h" 52 52 #include "i915_drv.h" 53 53 #include "i915_reg.h" 54 54 - #include "i915_utils.h" 55 54 #include "i9xx_plane.h" 56 55 #include "i9xx_plane_regs.h" 57 56 #include "i9xx_wm.h"

+2 -1

drivers/gpu/drm/i915/display/intel_display_driver.c

reviewed

··· 18 18 #include <drm/drm_vblank.h> 19 19 20 20 #include "i915_drv.h" 21 21 - #include "i915_utils.h" 21 21 + #include "i915_utils.h" /* for i915_inject_probe_failure() */ 22 22 #include "i9xx_wm.h" 23 23 #include "intel_acpi.h" 24 24 #include "intel_atomic.h" ··· 35 35 #include "intel_display_irq.h" 36 36 #include "intel_display_power.h" 37 37 #include "intel_display_types.h" 38 38 + #include "intel_display_utils.h" 38 39 #include "intel_display_wa.h" 39 40 #include "intel_dkl_phy.h" 40 41 #include "intel_dmc.h"

+1 -1

drivers/gpu/drm/i915/display/intel_display_power.c

reviewed

··· 11 11 #include "i915_drv.h" 12 12 #include "i915_irq.h" 13 13 #include "i915_reg.h" 14 14 - #include "i915_utils.h" 15 14 #include "intel_backlight_regs.h" 16 15 #include "intel_cdclk.h" 17 16 #include "intel_clock_gating.h" ··· 22 23 #include "intel_display_regs.h" 23 24 #include "intel_display_rpm.h" 24 25 #include "intel_display_types.h" 26 26 + #include "intel_display_utils.h" 25 27 #include "intel_dmc.h" 26 28 #include "intel_mchbar_regs.h" 27 29 #include "intel_pch_refclk.h"

+14

drivers/gpu/drm/i915/display/intel_display_utils.h

reviewed

··· 4 4 #ifndef __INTEL_DISPLAY_UTILS__ 5 5 #define __INTEL_DISPLAY_UTILS__ 6 6 7 7 + #include <linux/bug.h> 7 8 #include <linux/types.h> 8 9 9 10 struct intel_display; 11 11 + 12 12 + #ifndef MISSING_CASE 13 13 + #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \ 14 14 + __stringify(x), (long)(x)) 15 15 + #endif 16 16 + 17 17 + #ifndef fetch_and_zero 18 18 + #define fetch_and_zero(ptr) ({ \ 19 19 + typeof(*ptr) __T = *(ptr); \ 20 20 + *(ptr) = (typeof(*ptr))0; \ 21 21 + __T; \ 22 22 + }) 23 23 + #endif 10 24 11 25 #define KHz(x) (1000 * (x)) 12 26 #define MHz(x) KHz(1000 * (x))

+1 -1

drivers/gpu/drm/i915/display/intel_dmc.c

reviewed

··· 30 30 #include <drm/drm_print.h> 31 31 32 32 #include "i915_reg.h" 33 33 - #include "i915_utils.h" 34 33 #include "intel_crtc.h" 35 34 #include "intel_de.h" 36 35 #include "intel_display_power_well.h" 37 36 #include "intel_display_regs.h" 38 37 #include "intel_display_rpm.h" 39 38 #include "intel_display_types.h" 39 39 + #include "intel_display_utils.h" 40 40 #include "intel_dmc.h" 41 41 #include "intel_dmc_regs.h" 42 42 #include "intel_flipq.h"

+1 -1

drivers/gpu/drm/i915/display/intel_dp.c

reviewed

··· 51 51 #include <drm/drm_probe_helper.h> 52 52 53 53 #include "g4x_dp.h" 54 54 - #include "i915_utils.h" 55 54 #include "intel_alpm.h" 56 55 #include "intel_atomic.h" 57 56 #include "intel_audio.h" ··· 64 65 #include "intel_de.h" 65 66 #include "intel_display_driver.h" 66 67 #include "intel_display_jiffies.h" 68 68 + #include "intel_display_utils.h" 67 69 #include "intel_display_regs.h" 68 70 #include "intel_display_rpm.h" 69 71 #include "intel_display_types.h"

+1 -1

drivers/gpu/drm/i915/display/intel_dp_aux.c

reviewed

··· 5 5 6 6 #include <drm/drm_print.h> 7 7 8 8 - #include "i915_utils.h" 9 8 #include "intel_de.h" 10 9 #include "intel_display_types.h" 10 10 + #include "intel_display_utils.h" 11 11 #include "intel_dp.h" 12 12 #include "intel_dp_aux.h" 13 13 #include "intel_dp_aux_regs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_dp_link_training.c

reviewed

··· 27 27 #include <drm/display/drm_dp_helper.h> 28 28 #include <drm/drm_print.h> 29 29 30 30 - #include "i915_utils.h" 31 30 #include "intel_display_core.h" 32 31 #include "intel_display_jiffies.h" 33 32 #include "intel_display_types.h" 33 33 + #include "intel_display_utils.h" 34 34 #include "intel_dp.h" 35 35 #include "intel_dp_link_training.h" 36 36 #include "intel_encoder.h"

+1 -1

drivers/gpu/drm/i915/display/intel_dpio_phy.c

reviewed

··· 24 24 #include <drm/drm_print.h> 25 25 26 26 #include "bxt_dpio_phy_regs.h" 27 27 - #include "i915_utils.h" 28 27 #include "intel_ddi.h" 29 28 #include "intel_ddi_buf_trans.h" 30 29 #include "intel_de.h" 31 30 #include "intel_display_power_well.h" 32 31 #include "intel_display_regs.h" 33 32 #include "intel_display_types.h" 33 33 + #include "intel_display_utils.h" 34 34 #include "intel_dp.h" 35 35 #include "intel_dpio_phy.h" 36 36 #include "vlv_dpio_phy_regs.h"

-1

drivers/gpu/drm/i915/display/intel_dpll_mgr.c

reviewed

··· 27 27 #include <drm/drm_print.h> 28 28 29 29 #include "bxt_dpio_phy_regs.h" 30 30 - #include "i915_utils.h" 31 30 #include "intel_cx0_phy.h" 32 31 #include "intel_de.h" 33 32 #include "intel_display_regs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_dsi_vbt.c

reviewed

··· 38 38 #include <drm/drm_print.h> 39 39 #include <video/mipi_display.h> 40 40 41 41 - #include "i915_utils.h" 42 41 #include "intel_de.h" 43 42 #include "intel_display_regs.h" 44 43 #include "intel_display_types.h" 44 44 + #include "intel_display_utils.h" 45 45 #include "intel_dsi.h" 46 46 #include "intel_dsi_vbt.h" 47 47 #include "intel_gmbus_regs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_dvo.c

reviewed

··· 34 34 #include <drm/drm_print.h> 35 35 #include <drm/drm_probe_helper.h> 36 36 37 37 - #include "i915_utils.h" 38 37 #include "intel_connector.h" 39 38 #include "intel_de.h" 40 39 #include "intel_display_driver.h" 41 40 #include "intel_display_regs.h" 42 41 #include "intel_display_types.h" 42 42 + #include "intel_display_utils.h" 43 43 #include "intel_dvo.h" 44 44 #include "intel_dvo_dev.h" 45 45 #include "intel_dvo_regs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_fb.c

reviewed

··· 10 10 #include <drm/drm_gem.h> 11 11 #include <drm/drm_modeset_helper.h> 12 12 13 13 - #include "i915_utils.h" 14 13 #include "intel_bo.h" 15 14 #include "intel_display.h" 16 15 #include "intel_display_core.h" 17 16 #include "intel_display_types.h" 17 17 + #include "intel_display_utils.h" 18 18 #include "intel_dpt.h" 19 19 #include "intel_fb.h" 20 20 #include "intel_fb_bo.h"

-1

drivers/gpu/drm/i915/display/intel_fbc.c

reviewed

··· 49 49 #include "gt/intel_gt_types.h" 50 50 51 51 #include "i915_drv.h" 52 52 - #include "i915_utils.h" 53 52 #include "i915_vgpu.h" 54 53 #include "i915_vma.h" 55 54 #include "i9xx_plane_regs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_fdi.c

reviewed

··· 9 9 #include <drm/drm_print.h> 10 10 11 11 #include "i915_reg.h" 12 12 - #include "i915_utils.h" 13 12 #include "intel_atomic.h" 14 13 #include "intel_crtc.h" 15 14 #include "intel_ddi.h" 16 15 #include "intel_de.h" 17 16 #include "intel_display_regs.h" 18 17 #include "intel_display_types.h" 18 18 + #include "intel_display_utils.h" 19 19 #include "intel_dp.h" 20 20 #include "intel_fdi.h" 21 21 #include "intel_fdi_regs.h"

+3 -3

drivers/gpu/drm/i915/display/intel_flipq.c

reviewed

··· 7 7 8 8 #include <drm/drm_print.h> 9 9 10 10 - #include "i915_utils.h" 11 11 - #include "intel_step.h" 12 10 #include "intel_crtc.h" 13 11 #include "intel_de.h" 14 12 #include "intel_display_core.h" 15 13 #include "intel_display_types.h" 16 16 - #include "intel_flipq.h" 14 14 + #include "intel_display_utils.h" 17 15 #include "intel_dmc.h" 18 16 #include "intel_dmc_regs.h" 19 17 #include "intel_dsb.h" 18 18 + #include "intel_flipq.h" 19 19 + #include "intel_step.h" 20 20 #include "intel_vblank.h" 21 21 #include "intel_vrr.h" 22 22

-1

drivers/gpu/drm/i915/display/intel_hdcp.c

reviewed

··· 19 19 #include <drm/intel/i915_component.h> 20 20 21 21 #include "i915_reg.h" 22 22 - #include "i915_utils.h" 23 22 #include "intel_connector.h" 24 23 #include "intel_de.h" 25 24 #include "intel_display_jiffies.h"

-1

drivers/gpu/drm/i915/display/intel_hdcp_gsc.c

reviewed

··· 9 9 #include "gt/intel_gt.h" 10 10 #include "gt/uc/intel_gsc_uc_heci_cmd_submit.h" 11 11 #include "i915_drv.h" 12 12 - #include "i915_utils.h" 13 12 #include "intel_hdcp_gsc.h" 14 13 15 14 struct intel_hdcp_gsc_context {

+1 -1

drivers/gpu/drm/i915/display/intel_hdmi.c

reviewed

··· 45 45 #include <media/cec-notifier.h> 46 46 47 47 #include "g4x_hdmi.h" 48 48 - #include "i915_utils.h" 49 48 #include "intel_atomic.h" 50 49 #include "intel_audio.h" 51 50 #include "intel_connector.h" ··· 54 55 #include "intel_display_driver.h" 55 56 #include "intel_display_regs.h" 56 57 #include "intel_display_types.h" 58 58 + #include "intel_display_utils.h" 57 59 #include "intel_dp.h" 58 60 #include "intel_gmbus.h" 59 61 #include "intel_hdcp.h"

+2 -2

drivers/gpu/drm/i915/display/intel_hotplug.c

reviewed

··· 28 28 29 29 #include "i915_drv.h" 30 30 #include "i915_irq.h" 31 31 - #include "i915_utils.h" 32 31 #include "intel_connector.h" 33 33 - #include "intel_display_power.h" 34 32 #include "intel_display_core.h" 33 33 + #include "intel_display_power.h" 35 34 #include "intel_display_rpm.h" 36 35 #include "intel_display_types.h" 36 36 + #include "intel_display_utils.h" 37 37 #include "intel_dp.h" 38 38 #include "intel_hdcp.h" 39 39 #include "intel_hotplug.h"

+1 -1

drivers/gpu/drm/i915/display/intel_hotplug_irq.c

reviewed

··· 6 6 #include <drm/drm_print.h> 7 7 8 8 #include "i915_reg.h" 9 9 - #include "i915_utils.h" 10 9 #include "intel_de.h" 11 10 #include "intel_display_irq.h" 12 11 #include "intel_display_regs.h" 13 12 #include "intel_display_types.h" 13 13 + #include "intel_display_utils.h" 14 14 #include "intel_dp_aux.h" 15 15 #include "intel_gmbus.h" 16 16 #include "intel_hotplug.h"

+1 -1

drivers/gpu/drm/i915/display/intel_lspcon.c

reviewed

··· 31 31 #include <drm/drm_edid.h> 32 32 #include <drm/drm_print.h> 33 33 34 34 - #include "i915_utils.h" 35 34 #include "intel_de.h" 36 35 #include "intel_display_regs.h" 37 36 #include "intel_display_types.h" 37 37 + #include "intel_display_utils.h" 38 38 #include "intel_dp.h" 39 39 #include "intel_hdmi.h" 40 40 #include "intel_lspcon.h"

+1 -1

drivers/gpu/drm/i915/display/intel_pch_refclk.c

reviewed

··· 6 6 #include <drm/drm_print.h> 7 7 8 8 #include "i915_reg.h" 9 9 - #include "i915_utils.h" 10 9 #include "intel_de.h" 11 10 #include "intel_display_regs.h" 12 11 #include "intel_display_types.h" 12 12 + #include "intel_display_utils.h" 13 13 #include "intel_panel.h" 14 14 #include "intel_pch_refclk.h" 15 15 #include "intel_sbi.h"

+1 -1

drivers/gpu/drm/i915/display/intel_pfit.c

reviewed

··· 5 5 6 6 #include <drm/drm_print.h> 7 7 8 8 - #include "i915_utils.h" 9 8 #include "intel_de.h" 10 9 #include "intel_display_core.h" 11 10 #include "intel_display_driver.h" 12 11 #include "intel_display_regs.h" 13 12 #include "intel_display_types.h" 13 13 + #include "intel_display_utils.h" 14 14 #include "intel_lvds_regs.h" 15 15 #include "intel_pfit.h" 16 16 #include "intel_pfit_regs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_pmdemand.c

reviewed

··· 7 7 8 8 #include <drm/drm_print.h> 9 9 10 10 - #include "i915_utils.h" 11 10 #include "intel_atomic.h" 12 11 #include "intel_bw.h" 13 12 #include "intel_cdclk.h" ··· 14 15 #include "intel_display_jiffies.h" 15 16 #include "intel_display_regs.h" 16 17 #include "intel_display_trace.h" 18 18 + #include "intel_display_utils.h" 17 19 #include "intel_pmdemand.h" 18 20 #include "intel_step.h" 19 21 #include "skl_watermark.h"

+1 -1

drivers/gpu/drm/i915/display/intel_pps.c

reviewed

··· 10 10 11 11 #include "g4x_dp.h" 12 12 #include "i915_reg.h" 13 13 - #include "i915_utils.h" 14 13 #include "intel_de.h" 15 14 #include "intel_display_jiffies.h" 16 15 #include "intel_display_power_well.h" 17 16 #include "intel_display_regs.h" 18 17 #include "intel_display_types.h" 18 18 + #include "intel_display_utils.h" 19 19 #include "intel_dp.h" 20 20 #include "intel_dpio_phy.h" 21 21 #include "intel_dpll.h"

+1 -1

drivers/gpu/drm/i915/display/intel_psr.c

reviewed

··· 29 29 #include <drm/drm_vblank.h> 30 30 31 31 #include "i915_reg.h" 32 32 - #include "i915_utils.h" 33 32 #include "intel_alpm.h" 34 33 #include "intel_atomic.h" 35 34 #include "intel_crtc.h" ··· 39 40 #include "intel_display_regs.h" 40 41 #include "intel_display_rpm.h" 41 42 #include "intel_display_types.h" 43 43 + #include "intel_display_utils.h" 42 44 #include "intel_dmc.h" 43 45 #include "intel_dp.h" 44 46 #include "intel_dp_aux.h"

+1 -1

drivers/gpu/drm/i915/display/intel_qp_tables.c

reviewed

··· 5 5 6 6 #include <drm/display/drm_dsc.h> 7 7 8 8 - #include "i915_utils.h" 8 8 + #include "intel_display_utils.h" 9 9 #include "intel_qp_tables.h" 10 10 11 11 /* from BPP 6 to 24 in steps of 0.5 */

+1 -1

drivers/gpu/drm/i915/display/intel_snps_phy.c

reviewed

··· 7 7 8 8 #include <drm/drm_print.h> 9 9 10 10 - #include "i915_utils.h" 11 10 #include "intel_ddi.h" 12 11 #include "intel_ddi_buf_trans.h" 13 12 #include "intel_de.h" 14 13 #include "intel_display_regs.h" 15 14 #include "intel_display_types.h" 15 15 + #include "intel_display_utils.h" 16 16 #include "intel_snps_hdmi_pll.h" 17 17 #include "intel_snps_phy.h" 18 18 #include "intel_snps_phy_regs.h"

+1 -1

drivers/gpu/drm/i915/display/intel_sprite.c

reviewed

··· 39 39 #include <drm/drm_print.h> 40 40 #include <drm/drm_rect.h> 41 41 42 42 - #include "i915_utils.h" 43 42 #include "i9xx_plane.h" 44 43 #include "intel_de.h" 45 44 #include "intel_display_types.h" 45 45 + #include "intel_display_utils.h" 46 46 #include "intel_fb.h" 47 47 #include "intel_frontbuffer.h" 48 48 #include "intel_plane.h"

+1 -1

drivers/gpu/drm/i915/display/intel_tc.c

reviewed

··· 8 8 #include <drm/drm_print.h> 9 9 10 10 #include "i915_reg.h" 11 11 - #include "i915_utils.h" 12 11 #include "intel_atomic.h" 13 12 #include "intel_cx0_phy_regs.h" 14 13 #include "intel_ddi.h" ··· 17 18 #include "intel_display_power_map.h" 18 19 #include "intel_display_regs.h" 19 20 #include "intel_display_types.h" 21 21 + #include "intel_display_utils.h" 20 22 #include "intel_dkl_phy_regs.h" 21 23 #include "intel_dp.h" 22 24 #include "intel_dp_mst.h"

+1 -1

drivers/gpu/drm/i915/display/intel_vblank.c

reviewed

··· 8 8 #include <drm/drm_vblank.h> 9 9 10 10 #include "i915_drv.h" 11 11 - #include "i915_utils.h" 12 11 #include "intel_color.h" 13 12 #include "intel_crtc.h" 14 13 #include "intel_de.h" 15 14 #include "intel_display_jiffies.h" 16 15 #include "intel_display_regs.h" 17 16 #include "intel_display_types.h" 17 17 + #include "intel_display_utils.h" 18 18 #include "intel_vblank.h" 19 19 #include "intel_vrr.h" 20 20

+1 -1

drivers/gpu/drm/i915/display/intel_vdsc.c

reviewed

··· 11 11 #include <drm/drm_fixed.h> 12 12 #include <drm/drm_print.h> 13 13 14 14 - #include "i915_utils.h" 15 14 #include "intel_crtc.h" 16 15 #include "intel_de.h" 17 16 #include "intel_display_types.h" 17 17 + #include "intel_display_utils.h" 18 18 #include "intel_dp.h" 19 19 #include "intel_dsi.h" 20 20 #include "intel_qp_tables.h"

+1 -1

drivers/gpu/drm/i915/display/skl_scaler.c

reviewed

··· 5 5 6 6 #include <drm/drm_print.h> 7 7 8 8 - #include "i915_utils.h" 9 8 #include "intel_casf.h" 10 9 #include "intel_casf_regs.h" 11 10 #include "intel_de.h" 12 11 #include "intel_display_regs.h" 13 12 #include "intel_display_trace.h" 14 13 #include "intel_display_types.h" 14 14 + #include "intel_display_utils.h" 15 15 #include "intel_display_wa.h" 16 16 #include "intel_fb.h" 17 17 #include "skl_scaler.h"

+1 -1

drivers/gpu/drm/i915/display/skl_universal_plane.c

reviewed

··· 10 10 #include <drm/drm_print.h> 11 11 12 12 #include "pxp/intel_pxp.h" 13 13 - #include "i915_utils.h" 14 13 #include "intel_bo.h" 15 14 #include "intel_de.h" 16 15 #include "intel_display_irq.h" 17 16 #include "intel_display_regs.h" 18 17 #include "intel_display_types.h" 18 18 + #include "intel_display_utils.h" 19 19 #include "intel_dpt.h" 20 20 #include "intel_fb.h" 21 21 #include "intel_fbc.h"

+1 -1

drivers/gpu/drm/i915/display/skl_watermark.c

reviewed

··· 10 10 11 11 #include "soc/intel_dram.h" 12 12 #include "i915_reg.h" 13 13 - #include "i915_utils.h" 14 13 #include "i9xx_wm.h" 15 14 #include "intel_atomic.h" 16 15 #include "intel_bw.h" ··· 22 23 #include "intel_display_regs.h" 23 24 #include "intel_display_rpm.h" 24 25 #include "intel_display_types.h" 26 26 + #include "intel_display_utils.h" 25 27 #include "intel_fb.h" 26 28 #include "intel_fixed.h" 27 29 #include "intel_flipq.h"

+1 -1

drivers/gpu/drm/i915/display/vlv_dsi.c

reviewed

··· 34 34 #include <drm/drm_probe_helper.h> 35 35 36 36 #include "i915_reg.h" 37 37 - #include "i915_utils.h" 38 37 #include "intel_atomic.h" 39 38 #include "intel_backlight.h" 40 39 #include "intel_connector.h" ··· 41 42 #include "intel_de.h" 42 43 #include "intel_display_regs.h" 43 44 #include "intel_display_types.h" 45 45 + #include "intel_display_utils.h" 44 46 #include "intel_dsi.h" 45 47 #include "intel_dsi_vbt.h" 46 48 #include "intel_fifo_underrun.h"

drivers/gpu/drm/i915/i915_utils.h

reviewed

··· 38 38 39 39 struct drm_i915_private; 40 40 41 41 + #ifndef MISSING_CASE 41 42 #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \ 42 43 __stringify(x), (long)(x)) 44 44 + #endif 43 45 44 46 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG) 45 47 ··· 67 65 drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \ 68 66 }) 69 67 68 68 + #ifndef fetch_and_zero 70 69 #define fetch_and_zero(ptr) ({ \ 71 70 typeof(*ptr) __T = *(ptr); \ 72 71 *(ptr) = (typeof(*ptr))0; \ 73 72 __T; \ 74 73 }) 74 74 + #endif 75 75 76 76 /* 77 77 * check_user_mbz: Check that a user value exists and is zero