Merge tag 'drm-misc-next-2018-09-19' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for 4.20:

UAPI Changes:
- None

Cross-subsystem Changes:
- None

Core Changes:
- Allow drivers to disable features with per-device granularity (Ville)
- Use EOPNOTSUPP when iface/feature is unsupported instead of
  EINVAL/errno soup (Chris)
- Simplify M/N DP quirk by using constant N to limit size of M/N (Shawn)
- add quirk for LG LP140WF6-SPM1 eDP panel (Shawn)

Driver Changes:
- i915/amdgpu: Disable DRIVER_ATOMIC for older/unsupported devices (Ville)
- sun4i: add support for R40 HDMI PHY (Icenowy)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Icenowy Zheng <icenowy@aosc.io>
Cc: Lee, Shawn C <shawn.c.lee@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180919200218.GA186644@art_vandelay

diff --cc drivers/gpu/drm/i915/i915_drv.c
index 5dd7fc582e6fd9d4975f9ed2f5968d247d27e892,61199defb47045f9db767f1b0eb7fd24db38046e..2ddf8538cb474f909830f4d4f8257369ce970fca
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -1384,14 -1336,22 +1384,14 @@@ int i915_driver_load(struct pci_dev *pd
        struct drm_i915_private *dev_priv;
        int ret;
  
-       /* Enable nuclear pageflip on ILK+ */
-       if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
-               driver.driver_features &= ~DRIVER_ATOMIC;
 -      ret = -ENOMEM;
 -      dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
 -      if (dev_priv)
 -              ret = drm_dev_init(&dev_priv->drm, &driver, &pdev->dev);
 -      if (ret) {
 -              DRM_DEV_ERROR(&pdev->dev, "allocation failed\n");
 -              goto out_free;
 -      }
--
 -      dev_priv->drm.pdev = pdev;
 -      dev_priv->drm.dev_private = dev_priv;
 +      dev_priv = i915_driver_create(pdev, ent);
 +      if (!dev_priv)
 +              return -ENOMEM;
  
+       /* Disable nuclear pageflip by default on pre-ILK */
+       if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
+               dev_priv->drm.driver_features &= ~DRIVER_ATOMIC;
+ 
        ret = pci_enable_device(pdev);
        if (ret)
                goto out_fini;

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

diff --cc drivers/gpu/drm/i915/intel_display.h
index ed474da6c200d673c07d851a7c09bcea7c1fdb5a,58ba614862e5080ebf160ba178b1694c2d0cb594..9fac67e31205ff19ae9398b23bfd07a1191ac541
--- 1/drivers/gpu/drm/i915/intel_display.h
--- 2/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@@ -405,7 -382,6 +405,7 @@@ struct intel_link_m_n 
  void intel_link_compute_m_n(int bpp, int nlanes,
                            int pixel_clock, int link_clock,
                            struct intel_link_m_n *m_n,
-                           bool reduce_m_n);
+                           bool constant_n);
  
 +bool is_ccs_modifier(u64 modifier);
  #endif

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

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