summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_sysfs.c
diff options
context:
space:
mode:
authorOscar Mateo2014-05-22 15:13:37 +0200
committerDaniel Vetter2014-05-22 23:41:17 +0200
commit273497e5cdacf50da8884d28cba662c332e0a09e (patch)
tree98e23e75e5777b669d02d163ba46849d7e515aa2 /drivers/gpu/drm/i915/i915_sysfs.c
parentdrm/i915: Split the ringbuffers from the rings (3/3) (diff)
downloadkernel-qcow2-linux-273497e5cdacf50da8884d28cba662c332e0a09e.tar.gz
kernel-qcow2-linux-273497e5cdacf50da8884d28cba662c332e0a09e.tar.xz
kernel-qcow2-linux-273497e5cdacf50da8884d28cba662c332e0a09e.zip
drm/i915: s/i915_hw_context/intel_context
Up until now, contexts had one (and only one) backing object that was used by the hardware to save/restore render ring contexts (via the MI_SET_CONTEXT command). Other rings did not have or need this, so our i915_hw_context struct had a 1:1 relationship with a a real HW context. With Logical Ring Contexts and Execlists, this is not possible anymore: all rings need a backing object, and it cannot be reused. To prepare for that, rename our contexts to the more generic term intel_context. No functional changes. Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_sysfs.c')
-rw-r--r--drivers/gpu/drm/i915/i915_sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 3620997e43f5..86ce39aad0ff 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -186,7 +186,7 @@ i915_l3_write(struct file *filp, struct kobject *kobj,
struct drm_minor *dminor = dev_to_drm_minor(dev);
struct drm_device *drm_dev = dminor->dev;
struct drm_i915_private *dev_priv = drm_dev->dev_private;
- struct i915_hw_context *ctx;
+ struct intel_context *ctx;
u32 *temp = NULL; /* Just here to make handling failures easy */
int slice = (int)(uintptr_t)attr->private;
int ret;