diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 418ad642c742..d1739d3bdae9 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -942,7 +942,7 @@ static void ivybridge_parity_work(struct work_struct *work) | |||
942 | parity_event[4] = kasprintf(GFP_KERNEL, "SLICE=%d", slice); | 942 | parity_event[4] = kasprintf(GFP_KERNEL, "SLICE=%d", slice); |
943 | parity_event[5] = NULL; | 943 | parity_event[5] = NULL; |
944 | 944 | ||
945 | kobject_uevent_env(&dev_priv->dev->primary->kdev.kobj, | 945 | kobject_uevent_env(&dev_priv->dev->primary->kdev->kobj, |
946 | KOBJ_CHANGE, parity_event); | 946 | KOBJ_CHANGE, parity_event); |
947 | 947 | ||
948 | DRM_DEBUG("Parity error: Slice = %d, Row = %d, Bank = %d, Sub bank = %d.\n", | 948 | DRM_DEBUG("Parity error: Slice = %d, Row = %d, Bank = %d, Sub bank = %d.\n", |
@@ -1539,7 +1539,7 @@ static void i915_error_work_func(struct work_struct *work) | |||
1539 | char *reset_done_event[] = { I915_ERROR_UEVENT "=0", NULL }; | 1539 | char *reset_done_event[] = { I915_ERROR_UEVENT "=0", NULL }; |
1540 | int ret; | 1540 | int ret; |
1541 | 1541 | ||
1542 | kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, error_event); | 1542 | kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, error_event); |
1543 | 1543 | ||
1544 | /* | 1544 | /* |
1545 | * Note that there's only one work item which does gpu resets, so we | 1545 | * Note that there's only one work item which does gpu resets, so we |
@@ -1553,7 +1553,7 @@ static void i915_error_work_func(struct work_struct *work) | |||
1553 | */ | 1553 | */ |
1554 | if (i915_reset_in_progress(error) && !i915_terminally_wedged(error)) { | 1554 | if (i915_reset_in_progress(error) && !i915_terminally_wedged(error)) { |
1555 | DRM_DEBUG_DRIVER("resetting chip\n"); | 1555 | DRM_DEBUG_DRIVER("resetting chip\n"); |
1556 | kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, | 1556 | kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, |
1557 | reset_event); | 1557 | reset_event); |
1558 | 1558 | ||
1559 | /* | 1559 | /* |
@@ -1580,7 +1580,7 @@ static void i915_error_work_func(struct work_struct *work) | |||
1580 | smp_mb__before_atomic_inc(); | 1580 | smp_mb__before_atomic_inc(); |
1581 | atomic_inc(&dev_priv->gpu_error.reset_counter); | 1581 | atomic_inc(&dev_priv->gpu_error.reset_counter); |
1582 | 1582 | ||
1583 | kobject_uevent_env(&dev->primary->kdev.kobj, | 1583 | kobject_uevent_env(&dev->primary->kdev->kobj, |
1584 | KOBJ_CHANGE, reset_done_event); | 1584 | KOBJ_CHANGE, reset_done_event); |
1585 | } else { | 1585 | } else { |
1586 | atomic_set(&error->reset_counter, I915_WEDGED); | 1586 | atomic_set(&error->reset_counter, I915_WEDGED); |