GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-05-05 06:43:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: Move intel_gt initialization to a separate file

Browse source 
As it will grow in a following patch make a new home for it.

v2:
 * Convert mock_gem_device as well. (Chris)

v3:
 * Rename to intel_gt_init_early and move call site to i915_drv.c. (Chris)

v4:
 * Adjust SPDX tags.
 * No need to gt/ path when including intel_gt_types.h. (Chris)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-3-tvrtko.ursulin@linux.intel.com
This commit is contained in:
Tvrtko Ursulin 2019-06-21 08:07:41 +01:00
parent e5be5c7a8f
commit 24635c5152
6 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/i915/Makefile
View file

@ -74,6 +74,7 @@ gt-y += \
gt/intel_context.o \ gt/intel_context.o \
gt/intel_engine_cs.o \ gt/intel_engine_cs.o \
gt/intel_engine_pm.o \ gt/intel_engine_pm.o \
gt/intel_gt.o \
gt/intel_gt_pm.o \ gt/intel_gt_pm.o \
gt/intel_hangcheck.o \ gt/intel_hangcheck.o \
gt/intel_lrc.o \ gt/intel_lrc.o \

14
drivers/gpu/drm/i915/gt/intel_gt.c Normal file
View file

@ -0,0 +1,14 @@
// SPDX-License-Identifier: MIT
/*
* Copyright © 2019 Intel Corporation
*/
#include "intel_gt.h"
void intel_gt_init_early(struct intel_gt *gt)
{
INIT_LIST_HEAD(&gt->active_rings);
INIT_LIST_HEAD(&gt->closed_vma);
spin_lock_init(&gt->closed_lock);
}

13
drivers/gpu/drm/i915/gt/intel_gt.h Normal file
View file

@ -0,0 +1,13 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2019 Intel Corporation
*/
#ifndef __INTEL_GT__
#define __INTEL_GT__
#include "intel_gt_types.h"
void intel_gt_init_early(struct intel_gt *gt);
#endif /* __INTEL_GT_H__ */

3
drivers/gpu/drm/i915/i915_drv.c
View file

@ -61,6 +61,7 @@
#include "gem/i915_gem_context.h" #include "gem/i915_gem_context.h"
#include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_ioctls.h"
#include "gt/intel_gt.h"
#include "gt/intel_gt_pm.h" #include "gt/intel_gt_pm.h"
#include "gt/intel_reset.h" #include "gt/intel_reset.h"
#include "gt/intel_workarounds.h" #include "gt/intel_workarounds.h"
@ -922,6 +923,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv)
if (ret < 0) if (ret < 0)
goto err_engines; goto err_engines;
intel_gt_init_early(&dev_priv->gt);
ret = i915_gem_init_early(dev_priv); ret = i915_gem_init_early(dev_priv);
if (ret < 0) if (ret < 0)
goto err_workqueues; goto err_workqueues;

4
drivers/gpu/drm/i915/i915_gem.c
View file

@ -1748,10 +1748,6 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv)
intel_gt_pm_init(dev_priv); intel_gt_pm_init(dev_priv);
INIT_LIST_HEAD(&dev_priv->gt.active_rings);
INIT_LIST_HEAD(&dev_priv->gt.closed_vma);
spin_lock_init(&dev_priv->gt.closed_lock);
i915_gem_init__mm(dev_priv); i915_gem_init__mm(dev_priv);
i915_gem_init__pm(dev_priv); i915_gem_init__pm(dev_priv);

6
drivers/gpu/drm/i915/selftests/mock_gem_device.c
View file

@ -25,6 +25,7 @@
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include "gt/intel_gt.h"
#include "gt/mock_engine.h" #include "gt/mock_engine.h"
#include "mock_request.h" #include "mock_request.h"
@ -179,6 +180,7 @@ struct drm_i915_private *mock_gem_device(void)
mock_uncore_init(&i915->uncore); mock_uncore_init(&i915->uncore);
i915_gem_init__mm(i915); i915_gem_init__mm(i915);
intel_gt_init_early(&i915->gt);
intel_gt_pm_init(i915); intel_gt_pm_init(i915);
atomic_inc(&i915->gt.wakeref.count); /* disable; no hw support */ atomic_inc(&i915->gt.wakeref.count); /* disable; no hw support */
@ -200,10 +202,6 @@ struct drm_i915_private *mock_gem_device(void)
i915_timelines_init(i915); i915_timelines_init(i915);
INIT_LIST_HEAD(&i915->gt.active_rings);
INIT_LIST_HEAD(&i915->gt.closed_vma);
spin_lock_init(&i915->gt.closed_lock);
mutex_lock(&i915->drm.struct_mutex); mutex_lock(&i915->drm.struct_mutex);
mock_init_ggtt(i915, &i915->ggtt); mock_init_ggtt(i915, &i915->ggtt);