mirror_ubuntu-kernels/drivers/gpu/drm/i915/display
Dave Airlie 41206a073c Linux 5.8-rc6
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl8UzA4eHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGQ7cH/3v+Gv+SmHJCvaT2
 CSu0+7okVnYbY3UTb3hykk7/aOqb6284KjxR03r0CWFzsEsZVhC5pvvruASSiMQg
 Pi04sLqv6CsGLHd1n+pl4AUYEaxq6k4KS3uU3HHSWxrahDDApQoRUx2F8lpOxyj8
 RiwnoO60IMPA7IFJqzcZuFqsgdxqiiYvnzT461KX8Mrw6fyMXeR2KAj2NwMX8dZN
 At21Sf8+LSoh6q2HnugfiUd/jR10XbfxIIx2lXgIinb15GXgWydEQVrDJ7cUV7ix
 Jd0S+dtOtp+lWtFHDoyjjqqsMV7+G8i/rFNZoxSkyZqsUTaKzaR6JD3moSyoYZgG
 0+eXO4A=
 =9EpR
 -----END PGP SIGNATURE-----

Merge v5.8-rc6 into drm-next

I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: Dave Airlie <airlied@redhat.com>
2020-07-24 08:48:05 +10:00
..
dvo_ch7xxx.c
dvo_ch7017.c
dvo_ivch.c
dvo_ns2501.c
dvo_sil164.c
dvo_tfp410.c
icl_dsi.c drm/i915/dsi: Dont forget to clean up the connector on error (v2) 2020-06-02 08:34:57 -07:00
intel_acpi.c
intel_acpi.h
intel_atomic_plane.c drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON 2020-04-21 09:49:30 +03:00
intel_atomic_plane.h drm/i915: Fix crtc nv12 etc. plane bitmasks for DPMS off 2020-03-20 15:12:11 +02:00
intel_atomic.c drm/i915: Replace I915_MODE_FLAG_INHERITED with a boolean 2020-05-29 18:05:13 +03:00
intel_atomic.h
intel_audio.c drm/i915: Streamline the artihmetic 2020-05-04 18:44:53 +03:00
intel_audio.h
intel_bios.c drm/i915/params: switch to device specific parameters 2020-06-22 23:26:40 +03:00
intel_bios.h drm/i915: significantly reduce the use of <drm/i915_drm.h> 2020-02-27 08:35:09 +02:00
intel_bw.c drm/i915: Fix wrong CDCLK adjustment changes 2020-06-04 11:11:56 -07:00
intel_bw.h drm/i915: Fix includes and local vars order 2020-05-22 14:40:35 +01:00
intel_cdclk.c Revert "drm/i915: Remove unneeded hack now for CDCLK" 2020-06-08 12:03:15 +03:00
intel_cdclk.h drm/i915: Fix includes and local vars order 2020-05-22 14:40:35 +01:00
intel_color.c drm/i915/dsb: Pre allocate and late cleanup of cmd buffer 2020-05-23 15:42:28 +05:30
intel_color.h
intel_combo_phy.c drm/i915/rkl: Handle comp master/slave relationships for PHYs 2020-06-04 09:35:23 -07:00
intel_combo_phy.h
intel_connector.c drm/i915: Add connector dbgfs for all connectors 2020-04-17 13:12:10 +05:30
intel_connector.h
intel_crt.c drm/i915/params: switch to device specific parameters 2020-06-22 23:26:40 +03:00
intel_crt.h
intel_csr.c drm/i915/params: switch to device specific parameters 2020-06-22 23:26:40 +03:00
intel_csr.h
intel_ddi.c drm/i915/display: remove alias to dig_port 2020-06-30 21:25:25 -07:00
intel_ddi.h drm/i915: Add {preemph,voltage}_max() vfuncs 2020-06-03 16:23:21 +03:00
intel_de.h
intel_display_debugfs.c Merge drm/drm-next into drm-intel-next-queued 2020-06-25 18:05:03 +03:00
intel_display_debugfs.h drm/i915: have *_debugfs_init() functions return void. 2020-03-18 16:27:22 +01:00
intel_display_power.c drm/i915/gen12: implement Wa_14011508470 2020-06-26 15:55:45 -07:00
intel_display_power.h drm/i915: Introduce for_each_dbuf_slice_in_mask macro 2020-05-21 14:14:56 -07:00
intel_display_types.h Merge drm/drm-next into drm-intel-next-queued 2020-06-25 18:05:03 +03:00
intel_display.c drm/i915/fbc: Fix fence_y_offset handling 2020-07-06 17:15:57 -07:00
intel_display.h drm/i915/fbc: Fix fence_y_offset handling 2020-07-06 17:15:57 -07:00
intel_dp_aux_backlight.c drm/i915/params: switch to device specific parameters 2020-06-22 23:26:40 +03:00
intel_dp_aux_backlight.h
intel_dp_link_training.c drm/i915: Fix DP_TRAIN_MAX_{PRE_EMPHASIS,SWING}_REACHED handling 2020-06-26 00:37:50 +03:00
intel_dp_link_training.h drm/i915/dp: Made intel_dp_adjust_train() non-static 2020-04-08 14:40:48 +02:00
intel_dp_mst.c Merge drm/drm-next into drm-intel-next-queued 2020-06-25 18:05:03 +03:00
intel_dp_mst.h
intel_dp.c drm/i915/dp: Correctly advertise HBR3 for GEN11+ 2020-07-01 16:24:45 -07:00
intel_dp.h drm/i915: Add {preemph,voltage}_max() vfuncs 2020-06-03 16:23:21 +03:00
intel_dpio_phy.c
intel_dpio_phy.h
intel_dpll_mgr.c drm/i915/icl+: Simplify combo/TBT PLL calculation call-chain 2020-07-01 15:39:00 +03:00
intel_dpll_mgr.h drm/i915: Fix documentation for intel_dpll_get_freq() 2020-03-09 12:37:23 +02:00
intel_dsb.c drm/i915/display: fix missing null check on allocated dsb object 2020-06-30 14:26:51 +03:00
intel_dsb.h drm/i915/dsb: Pre allocate and late cleanup of cmd buffer 2020-05-23 15:42:28 +05:30
intel_dsi_dcs_backlight.c
intel_dsi_dcs_backlight.h
intel_dsi_vbt.c drm/i915: drop a bunch of superfluous inlines 2020-04-21 09:31:37 +03:00
intel_dsi.c drm/i915/dsi: use struct drm_device based logging 2020-03-25 19:45:49 +02:00
intel_dsi.h
intel_dvo_dev.h
intel_dvo.c drm/i915: Pass atomic state to encoder hooks 2020-04-03 19:49:57 +03:00
intel_dvo.h
intel_fbc.c Linux 5.8-rc6 2020-07-24 08:48:05 +10:00
intel_fbc.h
intel_fbdev.c Merge drm/drm-next into drm-intel-next-queued 2020-04-16 14:35:16 +03:00
intel_fbdev.h
intel_fifo_underrun.c drm/i915/fifo_underrun: convert to drm_device based logging. 2020-03-11 12:20:43 +02:00
intel_fifo_underrun.h
intel_frontbuffer.c drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON 2020-04-21 10:54:22 +03:00
intel_frontbuffer.h
intel_global_state.c drm/i915: Fix global state use-after-frees with a refcount 2020-06-02 16:35:24 +03:00
intel_global_state.h drm/i915: Fix global state use-after-frees with a refcount 2020-06-02 16:35:24 +03:00
intel_gmbus.c drm/i915: drop a bunch of superfluous inlines 2020-04-21 09:31:37 +03:00
intel_gmbus.h
intel_hdcp.c drm/i915: Identify Cometlake platform 2020-06-02 23:15:34 +01:00
intel_hdcp.h drm/i915: Pass atomic state to encoder hooks 2020-04-03 19:49:57 +03:00
intel_hdmi.c Linux 5.8-rc6 2020-07-24 08:48:05 +10:00
intel_hdmi.h drm/i915: significantly reduce the use of <drm/i915_drm.h> 2020-02-27 08:35:09 +02:00
intel_hotplug.c drm-misc-next for v5.9: 2020-07-20 17:30:23 +10:00
intel_hotplug.h drm-misc-next for v5.9: 2020-06-24 15:45:51 +10:00
intel_lpe_audio.c drm/i915/lpe_audio: convert to drm_device based logging macros. 2020-03-11 12:20:43 +02:00
intel_lpe_audio.h
intel_lspcon.c drm/i915: Fix enabled infoframe states of lspcon 2020-05-14 13:54:08 +03:00
intel_lspcon.h
intel_lvds.c drm/i915/params: switch to device specific parameters 2020-06-22 23:26:40 +03:00
intel_lvds.h
intel_opregion.c drm/i915/params: switch to device specific parameters 2020-06-22 23:26:40 +03:00
intel_opregion.h
intel_overlay.c drm/i915: Protect overlay colorkey macro arguments 2020-05-15 20:12:56 +03:00
intel_overlay.h
intel_panel.c drm/i915/params: switch to device specific parameters 2020-06-22 23:26:40 +03:00
intel_panel.h drm/i915: Have pfit calculations return an error code 2020-04-24 17:37:22 +03:00
intel_pipe_crc.c drm/i915/crc: move pipe_crc from drm_i915_private to intel_crtc 2020-03-02 12:58:26 +02:00
intel_pipe_crc.h drm/i915/crc: move pipe_crc from drm_i915_private to intel_crtc 2020-03-02 12:58:26 +02:00
intel_psr.c drm/i915: Reorder intel_psr2_config_valid() 2020-06-30 17:23:59 -07:00
intel_psr.h drm/i915/psr: Use new DP VSC SDP compute routine on PSR 2020-05-14 13:54:17 +03:00
intel_quirks.c drm/i915: Add invert-brightness quirk for Thundersoft TST178 tablet 2020-03-04 16:54:36 +01:00
intel_quirks.h
intel_sdvo_regs.h
intel_sdvo.c drm/i915/display/sdvo: Prefer drm_WARN* over WARN* 2020-05-19 16:01:16 +03:00
intel_sdvo.h drm/i915: significantly reduce the use of <drm/i915_drm.h> 2020-02-27 08:35:09 +02:00
intel_sprite.c drm/i915: Add plane damage clips property 2020-06-30 17:23:58 -07:00
intel_sprite.h drm/i915/rkl: Limit number of universal planes to 5 2020-05-20 08:35:22 -07:00
intel_tc.c drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON 2020-05-19 16:01:20 +03:00
intel_tc.h drm/i915: Turn intel_digital_port_connected() in a vfunc 2020-05-11 16:25:15 +03:00
intel_tv.c Merge drm/drm-next into drm-intel-next-queued 2020-06-25 18:05:03 +03:00
intel_tv.h
intel_vbt_defs.h drm/i915: Replace zero-length array with flexible-array 2020-05-09 12:59:23 +01:00
intel_vdsc.c drm/i915/rkl: Add power well support 2020-05-20 08:35:22 -07:00
intel_vdsc.h
intel_vga.c
intel_vga.h
vlv_dsi_pll.c
vlv_dsi.c drm/i915: Stop using mode->private_flags 2020-05-29 17:59:21 +03:00