Commit b062cf54 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarLuca Coelho <luciano.coelho@intel.com>
Link:  https://patch.msgid.link/79f9e31ca64c8c045834d48e20ceb0c515d1e9e1.1761146196.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent aaccf0ba

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

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 


#include "g4x_dp.h"

#include "i915_reg.h"

#include "i915_utils.h"

#include "intel_audio.h"

#include "intel_backlight.h"

#include "intel_connector.h"
@@ -20,6 +19,7 @@ 
#include "intel_display_power.h"

#include "intel_display_regs.h"

#include "intel_display_types.h"

#include "intel_display_utils.h"

#include "intel_dp.h"

#include "intel_dp_aux.h"

#include "intel_dp_link_training.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <drm/drm_print.h>



#include "i915_reg.h"

#include "i915_utils.h"

#include "i9xx_plane.h"

#include "i9xx_plane_regs.h"

#include "intel_atomic.h"
@@ -19,6 +18,7 @@ 
#include "intel_display_irq.h"

#include "intel_display_regs.h"

#include "intel_display_types.h"

#include "intel_display_utils.h"

#include "intel_fb.h"

#include "intel_fbc.h"

#include "intel_frontbuffer.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <drm/drm_probe_helper.h>



#include "i915_reg.h"

#include "i915_utils.h"

#include "icl_dsi.h"

#include "icl_dsi_regs.h"

#include "intel_atomic.h"
@@ -48,6 +47,7 @@ 
#include "intel_ddi.h"

#include "intel_de.h"

#include "intel_display_regs.h"

#include "intel_display_utils.h"

#include "intel_dsi.h"

#include "intel_dsi_vbt.h"

#include "intel_panel.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 


#include <drm/drm_print.h>



#include "i915_utils.h"

#include "intel_acpi.h"

#include "intel_display_core.h"

#include "intel_display_types.h"

#include "intel_display_utils.h"



#define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */

#define INTEL_DSM_FN_PLATFORM_MUX_INFO 1 /* No args */

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

+1 −1
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ 
#include "soc/intel_rom.h"



#include "i915_drv.h"

#include "i915_utils.h"

#include "intel_display.h"

#include "intel_display_core.h"

#include "intel_display_rpm.h"

#include "intel_display_types.h"

#include "intel_display_utils.h"

#include "intel_gmbus.h"



#define _INTEL_BIOS_PRIVATE