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 <daniel.vetter@ffwll.ch>

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_context.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
index 19949e8b36c55e33299d71745c9b356e9cc65518,5d1dedc02f159c8b7a21d23a940df9c5bf0c2bd2..931ee5d8cdb155f22b4017eda7339d768eb681c6
--- 1/drivers/gpu/drm/i915/i915_irq.c
--- 2/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/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_sysfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 752d83019f366c1e5701030f710f5a0eaa443c7c,b9f763c637ec1a85c2eeff3a2d9048cbb494c371..3b7f1c4eb48eb83cd46daf3882d0528cec54499e
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/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;

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_uncore.c
Simple merge