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

drm/xe/compat: reduce i915_utils.[ch] 



Reduce the compat i915_utils.h to only cover the requirements of
MISSING_CASE() in soc/ and the few i915_inject_probe_failure()
instances, instead of including the entire i915_utils.h from i915. This
prevents new users for the utilities from cropping up.

With this, we can remove the xe/display/ext/i915_utils.c altogether.

Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://patch.msgid.link/c02f82e45f31caf95bd1339080b9099c3b7190be.1761146196.git.jani.nikula@intel.com


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

drivers/gpu/drm/xe/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ $(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE 
# Display code specific to xe

xe-$(CONFIG_DRM_XE_DISPLAY) += \

	display/ext/i915_irq.o \

	display/ext/i915_utils.o \

	display/intel_bo.o \

	display/intel_fb_bo.o \

	display/intel_fbdev_fb.o \

drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h

+8 −1
Original line number Diff line number Diff line
@@ -3,4 +3,11 @@ 
 * Copyright © 2023 Intel Corporation

 */



#include "../../i915/i915_utils.h"
 
/* for soc/ */

#ifndef MISSING_CASE

#define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \

			     __stringify(x), (long)(x))

#endif



/* for a couple of users under i915/display */

#define i915_inject_probe_failure(unused) ((unused) && 0)

drivers/gpu/drm/xe/display/ext/i915_utils.c

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright © 2023 Intel Corporation

 */



#include "i915_utils.h"



#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)



/* i915 specific, just put here for shutting it up */

int __i915_inject_probe_error(struct drm_i915_private *i915, int err,

			      const char *func, int line)

{

	return 0;

}



#endif