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

drm/i915: add i915_config.h and move relevant declarations there 



We already have i915_config.c. Add the i915_config.h counterpart, and
declutter i915_drv.h in the process.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230118131538.3558599-1-jani.nikula@intel.com
parent 24d97468

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

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


#include "gt/intel_rps.h"



#include "i915_config.h"

#include "intel_atomic_plane.h"

#include "intel_cdclk.h"

#include "intel_display_trace.h"

drivers/gpu/drm/i915/gem/i915_gem_clflush.c

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


#include "display/intel_frontbuffer.h"



#include "i915_config.h"

#include "i915_drv.h"

#include "i915_gem_clflush.h"

#include "i915_sw_fence_work.h"

drivers/gpu/drm/i915/i915_config.c

+4 −1
Original line number Diff line number Diff line
@@ -3,7 +3,10 @@ 
 * Copyright © 2020 Intel Corporation

 */



#include "i915_drv.h"

#include <linux/kernel.h>



#include "i915_config.h"

#include "i915_utils.h"



unsigned long

i915_fence_context_timeout(const struct drm_i915_private *i915, u64 context)

drivers/gpu/drm/i915/i915_config.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2023 Intel Corporation

 */



#ifndef __I915_CONFIG_H__

#define __I915_CONFIG_H__



#include <linux/types.h>

#include <linux/limits.h>



struct drm_i915_private;



unsigned long i915_fence_context_timeout(const struct drm_i915_private *i915,

					 u64 context);



static inline unsigned long

i915_fence_timeout(const struct drm_i915_private *i915)

{

	return i915_fence_context_timeout(i915, U64_MAX);

}



#endif /* __I915_CONFIG_H__ */

drivers/gpu/drm/i915/i915_drv.h

+0 −9
Original line number Diff line number Diff line
@@ -195,15 +195,6 @@ struct i915_gem_mm { 


#define I915_IDLE_ENGINES_TIMEOUT (200) /* in ms */



unsigned long i915_fence_context_timeout(const struct drm_i915_private *i915,

					 u64 context);



static inline unsigned long

i915_fence_timeout(const struct drm_i915_private *i915)

{

	return i915_fence_context_timeout(i915, U64_MAX);

}



#define HAS_HW_SAGV_WM(i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915))



struct i915_virtual_gpu {