Commit 8637e1c8 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Relocate VBLANK_EVASION_TIME_US 



Move the VBLANK_EVASION_TIME_US definition to a slightly
better place.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230418175528.13117-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 691248d4

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

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,16 @@ struct intel_atomic_state; 
struct intel_crtc;

struct intel_crtc_state;



/*

 * FIXME: We should instead only take spinlocks once for the entire update

 * instead of once per mmio.

 */

#if IS_ENABLED(CONFIG_PROVE_LOCKING)

#define VBLANK_EVASION_TIME_US 250

#else

#define VBLANK_EVASION_TIME_US 100

#endif



int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,

			     int usecs);

u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_state);

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

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

#include "i915_irq.h"

#include "i915_reg.h"

#include "intel_crtc.h"

#include "intel_de.h"

#include "intel_crtc_state_dump.h"

#include "intel_display_debugfs.h"
@@ -30,7 +31,6 @@ 
#include "intel_panel.h"

#include "intel_psr.h"

#include "intel_psr_regs.h"

#include "intel_sprite.h"

#include "intel_wm.h"



static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)

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

+0 −10
Original line number Diff line number Diff line
@@ -16,16 +16,6 @@ struct intel_crtc_state; 
struct intel_plane_state;

enum pipe;



/*

 * FIXME: We should instead only take spinlocks once for the entire update

 * instead of once per mmio.

 */

#if IS_ENABLED(CONFIG_PROVE_LOCKING)

#define VBLANK_EVASION_TIME_US 250

#else

#define VBLANK_EVASION_TIME_US 100

#endif



struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv,

					      enum pipe pipe, int plane);

int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data,