Commit 9fb73863 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Use to_i915 in intel_frontbuffer.c

Must have missed the transition.
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 20c8838b
...@@ -131,7 +131,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, ...@@ -131,7 +131,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
enum fb_op_origin origin) enum fb_op_origin origin)
{ {
struct drm_device *dev = obj->base.dev; struct drm_device *dev = obj->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = to_i915(dev);
WARN_ON(!mutex_is_locked(&dev->struct_mutex)); WARN_ON(!mutex_is_locked(&dev->struct_mutex));
...@@ -168,7 +168,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, ...@@ -168,7 +168,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
void intel_frontbuffer_flush(struct drm_device *dev, void intel_frontbuffer_flush(struct drm_device *dev,
unsigned frontbuffer_bits) unsigned frontbuffer_bits)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = to_i915(dev);
/* Delay flushing when rings are still busy.*/ /* Delay flushing when rings are still busy.*/
mutex_lock(&dev_priv->fb_tracking.lock); mutex_lock(&dev_priv->fb_tracking.lock);
...@@ -198,7 +198,7 @@ void intel_fb_obj_flush(struct drm_i915_gem_object *obj, ...@@ -198,7 +198,7 @@ void intel_fb_obj_flush(struct drm_i915_gem_object *obj,
bool retire) bool retire)
{ {
struct drm_device *dev = obj->base.dev; struct drm_device *dev = obj->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = to_i915(dev);
unsigned frontbuffer_bits; unsigned frontbuffer_bits;
WARN_ON(!mutex_is_locked(&dev->struct_mutex)); WARN_ON(!mutex_is_locked(&dev->struct_mutex));
...@@ -235,7 +235,7 @@ void intel_fb_obj_flush(struct drm_i915_gem_object *obj, ...@@ -235,7 +235,7 @@ void intel_fb_obj_flush(struct drm_i915_gem_object *obj,
void intel_frontbuffer_flip_prepare(struct drm_device *dev, void intel_frontbuffer_flip_prepare(struct drm_device *dev,
unsigned frontbuffer_bits) unsigned frontbuffer_bits)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = to_i915(dev);
mutex_lock(&dev_priv->fb_tracking.lock); mutex_lock(&dev_priv->fb_tracking.lock);
dev_priv->fb_tracking.flip_bits |= frontbuffer_bits; dev_priv->fb_tracking.flip_bits |= frontbuffer_bits;
...@@ -259,7 +259,7 @@ void intel_frontbuffer_flip_prepare(struct drm_device *dev, ...@@ -259,7 +259,7 @@ void intel_frontbuffer_flip_prepare(struct drm_device *dev,
void intel_frontbuffer_flip_complete(struct drm_device *dev, void intel_frontbuffer_flip_complete(struct drm_device *dev,
unsigned frontbuffer_bits) unsigned frontbuffer_bits)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = to_i915(dev);
mutex_lock(&dev_priv->fb_tracking.lock); mutex_lock(&dev_priv->fb_tracking.lock);
/* Mask any cancelled flips. */ /* Mask any cancelled flips. */
...@@ -285,7 +285,7 @@ void intel_frontbuffer_flip_complete(struct drm_device *dev, ...@@ -285,7 +285,7 @@ void intel_frontbuffer_flip_complete(struct drm_device *dev,
void intel_frontbuffer_flip(struct drm_device *dev, void intel_frontbuffer_flip(struct drm_device *dev,
unsigned frontbuffer_bits) unsigned frontbuffer_bits)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = to_i915(dev);
mutex_lock(&dev_priv->fb_tracking.lock); mutex_lock(&dev_priv->fb_tracking.lock);
/* Remove stale busy bits due to the old buffer. */ /* Remove stale busy bits due to the old buffer. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment