drm/i915: Separate intel_frontbuffer into its own header
In view of adding inline functions into the intel_frontbuffer section, we first split the header into its own file so that we can integrate it more easily with kerneldoc. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1470324762-2545-19-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
parent
de895082f7
commit
5d723d7afd
|
@ -70,6 +70,9 @@ Frontbuffer Tracking
|
||||||
.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c
|
.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c
|
||||||
:doc: frontbuffer tracking
|
:doc: frontbuffer tracking
|
||||||
|
|
||||||
|
.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.h
|
||||||
|
:internal:
|
||||||
|
|
||||||
.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c
|
.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c
|
||||||
:internal:
|
:internal:
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include "i915_vgpu.h"
|
#include "i915_vgpu.h"
|
||||||
#include "i915_trace.h"
|
#include "i915_trace.h"
|
||||||
#include "intel_drv.h"
|
#include "intel_drv.h"
|
||||||
|
#include "intel_frontbuffer.h"
|
||||||
#include "intel_mocs.h"
|
#include "intel_mocs.h"
|
||||||
#include <linux/reservation.h>
|
#include <linux/reservation.h>
|
||||||
#include <linux/shmem_fs.h>
|
#include <linux/shmem_fs.h>
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_trace.h"
|
#include "i915_trace.h"
|
||||||
#include "intel_drv.h"
|
#include "intel_drv.h"
|
||||||
|
#include "intel_frontbuffer.h"
|
||||||
#include <linux/dma_remapping.h>
|
#include <linux/dma_remapping.h>
|
||||||
#include <linux/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <drm/drm_edid.h>
|
#include <drm/drm_edid.h>
|
||||||
#include <drm/drmP.h>
|
#include <drm/drmP.h>
|
||||||
#include "intel_drv.h"
|
#include "intel_drv.h"
|
||||||
|
#include "intel_frontbuffer.h"
|
||||||
#include <drm/i915_drm.h>
|
#include <drm/i915_drm.h>
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_gem_dmabuf.h"
|
#include "i915_gem_dmabuf.h"
|
||||||
|
|
|
@ -1135,21 +1135,10 @@ void intel_ddi_clock_get(struct intel_encoder *encoder,
|
||||||
void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state);
|
void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state);
|
||||||
uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
|
uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
|
||||||
|
|
||||||
/* intel_frontbuffer.c */
|
|
||||||
void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
|
|
||||||
enum fb_op_origin origin);
|
|
||||||
void intel_frontbuffer_flip_prepare(struct drm_device *dev,
|
|
||||||
unsigned frontbuffer_bits);
|
|
||||||
void intel_frontbuffer_flip_complete(struct drm_device *dev,
|
|
||||||
unsigned frontbuffer_bits);
|
|
||||||
void intel_frontbuffer_flip(struct drm_device *dev,
|
|
||||||
unsigned frontbuffer_bits);
|
|
||||||
unsigned int intel_fb_align_height(struct drm_device *dev,
|
unsigned int intel_fb_align_height(struct drm_device *dev,
|
||||||
unsigned int height,
|
unsigned int height,
|
||||||
uint32_t pixel_format,
|
uint32_t pixel_format,
|
||||||
uint64_t fb_format_modifier);
|
uint64_t fb_format_modifier);
|
||||||
void intel_fb_obj_flush(struct drm_i915_gem_object *obj, bool retire,
|
|
||||||
enum fb_op_origin origin);
|
|
||||||
u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv,
|
u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv,
|
||||||
uint64_t fb_modifier, uint32_t pixel_format);
|
uint64_t fb_modifier, uint32_t pixel_format);
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
#include <drm/drm_crtc.h>
|
#include <drm/drm_crtc.h>
|
||||||
#include <drm/drm_fb_helper.h>
|
#include <drm/drm_fb_helper.h>
|
||||||
#include "intel_drv.h"
|
#include "intel_drv.h"
|
||||||
|
#include "intel_frontbuffer.h"
|
||||||
#include <drm/i915_drm.h>
|
#include <drm/i915_drm.h>
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@
|
||||||
#include <drm/drmP.h>
|
#include <drm/drmP.h>
|
||||||
|
|
||||||
#include "intel_drv.h"
|
#include "intel_drv.h"
|
||||||
|
#include "intel_frontbuffer.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2014-2016 Intel Corporation
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice (including the next
|
||||||
|
* paragraph) shall be included in all copies or substantial portions of the
|
||||||
|
* Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
* IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __INTEL_FRONTBUFFER_H__
|
||||||
|
#define __INTEL_FRONTBUFFER_H__
|
||||||
|
|
||||||
|
struct drm_device;
|
||||||
|
struct drm_i915_private;
|
||||||
|
struct drm_i915_gem_object;
|
||||||
|
|
||||||
|
void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
|
||||||
|
enum fb_op_origin origin);
|
||||||
|
void intel_frontbuffer_flip_prepare(struct drm_device *dev,
|
||||||
|
unsigned frontbuffer_bits);
|
||||||
|
void intel_frontbuffer_flip_complete(struct drm_device *dev,
|
||||||
|
unsigned frontbuffer_bits);
|
||||||
|
void intel_frontbuffer_flip(struct drm_device *dev,
|
||||||
|
unsigned frontbuffer_bits);
|
||||||
|
void intel_fb_obj_flush(struct drm_i915_gem_object *obj, bool retire,
|
||||||
|
enum fb_op_origin origin);
|
||||||
|
|
||||||
|
#endif /* __INTEL_FRONTBUFFER_H__ */
|
|
@ -30,6 +30,7 @@
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_reg.h"
|
#include "i915_reg.h"
|
||||||
#include "intel_drv.h"
|
#include "intel_drv.h"
|
||||||
|
#include "intel_frontbuffer.h"
|
||||||
|
|
||||||
/* Limits for overlay size. According to intel doc, the real limits are:
|
/* Limits for overlay size. According to intel doc, the real limits are:
|
||||||
* Y width: 4095, UV width (planar): 2047, Y height: 2047,
|
* Y width: 4095, UV width (planar): 2047, Y height: 2047,
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include <drm/drm_atomic.h>
|
#include <drm/drm_atomic.h>
|
||||||
#include <drm/drm_plane_helper.h>
|
#include <drm/drm_plane_helper.h>
|
||||||
#include "intel_drv.h"
|
#include "intel_drv.h"
|
||||||
|
#include "intel_frontbuffer.h"
|
||||||
#include <drm/i915_drm.h>
|
#include <drm/i915_drm.h>
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue