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: remove unused restore_gtt_mappings optimization during suspend
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_drv.c
diff --git
a/drivers/gpu/drm/i915/i915_drv.c
b/drivers/gpu/drm/i915/i915_drv.c
index 69936322f87d59300b6b44d69ee7123f7d9ed67d..9c934bec3ef1aee1978213a8be5f758deb9b0421 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_drv.c
+++ b/
drivers/gpu/drm/i915/i915_drv.c
@@
-689,12
+689,11
@@
static int i915_drm_thaw_early(struct drm_device *dev)
return ret;
}
return ret;
}
-static int __i915_drm_thaw(struct drm_device *dev
, bool restore_gtt_mappings
)
+static int __i915_drm_thaw(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
{
struct drm_i915_private *dev_priv = dev->dev_private;
- if (drm_core_check_feature(dev, DRIVER_MODESET) &&
- restore_gtt_mappings) {
+ if (drm_core_check_feature(dev, DRIVER_MODESET)) {
mutex_lock(&dev->struct_mutex);
i915_gem_restore_gtt_mappings(dev);
mutex_unlock(&dev->struct_mutex);
mutex_lock(&dev->struct_mutex);
i915_gem_restore_gtt_mappings(dev);
mutex_unlock(&dev->struct_mutex);
@@
-761,7
+760,7
@@
static int i915_drm_thaw(struct drm_device *dev)
if (drm_core_check_feature(dev, DRIVER_MODESET))
i915_check_and_clear_faults(dev);
if (drm_core_check_feature(dev, DRIVER_MODESET))
i915_check_and_clear_faults(dev);
- return __i915_drm_thaw(dev
, true
);
+ return __i915_drm_thaw(dev);
}
static int i915_resume_early(struct drm_device *dev)
}
static int i915_resume_early(struct drm_device *dev)
@@
-785,15
+784,9
@@
static int i915_resume_early(struct drm_device *dev)
static int i915_drm_resume(struct drm_device *dev)
{
static int i915_drm_resume(struct drm_device *dev)
{
- struct drm_i915_private *dev_priv = dev->dev_private;
int ret;
int ret;
- /*
- * Platforms with opregion should have sane BIOS, older ones (gen3 and
- * earlier) need to restore the GTT mappings since the BIOS might clear
- * all our scratch PTEs.
- */
- ret = __i915_drm_thaw(dev, !dev_priv->opregion.header);
+ ret = __i915_drm_thaw(dev);
if (ret)
return ret;
if (ret)
return ret;
This page took
0.026659 seconds
and
5
git commands to generate.