Commit 00423c4a authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: split out separate files for jiffies timeout and wait helpers 



Add i915_jiffies.h and intel_display_jiffies.h for jiffies timeout and
wait helpers, and use them separately from i915 and display. This helps
reduce the display dependency on i915_utils.h.

Long term, both msecs_to_jiffies_timeout() and
wait_remaining_ms_from_jiffies() really belong in core kernel headers,
but for now unblock display refactoring.

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


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

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

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

/* Copyright © 2025 Intel Corporation */



#ifndef __INTEL_DISPLAY_JIFFIES_H__

#define __INTEL_DISPLAY_JIFFIES_H__



#include <linux/jiffies.h>



static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)

{

	unsigned long j = msecs_to_jiffies(m);



	return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1);

}



/*

 * If you need to wait X milliseconds between events A and B, but event B

 * doesn't happen exactly after event A, you record the timestamp (jiffies) of

 * when event A happened, then just before event B you call this function and

 * pass the timestamp as the first argument, and X as the second argument.

 */

static inline void

wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms)

{

	unsigned long target_jiffies, tmp_jiffies, remaining_jiffies;



	/*

	 * Don't re-read the value of "jiffies" every time since it may change

	 * behind our back and break the math.

	 */

	tmp_jiffies = jiffies;

	target_jiffies = timestamp_jiffies +

			 msecs_to_jiffies_timeout(to_wait_ms);



	if (time_after(target_jiffies, tmp_jiffies)) {

		remaining_jiffies = target_jiffies - tmp_jiffies;

		while (remaining_jiffies)

			remaining_jiffies =

			    schedule_timeout_uninterruptible(remaining_jiffies);

	}

}



#endif /* __INTEL_DISPLAY_JIFFIES_H__ */

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include "intel_ddi.h"

#include "intel_de.h"

#include "intel_display_driver.h"

#include "intel_display_jiffies.h"

#include "intel_display_regs.h"

#include "intel_display_rpm.h"

#include "intel_display_types.h"

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

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


#include "i915_utils.h"

#include "intel_display_core.h"

#include "intel_display_jiffies.h"

#include "intel_display_types.h"

#include "intel_dp.h"

#include "intel_dp_link_training.h"

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

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "i915_utils.h"

#include "intel_connector.h"

#include "intel_de.h"

#include "intel_display_jiffies.h"

#include "intel_display_power.h"

#include "intel_display_power_well.h"

#include "intel_display_regs.h"

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

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "intel_bw.h"

#include "intel_cdclk.h"

#include "intel_de.h"

#include "intel_display_jiffies.h"

#include "intel_display_regs.h"

#include "intel_display_trace.h"

#include "intel_pmdemand.h"