forked from Minki/linux
drm/i915/dsb: DSB context creation.
This patch adds a function, which will internally get the gem buffer for DSB engine. The GEM buffer is from global GTT, and is mapped into CPU domain, contains the data + opcode to be feed to DSB engine. v1: Initial version. v2: - removed some unwanted code. (Chris) - Used i915_gem_object_create_internal instead of _shmem. (Chris) - cmd_buf_tail removed and can be derived through vma object. (Chris) v3: vma realeased if i915_gem_object_pin_map() failed. (Shashank) v4: for simplification and based on current usage added single dsb object in intel_crtc. (Shashank) v5: seting NULL to cmd_buf moved outside of mutex in dsb-put(). (Shashank) v6: - refcount machanism added. - Used atomic_add_return and atomic_dec_and_test instead of atomic_inc and atomic_dec. (Jani) Cc: Imre Deak <imre.deak@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Shashank Sharma <shashank.sharma@intel.com> Signed-off-by: Animesh Manna <animesh.manna@intel.com> [Jani: added #include <linux/types.h> while pushing] Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190920115930.27829-3-animesh.manna@intel.com
This commit is contained in:
parent
18febcb74e
commit
67f3b58f3b
@ -172,6 +172,7 @@ i915-y += \
|
||||
display/intel_display_power.o \
|
||||
display/intel_dpio_phy.o \
|
||||
display/intel_dpll_mgr.o \
|
||||
display/intel_dsb.o \
|
||||
display/intel_fbc.o \
|
||||
display/intel_fifo_underrun.o \
|
||||
display/intel_frontbuffer.o \
|
||||
|
@ -1033,6 +1033,9 @@ struct intel_crtc {
|
||||
|
||||
/* scalers available on this crtc */
|
||||
int num_scalers;
|
||||
|
||||
/* per pipe DSB related info */
|
||||
struct intel_dsb dsb;
|
||||
};
|
||||
|
||||
struct intel_plane {
|
||||
|
80
drivers/gpu/drm/i915/display/intel_dsb.c
Normal file
80
drivers/gpu/drm/i915/display/intel_dsb.c
Normal file
@ -0,0 +1,80 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
/*
|
||||
* Copyright © 2019 Intel Corporation
|
||||
*
|
||||
*/
|
||||
|
||||
#include "i915_drv.h"
|
||||
#include "intel_display_types.h"
|
||||
|
||||
#define DSB_BUF_SIZE (2 * PAGE_SIZE)
|
||||
|
||||
struct intel_dsb *
|
||||
intel_dsb_get(struct intel_crtc *crtc)
|
||||
{
|
||||
struct drm_device *dev = crtc->base.dev;
|
||||
struct drm_i915_private *i915 = to_i915(dev);
|
||||
struct intel_dsb *dsb = &crtc->dsb;
|
||||
struct drm_i915_gem_object *obj;
|
||||
struct i915_vma *vma;
|
||||
intel_wakeref_t wakeref;
|
||||
|
||||
if (!HAS_DSB(i915))
|
||||
return dsb;
|
||||
|
||||
if (atomic_add_return(1, &dsb->refcount) != 1)
|
||||
return dsb;
|
||||
|
||||
dsb->id = DSB1;
|
||||
wakeref = intel_runtime_pm_get(&i915->runtime_pm);
|
||||
|
||||
obj = i915_gem_object_create_internal(i915, DSB_BUF_SIZE);
|
||||
if (IS_ERR(obj)) {
|
||||
DRM_ERROR("Gem object creation failed\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
mutex_lock(&i915->drm.struct_mutex);
|
||||
vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, PIN_MAPPABLE);
|
||||
mutex_unlock(&i915->drm.struct_mutex);
|
||||
if (IS_ERR(vma)) {
|
||||
DRM_ERROR("Vma creation failed\n");
|
||||
i915_gem_object_put(obj);
|
||||
atomic_dec(&dsb->refcount);
|
||||
goto err;
|
||||
}
|
||||
|
||||
dsb->cmd_buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC);
|
||||
if (IS_ERR(dsb->cmd_buf)) {
|
||||
DRM_ERROR("Command buffer creation failed\n");
|
||||
i915_vma_unpin_and_release(&vma, 0);
|
||||
dsb->cmd_buf = NULL;
|
||||
atomic_dec(&dsb->refcount);
|
||||
goto err;
|
||||
}
|
||||
dsb->vma = vma;
|
||||
|
||||
err:
|
||||
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
|
||||
return dsb;
|
||||
}
|
||||
|
||||
void intel_dsb_put(struct intel_dsb *dsb)
|
||||
{
|
||||
struct intel_crtc *crtc = container_of(dsb, typeof(*crtc), dsb);
|
||||
struct drm_i915_private *i915 = to_i915(crtc->base.dev);
|
||||
|
||||
if (!HAS_DSB(i915))
|
||||
return;
|
||||
|
||||
if (WARN_ON(atomic_read(&dsb->refcount) == 0))
|
||||
return;
|
||||
|
||||
if (atomic_dec_and_test(&dsb->refcount)) {
|
||||
mutex_lock(&i915->drm.struct_mutex);
|
||||
i915_gem_object_unpin_map(dsb->vma->obj);
|
||||
i915_vma_unpin_and_release(&dsb->vma, 0);
|
||||
mutex_unlock(&i915->drm.struct_mutex);
|
||||
dsb->cmd_buf = NULL;
|
||||
}
|
||||
}
|
33
drivers/gpu/drm/i915/display/intel_dsb.h
Normal file
33
drivers/gpu/drm/i915/display/intel_dsb.h
Normal file
@ -0,0 +1,33 @@
|
||||
/* SPDX-License-Identifier: MIT
|
||||
*
|
||||
* Copyright © 2019 Intel Corporation
|
||||
*/
|
||||
|
||||
#ifndef _INTEL_DSB_H
|
||||
#define _INTEL_DSB_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
struct intel_crtc;
|
||||
struct i915_vma;
|
||||
|
||||
enum dsb_id {
|
||||
INVALID_DSB = -1,
|
||||
DSB1,
|
||||
DSB2,
|
||||
DSB3,
|
||||
MAX_DSB_PER_PIPE
|
||||
};
|
||||
|
||||
struct intel_dsb {
|
||||
atomic_t refcount;
|
||||
enum dsb_id id;
|
||||
u32 *cmd_buf;
|
||||
struct i915_vma *vma;
|
||||
};
|
||||
|
||||
struct intel_dsb *
|
||||
intel_dsb_get(struct intel_crtc *crtc);
|
||||
void intel_dsb_put(struct intel_dsb *dsb);
|
||||
|
||||
#endif
|
@ -67,6 +67,7 @@
|
||||
#include "display/intel_display.h"
|
||||
#include "display/intel_display_power.h"
|
||||
#include "display/intel_dpll_mgr.h"
|
||||
#include "display/intel_dsb.h"
|
||||
#include "display/intel_frontbuffer.h"
|
||||
#include "display/intel_gmbus.h"
|
||||
#include "display/intel_opregion.h"
|
||||
|
Loading…
Reference in New Issue
Block a user