History

Merge tag 'drm-intel-next-2023-09-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

drm/i915 feature pull for v6.7: Features and functionality: - Early Xe2 LPD / Lunarlake (LNL) display enabling (Lucas, Matt, Gustavo, Stanislav, Luca, Clint, Juha-Pekka, Balasubramani, Ravi) - Plenty of various DSC improvements and fixes (Ankit) - Add DSC PPS state readout and verification (Suraj) - Improve fastsets for VRR, LRR and M/N updates (Ville) - Use connector->ddc to create (non-DP MST) connector sysfs ddc symlinks (Ville) - Various DSB improvements, load LUTs using DSB (Ville) - Improve shared link bandwidth management, starting with FDI (Imre) - Optimize get param ioctl for PXP status (Alan) - Remove DG2 pre-production hardware workarounds (Matt) - Add more RPL P/U PCI IDs (Dnyaneshwar) - Add new DG2-G12 stepping (Swati) - Add PSR sink error status to debugfs (Jouni) - Add DP enhanced framing to crtc state checker (Ville) Refactoring and cleanups: - Simplify TileY/Tile4 tiling selftest enumeration (Matt) - Remove some unused power domain code (Gustavo) - Check stepping of display IP version rather than MTL platform (Matt) - DP audio compute config cleanups (Vinod) - SDVO cleanups and refactoring, more robust failure handling (Ville) - Color register definition and readout cleanups (Jani) - Reduce header interdependencies for frontbuffer tracking (Jani) - Continue replacing struct edid with struct drm_edid (Jani) - Use source physical address instead of EDID for CEC (Jani) - Clean up Type-C port lane count functions (Luca) - Clean up DSC PPS register definitions and readout (Jani) - Stop using GEM_BUG_ON()/GEM_WARN_ON() in display code (Jani) - Move more of the display probe to display code (Jani) - Remove redundant runtime suspended state flag (Jouni) - Move display info printing to display code (Balasubramani) - Frontbuffer tracking improvements (Jouni) - Add trailing newlines to debug logging (Jim Cromie) - Separate display workarounds from clock gating init (Matt) - Reduce dmesg log spamming for combo PHY, PLL state, FEC, DP MST (Ville, Imre) Fixes: - Fix hotplug poll detect loops via suspend/resume (Imre) - Fix hotplug detect for forced connectors (Imre) - Fix DSC first_line_bpg_offset calculation (Suraj) - Fix debug prints for SDP CRC16 (Arun) - Fix PXP runtime resume (Alan) - Fix cx0 PHY lane handling (Gustavo) - Fix frontbuffer tracking locking in debugfs (Juha-Pekka) - Fix SDVO detect on some models (Ville) - Fix SDP split configuration for DP MST (Vinod) - Fix AUX usage and reads for HDCP on DP MST (Suraj) - Fix PSR workaround (Jouni) - Fix redundant AUX power get/put in DP force (Imre) - Fix ICL DSI TCLK POST by letting hardware handle it (William) - Fix IRQ reset for XE LP+ (Gustavo) - Fix h/vsync_end instead of h/vtotal in VBT (Ville) - Fix C20 PHY msgbus timeout issues (Gustavo) - Fix pre-TGL FEC pipe A vs. DDI A mixup (Ville) - Fix FEC state readout for DP MST (Ville) DRM subsystem core changes: - Assume sink supports 8 bpc when DSC is supported (Ankit) - Add drm_edid_is_digital() helper (Jani) - Parse source physical address from EDID (Jani) - Add function to attach CEC without EDID (Jani) - Reorder connector sysfs/debugfs remove (Ville) - Register connector sysfs ddc symlink later (Ville) Media subsystem changes: - Add comments about CEC source physical address usage (Jani) Merges: - Backmerge drm-next to get v6.6-rc1 (Jani) Signed-off-by: Dave Airlie <airlied@redhat.com> # Conflicts: # drivers/gpu/drm/i915/i915_drv.h From: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/87r0mhi7a6.fsf@intel.com

Dave Airlie committed 3 years ago

Commit 389af782 parents caacbdc 3570bd9142 files · +4550 −2464Browse files

Showing the changes to include/drm (4 of 142 files). Show all

Unified · Split

4 files
  1. include/drm/display/drm_dp_helper.h +6 −0
  2. include/drm/drm_connector.h +8 −0
  3. include/drm/drm_edid.h +1 −0
  4. include/drm/i915_pciids.h +6 −2
include/drm/display/drm_dp_helper.h+6−0
@@ -699,6 +699,7 @@ void drm_dp_cec_irq(struct drm_dp_aux *aux); · 698 unmodified lines
699699 void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
700700 struct drm_connector *connector);
701701 void drm_dp_cec_unregister_connector(struct drm_dp_aux *aux);
702+void drm_dp_cec_attach(struct drm_dp_aux *aux, u16 source_physical_address);
702703 void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid);
703704 void drm_dp_cec_unset_edid(struct drm_dp_aux *aux);
704705 #else
@@ -716,6 +717,11 @@ static inline void drm_dp_cec_unregister_connector(struct drm_dp_aux *aux) · 11 unmodified lines
716717 {
717718 }
718719
720+static inline void drm_dp_cec_attach(struct drm_dp_aux *aux,
721+ u16 source_physical_address)
722+{
723+}
724+
719725 static inline void drm_dp_cec_set_edid(struct drm_dp_aux *aux,
720726 const struct edid *edid)
721727 {
include/drm/drm_connector.h+8−0
@@ -817,6 +817,14 @@ struct drm_display_info { · 816 unmodified lines
817817 * @quirks: EDID based quirks. Internal to EDID parsing.
818818 */
819819 u32 quirks;
820+
821+ /**
822+ * @source_physical_address: Source Physical Address from HDMI
823+ * Vendor-Specific Data Block, for CEC usage.
824+ *
825+ * Defaults to CEC_PHYS_ADDR_INVALID (0xffff).
826+ */
827+ u16 source_physical_address;
820828 };
821829
822830 int drm_display_info_set_bus_formats(struct drm_display_info *info,
include/drm/drm_edid.h+1−0
@@ -612,6 +612,7 @@ const struct drm_edid *drm_edid_read_switcheroo(struct drm_connector *connector, · 611 unmodified lines
612612 int drm_edid_connector_update(struct drm_connector *connector,
613613 const struct drm_edid *edid);
614614 int drm_edid_connector_add_modes(struct drm_connector *connector);
615+bool drm_edid_is_digital(const struct drm_edid *drm_edid);
615616
616617 const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
617618 int ext_id, int *ext_index);
include/drm/i915_pciids.h+6−2
@@ -689,14 +689,18 @@ · 688 unmodified lines
689689 #define INTEL_RPLU_IDS(info) \
690690 INTEL_VGA_DEVICE(0xA721, info), \
691691 INTEL_VGA_DEVICE(0xA7A1, info), \
692− INTEL_VGA_DEVICE(0xA7A9, info)
692+ INTEL_VGA_DEVICE(0xA7A9, info), \
693+ INTEL_VGA_DEVICE(0xA7AC, info), \
694+ INTEL_VGA_DEVICE(0xA7AD, info)
693695
694696 /* RPL-P */
695697 #define INTEL_RPLP_IDS(info) \
696698 INTEL_RPLU_IDS(info), \
697699 INTEL_VGA_DEVICE(0xA720, info), \
698700 INTEL_VGA_DEVICE(0xA7A0, info), \
699− INTEL_VGA_DEVICE(0xA7A8, info)
701+ INTEL_VGA_DEVICE(0xA7A8, info), \
702+ INTEL_VGA_DEVICE(0xA7AA, info), \
703+ INTEL_VGA_DEVICE(0xA7AB, info)
700704
701705 /* DG2 */
702706 #define INTEL_DG2_G10_IDS(info) \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t