projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/i915: Convert dev_priv->dev backpointers to dev_priv->drm
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_shrinker.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_shrinker.c
b/drivers/gpu/drm/i915/i915_gem_shrinker.c
index 1bf14544d8add9305e0980b60ffadf7e5c7f09b3..067632ad2f293e9d8655507d3135c9557cfd6aa7 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/
drivers/gpu/drm/i915/i915_gem_shrinker.c
@@
-257,7
+257,7
@@
i915_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc)
{
struct drm_i915_private *dev_priv =
container_of(shrinker, struct drm_i915_private, mm.shrinker);
{
struct drm_i915_private *dev_priv =
container_of(shrinker, struct drm_i915_private, mm.shrinker);
- struct drm_device *dev =
dev_priv->dev
;
+ struct drm_device *dev =
&dev_priv->drm
;
struct drm_i915_gem_object *obj;
unsigned long count;
bool unlock;
struct drm_i915_gem_object *obj;
unsigned long count;
bool unlock;
@@
-288,7
+288,7
@@
i915_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)
{
struct drm_i915_private *dev_priv =
container_of(shrinker, struct drm_i915_private, mm.shrinker);
{
struct drm_i915_private *dev_priv =
container_of(shrinker, struct drm_i915_private, mm.shrinker);
- struct drm_device *dev =
dev_priv->dev
;
+ struct drm_device *dev =
&dev_priv->drm
;
unsigned long freed;
bool unlock;
unsigned long freed;
bool unlock;
@@
-323,7
+323,7
@@
i915_gem_shrinker_lock_uninterruptible(struct drm_i915_private *dev_priv,
{
unsigned long timeout = msecs_to_jiffies(timeout_ms) + 1;
{
unsigned long timeout = msecs_to_jiffies(timeout_ms) + 1;
- while (!i915_gem_shrinker_lock(
dev_priv->dev
, &slu->unlock)) {
+ while (!i915_gem_shrinker_lock(
&dev_priv->drm
, &slu->unlock)) {
schedule_timeout_killable(1);
if (fatal_signal_pending(current))
return false;
schedule_timeout_killable(1);
if (fatal_signal_pending(current))
return false;
@@
-344,7
+344,7
@@
i915_gem_shrinker_unlock_uninterruptible(struct drm_i915_private *dev_priv,
{
dev_priv->mm.interruptible = slu->was_interruptible;
if (slu->unlock)
{
dev_priv->mm.interruptible = slu->was_interruptible;
if (slu->unlock)
- mutex_unlock(&dev_priv->d
ev->
struct_mutex);
+ mutex_unlock(&dev_priv->d
rm.
struct_mutex);
}
static int
}
static int
This page took
0.026067 seconds
and
5
git commands to generate.