Commit 330c1b31 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/tasklet: separate local hacks around struct tasklet_struct 



Add a dedicated file for the local functions around struct
tasklet_struct. Far from ideal, but better placed in a dedicated file
than i915_gem.h.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220607094207.536699-1-jani.nikula@intel.com
parent 1d742694

drivers/gpu/drm/i915/TODO.txt

+1 −1
Original line number Diff line number Diff line
@@ -37,5 +37,5 @@ Smaller things: 


  https://lore.kernel.org/linux-mm/20210301083320.943079-1-hch@lst.de/



- tasklet helpers in i915_gem.h also look a bit misplaced and should

- tasklet helpers in i915_tasklet.h also look a bit misplaced and should

  probably be moved to tasklet headers.

drivers/gpu/drm/i915/i915_gem.h

+0 −33
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#define __I915_GEM_H__



#include <linux/bug.h>

#include <linux/interrupt.h>



#include <drm/drm_drv.h>
@@ -85,36 +84,4 @@ struct drm_i915_private; 


#define I915_GEM_IDLE_TIMEOUT (HZ / 5)



static inline void tasklet_lock(struct tasklet_struct *t)

{

	while (!tasklet_trylock(t))

		cpu_relax();

}



static inline bool tasklet_is_locked(const struct tasklet_struct *t)

{

	return test_bit(TASKLET_STATE_RUN, &t->state);

}



static inline void __tasklet_disable_sync_once(struct tasklet_struct *t)

{

	if (!atomic_fetch_inc(&t->count))

		tasklet_unlock_spin_wait(t);

}



static inline bool __tasklet_is_enabled(const struct tasklet_struct *t)

{

	return !atomic_read(&t->count);

}



static inline bool __tasklet_enable(struct tasklet_struct *t)

{

	return atomic_dec_and_test(&t->count);

}



static inline bool __tasklet_is_scheduled(struct tasklet_struct *t)

{

	return test_bit(TASKLET_STATE_SCHED, &t->state);

}



#endif /* __I915_GEM_H__ */

drivers/gpu/drm/i915/i915_scheduler.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/kernel.h>



#include "i915_scheduler_types.h"

#include "i915_tasklet.h"



struct drm_printer;

drivers/gpu/drm/i915/i915_tasklet.h

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

/*

 * Copyright © 2022 Intel Corporation

 */



#ifndef __I915_TASKLET_H__

#define __I915_TASKLET_H__



#include <linux/interrupt.h>



static inline void tasklet_lock(struct tasklet_struct *t)

{

	while (!tasklet_trylock(t))

		cpu_relax();

}



static inline bool tasklet_is_locked(const struct tasklet_struct *t)

{

	return test_bit(TASKLET_STATE_RUN, &t->state);

}



static inline void __tasklet_disable_sync_once(struct tasklet_struct *t)

{

	if (!atomic_fetch_inc(&t->count))

		tasklet_unlock_spin_wait(t);

}



static inline bool __tasklet_is_enabled(const struct tasklet_struct *t)

{

	return !atomic_read(&t->count);

}



static inline bool __tasklet_enable(struct tasklet_struct *t)

{

	return atomic_dec_and_test(&t->count);

}



static inline bool __tasklet_is_scheduled(struct tasklet_struct *t)

{

	return test_bit(TASKLET_STATE_SCHED, &t->state);

}



#endif /* __I915_TASKLET_H__ */