Commit e1ef734e authored by Jani Nikula's avatar Jani Nikula

drm/i915: make intel_frontbuffer.h self-contained

This will be helpful in the follow-up work. No functional changes.
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9a19d43987006e4249b335f3d843da43c998376c.1554461791.git.jani.nikula@intel.com
parent 49965350
...@@ -10,6 +10,7 @@ header_test := \ ...@@ -10,6 +10,7 @@ header_test := \
i915_timeline_types.h \ i915_timeline_types.h \
intel_context_types.h \ intel_context_types.h \
intel_engine_types.h \ intel_engine_types.h \
intel_frontbuffer.h \
intel_workarounds_types.h intel_workarounds_types.h
quiet_cmd_header_test = HDRTEST $@ quiet_cmd_header_test = HDRTEST $@
......
...@@ -66,13 +66,14 @@ ...@@ -66,13 +66,14 @@
#include "intel_device_info.h" #include "intel_device_info.h"
#include "intel_display.h" #include "intel_display.h"
#include "intel_dpll_mgr.h" #include "intel_dpll_mgr.h"
#include "intel_frontbuffer.h"
#include "intel_lrc.h" #include "intel_lrc.h"
#include "intel_opregion.h" #include "intel_opregion.h"
#include "intel_ringbuffer.h" #include "intel_ringbuffer.h"
#include "intel_uc.h"
#include "intel_uncore.h" #include "intel_uncore.h"
#include "intel_wopcm.h" #include "intel_wopcm.h"
#include "intel_workarounds.h" #include "intel_workarounds.h"
#include "intel_uc.h"
#include "i915_gem.h" #include "i915_gem.h"
#include "i915_gem_context.h" #include "i915_gem_context.h"
...@@ -375,14 +376,6 @@ enum i915_cache_level { ...@@ -375,14 +376,6 @@ enum i915_cache_level {
#define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */ #define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */
enum fb_op_origin {
ORIGIN_GTT,
ORIGIN_CPU,
ORIGIN_CS,
ORIGIN_FLIP,
ORIGIN_DIRTYFB,
};
struct intel_fbc { struct intel_fbc {
/* This is always the inner lock when overlapping with struct_mutex and /* This is always the inner lock when overlapping with struct_mutex and
* it's the outer lock when overlapping with stolen_lock. */ * it's the outer lock when overlapping with stolen_lock. */
......
...@@ -24,9 +24,19 @@ ...@@ -24,9 +24,19 @@
#ifndef __INTEL_FRONTBUFFER_H__ #ifndef __INTEL_FRONTBUFFER_H__
#define __INTEL_FRONTBUFFER_H__ #define __INTEL_FRONTBUFFER_H__
#include "i915_gem_object.h"
struct drm_i915_private; struct drm_i915_private;
struct drm_i915_gem_object; struct drm_i915_gem_object;
enum fb_op_origin {
ORIGIN_GTT,
ORIGIN_CPU,
ORIGIN_CS,
ORIGIN_FLIP,
ORIGIN_DIRTYFB,
};
void intel_frontbuffer_flip_prepare(struct drm_i915_private *dev_priv, void intel_frontbuffer_flip_prepare(struct drm_i915_private *dev_priv,
unsigned frontbuffer_bits); unsigned frontbuffer_bits);
void intel_frontbuffer_flip_complete(struct drm_i915_private *dev_priv, void intel_frontbuffer_flip_complete(struct drm_i915_private *dev_priv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment