From: Daniel Vetter Date: Fri, 15 Nov 2013 09:02:39 +0000 (+0100) Subject: Merge branch 'backlight-rework' into drm-intel-next-queued X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c09cd6e9691ec6fce8cb90b65929cad389d39c84;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'backlight-rework' into drm-intel-next-queued Pull in Jani's backlight rework branch. This was merged through a separate branch to be able to sort out the Broadwell conflicts properly before pulling it into the main development branch. Conflicts: drivers/gpu/drm/i915/intel_display.c Signed-off-by: Daniel Vetter --- c09cd6e9691ec6fce8cb90b65929cad389d39c84 diff --cc drivers/gpu/drm/i915/i915_irq.c index 19949e8b36c5,5d1dedc02f15..931ee5d8cdb1 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@@ -1778,10 -1990,10 +1988,10 @@@ static void i915_error_work_func(struc smp_mb__before_atomic_inc(); atomic_inc(&dev_priv->gpu_error.reset_counter); - kobject_uevent_env(&dev->primary->kdev.kobj, + kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, reset_done_event); } else { - atomic_set(&error->reset_counter, I915_WEDGED); + atomic_set_mask(I915_WEDGED, &error->reset_counter); } /* diff --cc drivers/gpu/drm/i915/intel_display.c index 752d83019f36,b9f763c637ec..3b7f1c4eb48e --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@@ -10508,10 -10390,8 +10581,11 @@@ static void intel_init_display(struct d } } else if (IS_G4X(dev)) { dev_priv->display.write_eld = g4x_write_eld; - } else if (IS_VALLEYVIEW(dev)) + } else if (IS_VALLEYVIEW(dev)) { + dev_priv->display.modeset_global_resources = + valleyview_modeset_global_resources; + dev_priv->display.write_eld = ironlake_write_eld; + } /* Default just returns -ENODEV to indicate unsupported */ dev_priv->display.queue_flip = intel_default_queue_flip;