Core Changes (DRM): - Fix documentation of DP tunnel functions (Imre) - DP MST read sideband messaging cap (Jani) - Preparation patches for Adaptive Sync SDP Support for DP (Mitul) Driver Changes: i915 core (non-display): - Documentation improvements (Nirmoy) - Add includes for BUG_ON/BUILD_BUG_ON in i915_memcpy.c (Joonas) - Do not print 'pxp init failed with 0' when it succeed (Jose) - Clean-up, including removal of dead code for unsupported platforms (Lucas) - Adding new DG2 PCI ID (Ravi) {i915,xe} display: - Spelling fix (Colin Ian) - Document CDCLK components (Gustavo) - Lunar Lake display enabling, including cdclk and other refactors (Gustavo, Bala) - BIOS/VBT/opregion related refactor (Jani, Ville, RK) - Save a few bytes of memory using {kstrdup,kfree}_const variant (Christophe) - Digital port related refactor/clean-up (Ville) - Fix 2s boot time regression on DP panel replay init (Animesh) - Remove redundant drm_rect_visible() overlay use (Arthur) - DSC HW state readout fixes (Imre) - Remove duplication on audio enable/disable on SDVO and g4x+ DP (Ville) - Disable AuxCCS framebuffers if built for Xe (Juha-Pekka) - Fix DSI init order (Ville) - DRRS related refactor and fixes (Bhanuprakash) - Fix DSB vblank waits with VRR (Ville) - General improvements on register name and use of REG_BIT (Ville) - Some display power well related improvements (Ville) - FBC changes for better w/a handling (Ville) - Make crtc disable more atomic (Ville) - Fix hwmon locking inversion in sysfs getter (Janusz) - Increase DP idle pattern wait timeout to 2ms (Shekhar) - PSR related fixes and improvents (Jouni) - Start using container_of_const() for some extra const safety (Ville) - Use drm_printer more on display code (Ville) - Fix Jasper Lake boot freeze (Jonathon) - Update Pipe src size check in skl_update_scaler (Ankit) - Enable MST mode for 128b/132b single-stream sideband (Jani) - Pass encoder around more for port/phy checks (Jani) - Some initial work to make display code more independent from i915 (Jani) - Pre-populate the cursor physical dma address (Ville) - Do not bump min backlight brightness to max on enable (Gareth) - Fix MTL supported DP rates - removal of UHBR13.5 (Arun) - Fix the computation for compressed_bpp for DISPLAY < 1 (Ankit) - Bigjoiner modeset sequence redesign and MST support (Ville) - Enable Adaptive Sync SDP Support for DP (Mitul) - Implemnt vblank sycnhronized mbus joining changes (Ville, Stanislav) - HDCP related fixes (Suraj) - Fix i915_display_info debugfs when connectors are not active (Ville) - Clean up on Xe compat layer (Jani) - Add jitter WAs for MST/FEC/DSC links (Imre) - DMC wakelock implementation (Luca) Signed-off-by: Dave Airlie <airlied@redhat.com> # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmYfzQEACgkQ+mJfZA7r # E8qYvAf/T8KrEewHOWz7NOaKcFRCNYaF4QTdVOfgHUYBX5NPDF/xzwFdHCL8QWQu # bwKwE2b94VEyruG3DYwTMd8GNcDxrsOrmU0IZe3PVkm+BvHLTmrOqL6BlCd85zXF # 02IuE+LCaWREmmpLMcsDMxsaaq8yp+cw9/F0jJDrH6LiyfxFriefxyZYpGYjRCuv # 8GP1fHXLFV2yys4rveR/+y9xIhgy82mVcg3/Kfk0+er7gALkY6Vc0N38wedET9MZ # ZPfVidBeaTkIKcCDFKnFzGjG+9rNQ7NFrXyS7Hl97VolGt2l03qGGPNW1PouDiUx # 7Y8CJOc+1k9wyBMKl0a/NQBRAqSZBQ== # =JvZN # -----END PGP SIGNATURE----- # gpg: Signature made Wed 17 Apr 2024 23:22:09 AEST # gpg: using RSA key 6D207068EEDD65091C2CE2A3FA625F640EEB13CA # gpg: Good signature from "Rodrigo Vivi <rodrigo.vivi@intel.com>" [unknown] # gpg: aka "Rodrigo Vivi <rodrigo.vivi@gmail.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 6D20 7068 EEDD 6509 1C2C E2A3 FA62 5F64 0EEB 13CA From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/Zh_Q72gYKMMbge9A@intel.com
Unified · Split
| @@ -204,6 +204,15 @@ DMC Firmware Support · 203 unmodified lines | ||
| 204 | 204 | .. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc.c |
| 205 | 205 | :internal: |
| 206 | 206 | |
| 207 | +DMC wakelock support | |
| 208 | +-------------------- | |
| 209 | + | |
| 210 | +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc_wl.c | |
| 211 | + :doc: DMC wakelock support | |
| 212 | + | |
| 213 | +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc_wl.c | |
| 214 | + :internal: | |
| 215 | + | |
| 207 | 216 | Video BIOS Table (VBT) |
| 208 | 217 | ---------------------- |
| 209 | 218 | |
| @@ -93,12 +93,11 @@ struct drm_i915_gem_timeline_fence { · 92 unmodified lines | ||
| 93 | 93 | * Multiple VA mappings can be created to the same section of the object |
| 94 | 94 | * (aliasing). |
| 95 | 95 | * |
| 96 | − * The @start, @offset and @length must be 4K page aligned. However the DG2 | |
| 97 | − * and XEHPSDV has 64K page size for device local memory and has compact page | |
| 98 | − * table. On those platforms, for binding device local-memory objects, the | |
| 99 | − * @start, @offset and @length must be 64K aligned. Also, UMDs should not mix | |
| 100 | − * the local memory 64K page and the system memory 4K page bindings in the same | |
| 101 | − * 2M range. | |
| 96 | + * The @start, @offset and @length must be 4K page aligned. However the DG2 has | |
| 97 | + * 64K page size for device local memory and has compact page table. On that | |
| 98 | + * platform, for binding device local-memory objects, the @start, @offset and | |
| 99 | + * @length must be 64K aligned. Also, UMDs should not mix the local memory 64K | |
| 100 | + * page and the system memory 4K page bindings in the same 2M range. | |
| 102 | 101 | * |
| 103 | 102 | * Error code -EINVAL will be returned if @start, @offset and @length are not |
| 104 | 103 | * properly aligned. In version 1 (See I915_PARAM_VM_BIND_VERSION), error code |
| @@ -2948,6 +2948,43 @@ void drm_dp_vsc_sdp_log(struct drm_printer *p, const struct drm_dp_vsc_sdp *vsc) · 2947 unmodified lines | ||
| 2948 | 2948 | } |
| 2949 | 2949 | EXPORT_SYMBOL(drm_dp_vsc_sdp_log); |
| 2950 | 2950 | |
| 2951 | +void drm_dp_as_sdp_log(struct drm_printer *p, const struct drm_dp_as_sdp *as_sdp) | |
| 2952 | +{ | |
| 2953 | + drm_printf(p, "DP SDP: AS_SDP, revision %u, length %u\n", | |
| 2954 | + as_sdp->revision, as_sdp->length); | |
| 2955 | + drm_printf(p, " vtotal: %d\n", as_sdp->vtotal); | |
| 2956 | + drm_printf(p, " target_rr: %d\n", as_sdp->target_rr); | |
| 2957 | + drm_printf(p, " duration_incr_ms: %d\n", as_sdp->duration_incr_ms); | |
| 2958 | + drm_printf(p, " duration_decr_ms: %d\n", as_sdp->duration_decr_ms); | |
| 2959 | + drm_printf(p, " operation_mode: %d\n", as_sdp->mode); | |
| 2960 | +} | |
| 2961 | +EXPORT_SYMBOL(drm_dp_as_sdp_log); | |
| 2962 | + | |
| 2963 | +/** | |
| 2964 | + * drm_dp_as_sdp_supported() - check if adaptive sync sdp is supported | |
| 2965 | + * @aux: DisplayPort AUX channel | |
| 2966 | + * @dpcd: DisplayPort configuration data | |
| 2967 | + * | |
| 2968 | + * Returns true if adaptive sync sdp is supported, else returns false | |
| 2969 | + */ | |
| 2970 | +bool drm_dp_as_sdp_supported(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]) | |
| 2971 | +{ | |
| 2972 | + u8 rx_feature; | |
| 2973 | + | |
| 2974 | + if (dpcd[DP_DPCD_REV] < DP_DPCD_REV_13) | |
| 2975 | + return false; | |
| 2976 | + | |
| 2977 | + if (drm_dp_dpcd_readb(aux, DP_DPRX_FEATURE_ENUMERATION_LIST_CONT_1, | |
| 2978 | + &rx_feature) != 1) { | |
| 2979 | + drm_dbg_dp(aux->drm_dev, | |
| 2980 | + "Failed to read DP_DPRX_FEATURE_ENUMERATION_LIST_CONT_1\n"); | |
| 2981 | + return false; | |
| 2982 | + } | |
| 2983 | + | |
| 2984 | + return (rx_feature & DP_ADAPTIVE_SYNC_SDP_SUPPORTED); | |
| 2985 | +} | |
| 2986 | +EXPORT_SYMBOL(drm_dp_as_sdp_supported); | |
| 2987 | + | |
| 2951 | 2988 | /** |
| 2952 | 2989 | * drm_dp_vsc_sdp_supported() - check if vsc sdp is supported |
| 2953 | 2990 | * @aux: DisplayPort AUX channel |
| @@ -3608,24 +3608,30 @@ fixed20_12 drm_dp_get_vc_payload_bw(const struct drm_dp_mst_topology_mgr *mgr, · 3607 unmodified lines | ||
| 3608 | 3608 | EXPORT_SYMBOL(drm_dp_get_vc_payload_bw); |
| 3609 | 3609 | |
| 3610 | 3610 | /** |
| 3611 | − * drm_dp_read_mst_cap() - check whether or not a sink supports MST | |
| 3611 | + * drm_dp_read_mst_cap() - Read the sink's MST mode capability | |
| 3612 | 3612 | * @aux: The DP AUX channel to use |
| 3613 | 3613 | * @dpcd: A cached copy of the DPCD capabilities for this sink |
| 3614 | 3614 | * |
| 3615 | − * Returns: %True if the sink supports MST, %false otherwise | |
| 3615 | + * Returns: enum drm_dp_mst_mode to indicate MST mode capability | |
| 3616 | 3616 | */ |
| 3617 | −bool drm_dp_read_mst_cap(struct drm_dp_aux *aux, | |
| 3618 | − const u8 dpcd[DP_RECEIVER_CAP_SIZE]) | |
| 3617 | +enum drm_dp_mst_mode drm_dp_read_mst_cap(struct drm_dp_aux *aux, | |
| 3618 | + const u8 dpcd[DP_RECEIVER_CAP_SIZE]) | |
| 3619 | 3619 | { |
| 3620 | 3620 | u8 mstm_cap; |
| 3621 | 3621 | |
| 3622 | 3622 | if (dpcd[DP_DPCD_REV] < DP_DPCD_REV_12) |
| 3623 | − return false; | |
| 3623 | + return DRM_DP_SST; | |
| 3624 | 3624 | |
| 3625 | 3625 | if (drm_dp_dpcd_readb(aux, DP_MSTM_CAP, &mstm_cap) != 1) |
| 3626 | − return false; | |
| 3626 | + return DRM_DP_SST; | |
| 3627 | + | |
| 3628 | + if (mstm_cap & DP_MST_CAP) | |
| 3629 | + return DRM_DP_MST; | |
| 3630 | + | |
| 3631 | + if (mstm_cap & DP_SINGLE_STREAM_SIDEBAND_MSG) | |
| 3632 | + return DRM_DP_SST_SIDEBAND_MSG; | |
| 3627 | 3633 | |
| 3628 | − return mstm_cap & DP_MST_CAP; | |
| 3634 | + return DRM_DP_SST; | |
| 3629 | 3635 | } |
| 3630 | 3636 | EXPORT_SYMBOL(drm_dp_read_mst_cap); |
| 3631 | 3637 | |
| @@ -436,8 +436,8 @@ EXPORT_SYMBOL(drm_dp_tunnel_get); · 435 unmodified lines | ||
| 436 | 436 | |
| 437 | 437 | /** |
| 438 | 438 | * drm_dp_tunnel_put - Put a reference for a DP tunnel |
| 439 | − * @tunnel - Tunnel object | |
| 440 | − * @tracker - Debug tracker for the reference | |
| 439 | + * @tunnel: Tunnel object | |
| 440 | + * @tracker: Debug tracker for the reference | |
| 441 | 441 | * |
| 442 | 442 | * Put a reference for @tunnel along with its debug *@tracker, which |
| 443 | 443 | * was obtained with drm_dp_tunnel_get(). |
| @@ -1170,7 +1170,7 @@ int drm_dp_tunnel_alloc_bw(struct drm_dp_tunnel *tunnel, int bw) · 726 unmodified lines | ||
| 1170 | 1170 | EXPORT_SYMBOL(drm_dp_tunnel_alloc_bw); |
| 1171 | 1171 | |
| 1172 | 1172 | /** |
| 1173 | − * drm_dp_tunnel_atomic_get_allocated_bw - Get the BW allocated for a DP tunnel | |
| 1173 | + * drm_dp_tunnel_get_allocated_bw - Get the BW allocated for a DP tunnel | |
| 1174 | 1174 | * @tunnel: Tunnel object |
| 1175 | 1175 | * |
| 1176 | 1176 | * Get the current BW allocated for @tunnel. After the tunnel is created / |
| @@ -1892,6 +1892,7 @@ static void destroy_mgr(struct drm_dp_tunnel_mgr *mgr) · 715 unmodified lines | ||
| 1892 | 1892 | /** |
| 1893 | 1893 | * drm_dp_tunnel_mgr_create - Create a DP tunnel manager |
| 1894 | 1894 | * @dev: DRM device object |
| 1895 | + * @max_group_count: Maximum number of tunnel groups | |
| 1895 | 1896 | * |
| 1896 | 1897 | * Creates a DP tunnel manager for @dev. |
| 1897 | 1898 | * |
| @@ -32,11 +32,6 @@ endif · 31 unmodified lines | ||
| 32 | 32 | # Enable -Werror in CI and development |
| 33 | 33 | subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror |
| 34 | 34 | |
| 35 | −# Fine grained warnings disable | |
| 36 | −CFLAGS_i915_pci.o = -Wno-override-init | |
| 37 | −CFLAGS_display/intel_display_device.o = -Wno-override-init | |
| 38 | −CFLAGS_display/intel_fbdev.o = -Wno-override-init | |
| 39 | − | |
| 40 | 35 | # Support compiling the display code separately for both i915 and xe |
| 41 | 36 | # drivers. Define I915 when building i915. |
| 42 | 37 | subdir-ccflags-y += -DI915 |
| @@ -270,6 +265,7 @@ i915-y += \ · 227 unmodified lines | ||
| 270 | 265 | display/intel_display_rps.o \ |
| 271 | 266 | display/intel_display_wa.o \ |
| 272 | 267 | display/intel_dmc.o \ |
| 268 | + display/intel_dmc_wl.o \ | |
| 273 | 269 | display/intel_dpio_phy.o \ |
| 274 | 270 | display/intel_dpll.o \ |
| 275 | 271 | display/intel_dpll_mgr.o \ |
| @@ -1616,8 +1616,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, · 1615 unmodified lines | ||
| 1616 | 1616 | struct drm_connector_state *conn_state) |
| 1617 | 1617 | { |
| 1618 | 1618 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1619 | − struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, | |
| 1620 | − base); | |
| 1619 | + struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); | |
| 1621 | 1620 | struct intel_connector *intel_connector = intel_dsi->attached_connector; |
| 1622 | 1621 | struct drm_display_mode *adjusted_mode = |
| 1623 | 1622 | &pipe_config->hw.adjusted_mode; |
| @@ -62,7 +62,7 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector, · 61 unmodified lines | ||
| 62 | 62 | { |
| 63 | 63 | struct drm_device *dev = connector->dev; |
| 64 | 64 | struct drm_i915_private *dev_priv = to_i915(dev); |
| 65 | − struct intel_digital_connector_state *intel_conn_state = | |
| 65 | + const struct intel_digital_connector_state *intel_conn_state = | |
| 66 | 66 | to_intel_digital_connector_state(state); |
| 67 | 67 | |
| 68 | 68 | if (property == dev_priv->display.properties.force_audio) |
| @@ -761,8 +761,8 @@ static void __intel_backlight_enable(const struct intel_crtc_state *crtc_state, · 760 unmodified lines | ||
| 761 | 761 | |
| 762 | 762 | WARN_ON(panel->backlight.max == 0); |
| 763 | 763 | |
| 764 | − if (panel->backlight.level <= panel->backlight.min) { | |
| 765 | − panel->backlight.level = panel->backlight.max; | |
| 764 | + if (panel->backlight.level < panel->backlight.min) { | |
| 765 | + panel->backlight.level = panel->backlight.min; | |
| 766 | 766 | if (panel->backlight.device) |
| 767 | 767 | panel->backlight.device->props.brightness = |
| 768 | 768 | scale_hw_to_user(connector, |
| @@ -949,7 +949,7 @@ int intel_backlight_device_register(struct intel_connector *connector) · 180 unmodified lines | ||
| 949 | 949 | else |
| 950 | 950 | props.power = FB_BLANK_POWERDOWN; |
| 951 | 951 | |
| 952 | − name = kstrdup("intel_backlight", GFP_KERNEL); | |
| 952 | + name = kstrdup_const("intel_backlight", GFP_KERNEL); | |
| 953 | 953 | if (!name) |
| 954 | 954 | return -ENOMEM; |
| 955 | 955 | |
| @@ -963,7 +963,7 @@ int intel_backlight_device_register(struct intel_connector *connector) · 7 unmodified lines | ||
| 963 | 963 | * compatibility. Use unique names for subsequent backlight devices as a |
| 964 | 964 | * fallback when the default name already exists. |
| 965 | 965 | */ |
| 966 | − kfree(name); | |
| 966 | + kfree_const(name); | |
| 967 | 967 | name = kasprintf(GFP_KERNEL, "card%d-%s-backlight", |
| 968 | 968 | i915->drm.primary->index, connector->base.name); |
| 969 | 969 | if (!name) |
| @@ -987,7 +987,7 @@ int intel_backlight_device_register(struct intel_connector *connector) · 17 unmodified lines | ||
| 987 | 987 | connector->base.base.id, connector->base.name, name); |
| 988 | 988 | |
| 989 | 989 | out: |
| 990 | − kfree(name); | |
| 990 | + kfree_const(name); | |
| 991 | 991 | |
| 992 | 992 | return ret; |
| 993 | 993 | } |
| @@ -25,6 +25,8 @@ · 24 unmodified lines | ||
| 25 | 25 | * |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | +#include <linux/firmware.h> | |
| 29 | + | |
| 28 | 30 | #include <drm/display/drm_dp_helper.h> |
| 29 | 31 | #include <drm/display/drm_dsc_helper.h> |
| 30 | 32 | #include <drm/drm_edid.h> |
| @@ -2730,6 +2732,57 @@ static void parse_ddi_ports(struct drm_i915_private *i915) · 2699 unmodified lines | ||
| 2730 | 2732 | print_ddi_port(devdata); |
| 2731 | 2733 | } |
| 2732 | 2734 | |
| 2735 | +static int child_device_expected_size(u16 version) | |
| 2736 | +{ | |
| 2737 | + BUILD_BUG_ON(sizeof(struct child_device_config) < 40); | |
| 2738 | + | |
| 2739 | + if (version > 256) | |
| 2740 | + return -ENOENT; | |
| 2741 | + else if (version >= 256) | |
| 2742 | + return 40; | |
| 2743 | + else if (version >= 216) | |
| 2744 | + return 39; | |
| 2745 | + else if (version >= 196) | |
| 2746 | + return 38; | |
| 2747 | + else if (version >= 195) | |
| 2748 | + return 37; | |
| 2749 | + else if (version >= 111) | |
| 2750 | + return LEGACY_CHILD_DEVICE_CONFIG_SIZE; | |
| 2751 | + else if (version >= 106) | |
| 2752 | + return 27; | |
| 2753 | + else | |
| 2754 | + return 22; | |
| 2755 | +} | |
| 2756 | + | |
| 2757 | +static bool child_device_size_valid(struct drm_i915_private *i915, int size) | |
| 2758 | +{ | |
| 2759 | + int expected_size; | |
| 2760 | + | |
| 2761 | + expected_size = child_device_expected_size(i915->display.vbt.version); | |
| 2762 | + if (expected_size < 0) { | |
| 2763 | + expected_size = sizeof(struct child_device_config); | |
| 2764 | + drm_dbg(&i915->drm, | |
| 2765 | + "Expected child device config size for VBT version %u not known; assuming %d\n", | |
| 2766 | + i915->display.vbt.version, expected_size); | |
| 2767 | + } | |
| 2768 | + | |
| 2769 | + /* Flag an error for unexpected size, but continue anyway. */ | |
| 2770 | + if (size != expected_size) | |
| 2771 | + drm_err(&i915->drm, | |
| 2772 | + "Unexpected child device config size %d (expected %d for VBT version %u)\n", | |
| 2773 | + size, expected_size, i915->display.vbt.version); | |
| 2774 | + | |
| 2775 | + /* The legacy sized child device config is the minimum we need. */ | |
| 2776 | + if (size < LEGACY_CHILD_DEVICE_CONFIG_SIZE) { | |
| 2777 | + drm_dbg_kms(&i915->drm, | |
| 2778 | + "Child device config size %d is too small.\n", | |
| 2779 | + size); | |
| 2780 | + return false; | |
| 2781 | + } | |
| 2782 | + | |
| 2783 | + return true; | |
| 2784 | +} | |
| 2785 | + | |
| 2733 | 2786 | static void |
| 2734 | 2787 | parse_general_definitions(struct drm_i915_private *i915) |
| 2735 | 2788 | { |
| @@ -2737,7 +2790,6 @@ parse_general_definitions(struct drm_i915_private *i915) · 1 unmodified line | ||
| 2737 | 2790 | struct intel_bios_encoder_data *devdata; |
| 2738 | 2791 | const struct child_device_config *child; |
| 2739 | 2792 | int i, child_device_num; |
| 2740 | − u8 expected_size; | |
| 2741 | 2793 | u16 block_size; |
| 2742 | 2794 | int bus_pin; |
| 2743 | 2795 | |
| @@ -2761,39 +2813,8 @@ parse_general_definitions(struct drm_i915_private *i915) · 17 unmodified lines | ||
| 2761 | 2813 | if (intel_gmbus_is_valid_pin(i915, bus_pin)) |
| 2762 | 2814 | i915->display.vbt.crt_ddc_pin = bus_pin; |
| 2763 | 2815 | |
| 2764 | − if (i915->display.vbt.version < 106) { | |
| 2765 | − expected_size = 22; | |
| 2766 | − } else if (i915->display.vbt.version < 111) { | |
| 2767 | − expected_size = 27; | |
| 2768 | − } else if (i915->display.vbt.version < 195) { | |
| 2769 | − expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE; | |
| 2770 | − } else if (i915->display.vbt.version == 195) { | |
| 2771 | − expected_size = 37; | |
| 2772 | − } else if (i915->display.vbt.version <= 215) { | |
| 2773 | − expected_size = 38; | |
| 2774 | − } else if (i915->display.vbt.version <= 250) { | |
| 2775 | − expected_size = 39; | |
| 2776 | − } else { | |
| 2777 | − expected_size = sizeof(*child); | |
| 2778 | − BUILD_BUG_ON(sizeof(*child) < 39); | |
| 2779 | − drm_dbg(&i915->drm, | |
| 2780 | − "Expected child device config size for VBT version %u not known; assuming %u\n", | |
| 2781 | − i915->display.vbt.version, expected_size); | |
| 2782 | − } | |
| 2783 | − | |
| 2784 | − /* Flag an error for unexpected size, but continue anyway. */ | |
| 2785 | − if (defs->child_dev_size != expected_size) | |
| 2786 | − drm_err(&i915->drm, | |
| 2787 | − "Unexpected child device config size %u (expected %u for VBT version %u)\n", | |
| 2788 | − defs->child_dev_size, expected_size, i915->display.vbt.version); | |
| 2789 | − | |
| 2790 | − /* The legacy sized child device config is the minimum we need. */ | |
| 2791 | − if (defs->child_dev_size < LEGACY_CHILD_DEVICE_CONFIG_SIZE) { | |
| 2792 | − drm_dbg_kms(&i915->drm, | |
| 2793 | − "Child device config size %u is too small.\n", | |
| 2794 | − defs->child_dev_size); | |
| 2816 | + if (!child_device_size_valid(i915, defs->child_dev_size)) | |
| 2795 | 2817 | return; |
| 2796 | − } | |
| 2797 | 2818 | |
| 2798 | 2819 | /* get the number of child device */ |
| 2799 | 2820 | child_device_num = (block_size - sizeof(*defs)) / defs->child_dev_size; |
| @@ -2869,9 +2890,8 @@ init_vbt_panel_defaults(struct intel_panel *panel) · 69 unmodified lines | ||
| 2869 | 2890 | static void |
| 2870 | 2891 | init_vbt_missing_defaults(struct drm_i915_private *i915) |
| 2871 | 2892 | { |
| 2893 | + unsigned int ports = DISPLAY_RUNTIME_INFO(i915)->port_mask; | |
| 2872 | 2894 | enum port port; |
| 2873 | − int ports = BIT(PORT_A) | BIT(PORT_B) | BIT(PORT_C) | | |
| 2874 | − BIT(PORT_D) | BIT(PORT_E) | BIT(PORT_F); | |
| 2875 | 2895 | |
| 2876 | 2896 | if (!HAS_DDI(i915) && !IS_CHERRYVIEW(i915)) |
| 2877 | 2897 | return; |
| @@ -2981,6 +3001,43 @@ bool intel_bios_is_valid_vbt(struct drm_i915_private *i915, · 103 unmodified lines | ||
| 2981 | 3001 | return vbt; |
| 2982 | 3002 | } |
| 2983 | 3003 | |
| 3004 | +static struct vbt_header *firmware_get_vbt(struct drm_i915_private *i915, | |
| 3005 | + size_t *size) | |
| 3006 | +{ | |
| 3007 | + struct vbt_header *vbt = NULL; | |
| 3008 | + const struct firmware *fw = NULL; | |
| 3009 | + const char *name = i915->display.params.vbt_firmware; | |
| 3010 | + int ret; | |
| 3011 | + | |
| 3012 | + if (!name || !*name) | |
| 3013 | + return NULL; | |
| 3014 | + | |
| 3015 | + ret = request_firmware(&fw, name, i915->drm.dev); | |
| 3016 | + if (ret) { | |
| 3017 | + drm_err(&i915->drm, | |
| 3018 | + "Requesting VBT firmware \"%s\" failed (%d)\n", | |
| 3019 | + name, ret); | |
| 3020 | + return NULL; | |
| 3021 | + } | |
| 3022 | + | |
| 3023 | + if (intel_bios_is_valid_vbt(i915, fw->data, fw->size)) { | |
| 3024 | + vbt = kmemdup(fw->data, fw->size, GFP_KERNEL); | |
| 3025 | + if (vbt) { | |
| 3026 | + drm_dbg_kms(&i915->drm, | |
| 3027 | + "Found valid VBT firmware \"%s\"\n", name); | |
| 3028 | + if (size) | |
| 3029 | + *size = fw->size; | |
| 3030 | + } | |
| 3031 | + } else { | |
| 3032 | + drm_dbg_kms(&i915->drm, "Invalid VBT firmware \"%s\"\n", | |
| 3033 | + name); | |
| 3034 | + } | |
| 3035 | + | |
| 3036 | + release_firmware(fw); | |
| 3037 | + | |
| 3038 | + return vbt; | |
| 3039 | +} | |
| 3040 | + | |
| 2984 | 3041 | static u32 intel_spi_read(struct intel_uncore *uncore, u32 offset) |
| 2985 | 3042 | { |
| 2986 | 3043 | intel_uncore_write(uncore, PRIMARY_SPI_ADDRESS, offset); |
| @@ -2988,7 +3045,8 @@ static u32 intel_spi_read(struct intel_uncore *uncore, u32 offset) · 1 unmodified line | ||
| 2988 | 3045 | return intel_uncore_read(uncore, PRIMARY_SPI_TRIGGER); |
| 2989 | 3046 | } |
| 2990 | 3047 | |
| 2991 | −static struct vbt_header *spi_oprom_get_vbt(struct drm_i915_private *i915) | |
| 3048 | +static struct vbt_header *spi_oprom_get_vbt(struct drm_i915_private *i915, | |
| 3049 | + size_t *size) | |
| 2992 | 3050 | { |
| 2993 | 3051 | u32 count, data, found, store = 0; |
| 2994 | 3052 | u32 static_region, oprom_offset; |
| @@ -3031,6 +3089,9 @@ static struct vbt_header *spi_oprom_get_vbt(struct drm_i915_private *i915) · 36 unmodified lines | ||
| 3031 | 3089 | |
| 3032 | 3090 | drm_dbg_kms(&i915->drm, "Found valid VBT in SPI flash\n"); |
| 3033 | 3091 | |
| 3092 | + if (size) | |
| 3093 | + *size = vbt_size; | |
| 3094 | + | |
| 3034 | 3095 | return (struct vbt_header *)vbt; |
| 3035 | 3096 | |
| 3036 | 3097 | err_free_vbt: |
| @@ -3039,7 +3100,8 @@ err_not_found: · 2 unmodified lines | ||
| 3039 | 3100 | return NULL; |
| 3040 | 3101 | } |
| 3041 | 3102 | |
| 3042 | −static struct vbt_header *oprom_get_vbt(struct drm_i915_private *i915) | |
| 3103 | +static struct vbt_header *oprom_get_vbt(struct drm_i915_private *i915, | |
| 3104 | + size_t *sizep) | |
| 3043 | 3105 | { |
| 3044 | 3106 | struct pci_dev *pdev = to_pci_dev(i915->drm.dev); |
| 3045 | 3107 | void __iomem *p = NULL, *oprom; |
| @@ -3088,6 +3150,9 @@ static struct vbt_header *oprom_get_vbt(struct drm_i915_private *i915) · 42 unmodified lines | ||
| 3088 | 3150 | |
| 3089 | 3151 | pci_unmap_rom(pdev, oprom); |
| 3090 | 3152 | |
| 3153 | + if (sizep) | |
| 3154 | + *sizep = vbt_size; | |
| 3155 | + | |
| 3091 | 3156 | drm_dbg_kms(&i915->drm, "Found valid VBT in PCI ROM\n"); |
| 3092 | 3157 | |
| 3093 | 3158 | return vbt; |
| @@ -3100,6 +3165,32 @@ err_unmap_oprom: · 6 unmodified lines | ||
| 3100 | 3165 | return NULL; |
| 3101 | 3166 | } |
| 3102 | 3167 | |
| 3168 | +static const struct vbt_header *intel_bios_get_vbt(struct drm_i915_private *i915, | |
| 3169 | + size_t *sizep) | |
| 3170 | +{ | |
| 3171 | + const struct vbt_header *vbt = NULL; | |
| 3172 | + intel_wakeref_t wakeref; | |
| 3173 | + | |
| 3174 | + vbt = firmware_get_vbt(i915, sizep); | |
| 3175 | + | |
| 3176 | + if (!vbt) | |
| 3177 | + vbt = intel_opregion_get_vbt(i915, sizep); | |
| 3178 | + | |
| 3179 | + /* | |
| 3180 | + * If the OpRegion does not have VBT, look in SPI flash | |
| 3181 | + * through MMIO or PCI mapping | |
| 3182 | + */ | |
| 3183 | + if (!vbt && IS_DGFX(i915)) | |
| 3184 | + with_intel_runtime_pm(&i915->runtime_pm, wakeref) | |
| 3185 | + vbt = spi_oprom_get_vbt(i915, sizep); | |
| 3186 | + | |
| 3187 | + if (!vbt) | |
| 3188 | + with_intel_runtime_pm(&i915->runtime_pm, wakeref) | |
| 3189 | + vbt = oprom_get_vbt(i915, sizep); | |
| 3190 | + | |
| 3191 | + return vbt; | |
| 3192 | +} | |
| 3193 | + | |
| 3103 | 3194 | /** |
| 3104 | 3195 | * intel_bios_init - find VBT and initialize settings from the BIOS |
| 3105 | 3196 | * @i915: i915 device instance |
| @@ -3111,7 +3202,6 @@ err_unmap_oprom: · 5 unmodified lines | ||
| 3111 | 3202 | void intel_bios_init(struct drm_i915_private *i915) |
| 3112 | 3203 | { |
| 3113 | 3204 | const struct vbt_header *vbt; |
| 3114 | − struct vbt_header *oprom_vbt = NULL; | |
| 3115 | 3205 | const struct bdb_header *bdb; |
| 3116 | 3206 | |
| 3117 | 3207 | INIT_LIST_HEAD(&i915->display.vbt.display_devices); |
| @@ -3125,21 +3215,7 @@ void intel_bios_init(struct drm_i915_private *i915) · 7 unmodified lines | ||
| 3125 | 3215 | |
| 3126 | 3216 | init_vbt_defaults(i915); |
| 3127 | 3217 | |
| 3128 | − vbt = intel_opregion_get_vbt(i915, NULL); | |
| 3129 | − | |
| 3130 | − /* | |
| 3131 | − * If the OpRegion does not have VBT, look in SPI flash through MMIO or | |
| 3132 | − * PCI mapping | |
| 3133 | − */ | |
| 3134 | − if (!vbt && IS_DGFX(i915)) { | |
| 3135 | − oprom_vbt = spi_oprom_get_vbt(i915); | |
| 3136 | − vbt = oprom_vbt; | |
| 3137 | − } | |
| 3138 | − | |
| 3139 | − if (!vbt) { | |
| 3140 | − oprom_vbt = oprom_get_vbt(i915); | |
| 3141 | − vbt = oprom_vbt; | |
| 3142 | − } | |
| 3218 | + vbt = intel_bios_get_vbt(i915, NULL); | |
| 3143 | 3219 | |
| 3144 | 3220 | if (!vbt) |
| 3145 | 3221 | goto out; |
| @@ -3172,7 +3248,7 @@ out: · 26 unmodified lines | ||
| 3172 | 3248 | parse_sdvo_device_mapping(i915); |
| 3173 | 3249 | parse_ddi_ports(i915); |
| 3174 | 3250 | |
| 3175 | − kfree(oprom_vbt); | |
| 3251 | + kfree(vbt); | |
| 3176 | 3252 | } |
| 3177 | 3253 | |
| 3178 | 3254 | static void intel_bios_init_panel(struct drm_i915_private *i915, |
| @@ -3344,8 +3420,7 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *i915, u8 *i2c_pin) · 165 unmodified lines | ||
| 3344 | 3420 | * additional data. Trust that if the VBT was written into |
| 3345 | 3421 | * the OpRegion then they have validated the LVDS's existence. |
| 3346 | 3422 | */ |
| 3347 | − if (intel_opregion_get_vbt(i915, NULL)) | |
| 3348 | − return true; | |
| 3423 | + return intel_opregion_vbt_present(i915); | |
| 3349 | 3424 | } |
| 3350 | 3425 | |
| 3351 | 3426 | return false; |
| @@ -3706,13 +3781,12 @@ static int intel_bios_vbt_show(struct seq_file *m, void *unused) · 354 unmodified lines | ||
| 3706 | 3781 | const void *vbt; |
| 3707 | 3782 | size_t vbt_size; |
| 3708 | 3783 | |
| 3709 | − /* | |
| 3710 | − * FIXME: VBT might originate from other places than opregion, and then | |
| 3711 | − * this would be incorrect. | |
| 3712 | − */ | |
| 3713 | − vbt = intel_opregion_get_vbt(i915, &vbt_size); | |
| 3714 | − if (vbt) | |
| 3784 | + vbt = intel_bios_get_vbt(i915, &vbt_size); | |
| 3785 | + | |
| 3786 | + if (vbt) { | |
| 3715 | 3787 | seq_write(m, vbt, vbt_size); |
| 3788 | + kfree(vbt); | |
| 3789 | + } | |
| 3716 | 3790 | |
| 3717 | 3791 | return 0; |
| 3718 | 3792 | } |
| @@ -52,7 +52,8 @@ struct intel_bw_state { · 51 unmodified lines | ||
| 52 | 52 | u8 num_active_planes[I915_MAX_PIPES]; |
| 53 | 53 | }; |
| 54 | 54 | |
| 55 | −#define to_intel_bw_state(x) container_of((x), struct intel_bw_state, base) | |
| 55 | +#define to_intel_bw_state(global_state) \ | |
| 56 | + container_of_const((global_state), struct intel_bw_state, base) | |
| 56 | 57 | |
| 57 | 58 | struct intel_bw_state * |
| 58 | 59 | intel_atomic_get_old_bw_state(struct intel_atomic_state *state); |
| @@ -39,6 +39,8 @@ · 38 unmodified lines | ||
| 39 | 39 | #include "intel_pcode.h" |
| 40 | 40 | #include "intel_psr.h" |
| 41 | 41 | #include "intel_vdsc.h" |
| 42 | +#include "skl_watermark.h" | |
| 43 | +#include "skl_watermark_regs.h" | |
| 42 | 44 | #include "vlv_sideband.h" |
| 43 | 45 | |
| 44 | 46 | /** |
| @@ -63,6 +65,32 @@ · 18 unmodified lines | ||
| 63 | 65 | * DMC will not change the active CDCLK frequency however, so that part |
| 64 | 66 | * will still be performed by the driver directly. |
| 65 | 67 | * |
| 68 | + * There are multiple components involved in the generation of the CDCLK | |
| 69 | + * frequency: | |
| 70 | + * | |
| 71 | + * - We have the CDCLK PLL, which generates an output clock based on a | |
| 72 | + * reference clock and a ratio parameter. | |
| 73 | + * - The CD2X Divider, which divides the output of the PLL based on a | |
| 74 | + * divisor selected from a set of pre-defined choices. | |
| 75 | + * - The CD2X Squasher, which further divides the output based on a | |
| 76 | + * waveform represented as a sequence of bits where each zero | |
| 77 | + * "squashes out" a clock cycle. | |
| 78 | + * - And, finally, a fixed divider that divides the output frequency by 2. | |
| 79 | + * | |
| 80 | + * As such, the resulting CDCLK frequency can be calculated with the | |
| 81 | + * following formula: | |
| 82 | + * | |
| 83 | + * cdclk = vco / cd2x_div / (sq_len / sq_div) / 2 | |
| 84 | + * | |
| 85 | + * , where vco is the frequency generated by the PLL; cd2x_div | |
| 86 | + * represents the CD2X Divider; sq_len and sq_div are the bit length | |
| 87 | + * and the number of high bits for the CD2X Squasher waveform, respectively; | |
| 88 | + * and 2 represents the fixed divider. | |
| 89 | + * | |
| 90 | + * Note that some older platforms do not contain the CD2X Divider | |
| 91 | + * and/or CD2X Squasher, in which case we can ignore their respective | |
| 92 | + * factors in the formula above. | |
| 93 | + * | |
| 66 | 94 | * Several methods exist to change the CDCLK frequency, which ones are |
| 67 | 95 | * supported depends on the platform: |
| 68 | 96 | * |
| @@ -993,15 +1021,14 @@ static int skl_cdclk_decimal(int cdclk) · 924 unmodified lines | ||
| 993 | 1021 | return DIV_ROUND_CLOSEST(cdclk - 1000, 500); |
| 994 | 1022 | } |
| 995 | 1023 | |
| 996 | −static void skl_set_preferred_cdclk_vco(struct drm_i915_private *dev_priv, | |
| 997 | − int vco) | |
| 1024 | +static void skl_set_preferred_cdclk_vco(struct drm_i915_private *i915, int vco) | |
| 998 | 1025 | { |
| 999 | − bool changed = dev_priv->skl_preferred_vco_freq != vco; | |
| 1026 | + bool changed = i915->display.cdclk.skl_preferred_vco_freq != vco; | |
| 1000 | 1027 | |
| 1001 | − dev_priv->skl_preferred_vco_freq = vco; | |
| 1028 | + i915->display.cdclk.skl_preferred_vco_freq = vco; | |
| 1002 | 1029 | |
| 1003 | 1030 | if (changed) |
| 1004 | − intel_update_max_cdclk(dev_priv); | |
| 1031 | + intel_update_max_cdclk(i915); | |
| 1005 | 1032 | } |
| 1006 | 1033 | |
| 1007 | 1034 | static u32 skl_dpll0_link_rate(struct drm_i915_private *dev_priv, int vco) |
| @@ -1205,7 +1232,7 @@ static void skl_cdclk_init_hw(struct drm_i915_private *dev_priv) · 197 unmodified lines | ||
| 1205 | 1232 | * Use the current vco as our initial |
| 1206 | 1233 | * guess as to what the preferred vco is. |
| 1207 | 1234 | */ |
| 1208 | − if (dev_priv->skl_preferred_vco_freq == 0) | |
| 1235 | + if (dev_priv->display.cdclk.skl_preferred_vco_freq == 0) | |
| 1209 | 1236 | skl_set_preferred_cdclk_vco(dev_priv, |
| 1210 | 1237 | dev_priv->display.cdclk.hw.vco); |
| 1211 | 1238 | return; |
| @@ -1213,7 +1240,7 @@ static void skl_cdclk_init_hw(struct drm_i915_private *dev_priv) · 1 unmodified line | ||
| 1213 | 1240 | |
| 1214 | 1241 | cdclk_config = dev_priv->display.cdclk.hw; |
| 1215 | 1242 | |
| 1216 | − cdclk_config.vco = dev_priv->skl_preferred_vco_freq; | |
| 1243 | + cdclk_config.vco = dev_priv->display.cdclk.skl_preferred_vco_freq; | |
| 1217 | 1244 | if (cdclk_config.vco == 0) |
| 1218 | 1245 | cdclk_config.vco = 8100000; |
| 1219 | 1246 | cdclk_config.cdclk = skl_calc_cdclk(0, cdclk_config.vco); |
| @@ -1391,7 +1418,7 @@ static const struct intel_cdclk_vals mtl_cdclk_table[] = { · 171 unmodified lines | ||
| 1391 | 1418 | {} |
| 1392 | 1419 | }; |
| 1393 | 1420 | |
| 1394 | −static const struct intel_cdclk_vals lnl_cdclk_table[] = { | |
| 1421 | +static const struct intel_cdclk_vals xe2lpd_cdclk_table[] = { | |
| 1395 | 1422 | { .refclk = 38400, .cdclk = 153600, .ratio = 16, .waveform = 0xaaaa }, |
| 1396 | 1423 | { .refclk = 38400, .cdclk = 172800, .ratio = 16, .waveform = 0xad5a }, |
| 1397 | 1424 | { .refclk = 38400, .cdclk = 192000, .ratio = 16, .waveform = 0xb6b6 }, |
| @@ -1656,6 +1683,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, · 258 unmodified lines | ||
| 1656 | 1683 | } |
| 1657 | 1684 | |
| 1658 | 1685 | out: |
| 1686 | + if (DISPLAY_VER(dev_priv) >= 20) | |
| 1687 | + cdclk_config->joined_mbus = intel_de_read(dev_priv, MBUS_CTL) & MBUS_JOIN; | |
| 1659 | 1688 | /* |
| 1660 | 1689 | * Can't read this out :( Let's assume it's |
| 1661 | 1690 | * at least what the CDCLK frequency requires. |
| @@ -1850,6 +1879,37 @@ static bool cdclk_pll_is_unknown(unsigned int vco) · 188 unmodified lines | ||
| 1850 | 1879 | return vco == ~0; |
| 1851 | 1880 | } |
| 1852 | 1881 | |
| 1882 | +static bool mdclk_source_is_cdclk_pll(struct drm_i915_private *i915) | |
| 1883 | +{ | |
| 1884 | + return DISPLAY_VER(i915) >= 20; | |
| 1885 | +} | |
| 1886 | + | |
| 1887 | +static u32 xe2lpd_mdclk_source_sel(struct drm_i915_private *i915) | |
| 1888 | +{ | |
| 1889 | + if (mdclk_source_is_cdclk_pll(i915)) | |
| 1890 | + return MDCLK_SOURCE_SEL_CDCLK_PLL; | |
| 1891 | + | |
| 1892 | + return MDCLK_SOURCE_SEL_CD2XCLK; | |
| 1893 | +} | |
| 1894 | + | |
| 1895 | +int intel_mdclk_cdclk_ratio(struct drm_i915_private *i915, | |
| 1896 | + const struct intel_cdclk_config *cdclk_config) | |
| 1897 | +{ | |
| 1898 | + if (mdclk_source_is_cdclk_pll(i915)) | |
| 1899 | + return DIV_ROUND_UP(cdclk_config->vco, cdclk_config->cdclk); | |
| 1900 | + | |
| 1901 | + /* Otherwise, source for MDCLK is CD2XCLK. */ | |
| 1902 | + return 2; | |
| 1903 | +} | |
| 1904 | + | |
| 1905 | +static void xe2lpd_mdclk_cdclk_ratio_program(struct drm_i915_private *i915, | |
| 1906 | + const struct intel_cdclk_config *cdclk_config) | |
| 1907 | +{ | |
| 1908 | + intel_dbuf_mdclk_cdclk_ratio_update(i915, | |
| 1909 | + intel_mdclk_cdclk_ratio(i915, cdclk_config), | |
| 1910 | + cdclk_config->joined_mbus); | |
| 1911 | +} | |
| 1912 | + | |
| 1853 | 1913 | static bool cdclk_compute_crawl_and_squash_midpoint(struct drm_i915_private *i915, |
| 1854 | 1914 | const struct intel_cdclk_config *old_cdclk_config, |
| 1855 | 1915 | const struct intel_cdclk_config *new_cdclk_config, |
| @@ -1954,7 +2014,7 @@ static u32 bxt_cdclk_ctl(struct drm_i915_private *i915, · 98 unmodified lines | ||
| 1954 | 2014 | val |= BXT_CDCLK_SSA_PRECHARGE_ENABLE; |
| 1955 | 2015 | |
| 1956 | 2016 | if (DISPLAY_VER(i915) >= 20) |
| 1957 | − val |= MDCLK_SOURCE_SEL_CDCLK_PLL; | |
| 2017 | + val |= xe2lpd_mdclk_source_sel(i915); | |
| 1958 | 2018 | else |
| 1959 | 2019 | val |= skl_cdclk_decimal(cdclk); |
| 1960 | 2020 | |
| @@ -1967,7 +2027,6 @@ static void _bxt_set_cdclk(struct drm_i915_private *dev_priv, · 6 unmodified lines | ||
| 1967 | 2027 | { |
| 1968 | 2028 | int cdclk = cdclk_config->cdclk; |
| 1969 | 2029 | int vco = cdclk_config->vco; |
| 1970 | − u16 waveform; | |
| 1971 | 2030 | |
| 1972 | 2031 | if (HAS_CDCLK_CRAWL(dev_priv) && dev_priv->display.cdclk.hw.vco > 0 && vco > 0 && |
| 1973 | 2032 | !cdclk_pll_is_unknown(dev_priv->display.cdclk.hw.vco)) { |
| @@ -1982,10 +2041,11 @@ static void _bxt_set_cdclk(struct drm_i915_private *dev_priv, · 8 unmodified lines | ||
| 1982 | 2041 | } else |
| 1983 | 2042 | bxt_cdclk_pll_update(dev_priv, vco); |
| 1984 | 2043 | |
| 1985 | − waveform = cdclk_squash_waveform(dev_priv, cdclk); | |
| 2044 | + if (HAS_CDCLK_SQUASH(dev_priv)) { | |
| 2045 | + u16 waveform = cdclk_squash_waveform(dev_priv, cdclk); | |
| 1986 | 2046 | |
| 1987 | − if (HAS_CDCLK_SQUASH(dev_priv)) | |
| 1988 | 2047 | dg2_cdclk_squash_program(dev_priv, waveform); |
| 2048 | + } | |
| 1989 | 2049 | |
| 1990 | 2050 | intel_de_write(dev_priv, CDCLK_CTL, bxt_cdclk_ctl(dev_priv, cdclk_config, pipe)); |
| 1991 | 2051 | |
| @@ -2030,6 +2090,9 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, · 38 unmodified lines | ||
| 2030 | 2090 | return; |
| 2031 | 2091 | } |
| 2032 | 2092 | |
| 2093 | + if (DISPLAY_VER(dev_priv) >= 20 && cdclk < dev_priv->display.cdclk.hw.cdclk) | |
| 2094 | + xe2lpd_mdclk_cdclk_ratio_program(dev_priv, cdclk_config); | |
| 2095 | + | |
| 2033 | 2096 | if (cdclk_compute_crawl_and_squash_midpoint(dev_priv, &dev_priv->display.cdclk.hw, |
| 2034 | 2097 | cdclk_config, &mid_cdclk_config)) { |
| 2035 | 2098 | _bxt_set_cdclk(dev_priv, &mid_cdclk_config, pipe); |
| @@ -2038,6 +2101,9 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, · 2 unmodified lines | ||
| 2038 | 2101 | _bxt_set_cdclk(dev_priv, cdclk_config, pipe); |
| 2039 | 2102 | } |
| 2040 | 2103 | |
| 2104 | + if (DISPLAY_VER(dev_priv) >= 20 && cdclk > dev_priv->display.cdclk.hw.cdclk) | |
| 2105 | + xe2lpd_mdclk_cdclk_ratio_program(dev_priv, cdclk_config); | |
| 2106 | + | |
| 2041 | 2107 | if (DISPLAY_VER(dev_priv) >= 14) |
| 2042 | 2108 | /* |
| 2043 | 2109 | * NOOP - No Pcode communication needed for |
| @@ -2260,16 +2326,15 @@ static bool intel_cdclk_can_squash(struct drm_i915_private *dev_priv, · 216 unmodified lines | ||
| 2260 | 2326 | } |
| 2261 | 2327 | |
| 2262 | 2328 | /** |
| 2263 | − * intel_cdclk_needs_modeset - Determine if changong between the CDCLK | |
| 2264 | − * configurations requires a modeset on all pipes | |
| 2329 | + * intel_cdclk_clock_changed - Check whether the clock changed | |
| 2265 | 2330 | * @a: first CDCLK configuration |
| 2266 | 2331 | * @b: second CDCLK configuration |
| 2267 | 2332 | * |
| 2268 | 2333 | * Returns: |
| 2269 | − * True if changing between the two CDCLK configurations | |
| 2270 | − * requires all pipes to be off, false if not. | |
| 2334 | + * True if CDCLK changed in a way that requires re-programming and | |
| 2335 | + * False otherwise. | |
| 2271 | 2336 | */ |
| 2272 | −bool intel_cdclk_needs_modeset(const struct intel_cdclk_config *a, | |
| 2337 | +bool intel_cdclk_clock_changed(const struct intel_cdclk_config *a, | |
| 2273 | 2338 | const struct intel_cdclk_config *b) |
| 2274 | 2339 | { |
| 2275 | 2340 | return a->cdclk != b->cdclk || |
| @@ -2322,7 +2387,7 @@ static bool intel_cdclk_can_cd2x_update(struct drm_i915_private *dev_priv, · 46 unmodified lines | ||
| 2322 | 2387 | static bool intel_cdclk_changed(const struct intel_cdclk_config *a, |
| 2323 | 2388 | const struct intel_cdclk_config *b) |
| 2324 | 2389 | { |
| 2325 | − return intel_cdclk_needs_modeset(a, b) || | |
| 2390 | + return intel_cdclk_clock_changed(a, b) || | |
| 2326 | 2391 | a->voltage_level != b->voltage_level; |
| 2327 | 2392 | } |
| 2328 | 2393 | |
| @@ -2368,18 +2433,9 @@ static void intel_pcode_notify(struct drm_i915_private *i915, · 39 unmodified lines | ||
| 2368 | 2433 | ret); |
| 2369 | 2434 | } |
| 2370 | 2435 | |
| 2371 | −/** | |
| 2372 | − * intel_set_cdclk - Push the CDCLK configuration to the hardware | |
| 2373 | − * @dev_priv: i915 device | |
| 2374 | − * @cdclk_config: new CDCLK configuration | |
| 2375 | − * @pipe: pipe with which to synchronize the update | |
| 2376 | − * | |
| 2377 | − * Program the hardware based on the passed in CDCLK state, | |
| 2378 | − * if necessary. | |
| 2379 | − */ | |
| 2380 | 2436 | static void intel_set_cdclk(struct drm_i915_private *dev_priv, |
| 2381 | 2437 | const struct intel_cdclk_config *cdclk_config, |
| 2382 | − enum pipe pipe) | |
| 2438 | + enum pipe pipe, const char *context) | |
| 2383 | 2439 | { |
| 2384 | 2440 | struct intel_encoder *encoder; |
| 2385 | 2441 | |
| @@ -2389,7 +2445,7 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv, · 3 unmodified lines | ||
| 2389 | 2445 | if (drm_WARN_ON_ONCE(&dev_priv->drm, !dev_priv->display.funcs.cdclk->set_cdclk)) |
| 2390 | 2446 | return; |
| 2391 | 2447 | |
| 2392 | − intel_cdclk_dump_config(dev_priv, cdclk_config, "Changing CDCLK to"); | |
| 2448 | + intel_cdclk_dump_config(dev_priv, cdclk_config, context); | |
| 2393 | 2449 | |
| 2394 | 2450 | for_each_intel_encoder_with_psr(&dev_priv->drm, encoder) { |
| 2395 | 2451 | struct intel_dp *intel_dp = enc_to_intel_dp(encoder); |
| @@ -2519,6 +2575,17 @@ static void intel_cdclk_pcode_post_notify(struct intel_atomic_state *state) · 123 unmodified lines | ||
| 2519 | 2575 | update_cdclk, update_pipe_count); |
| 2520 | 2576 | } |
| 2521 | 2577 | |
| 2578 | +bool intel_cdclk_is_decreasing_later(struct intel_atomic_state *state) | |
| 2579 | +{ | |
| 2580 | + const struct intel_cdclk_state *old_cdclk_state = | |
| 2581 | + intel_atomic_get_old_cdclk_state(state); | |
| 2582 | + const struct intel_cdclk_state *new_cdclk_state = | |
| 2583 | + intel_atomic_get_new_cdclk_state(state); | |
| 2584 | + | |
| 2585 | + return new_cdclk_state && !new_cdclk_state->disable_pipes && | |
| 2586 | + new_cdclk_state->actual.cdclk < old_cdclk_state->actual.cdclk; | |
| 2587 | +} | |
| 2588 | + | |
| 2522 | 2589 | /** |
| 2523 | 2590 | * intel_set_cdclk_pre_plane_update - Push the CDCLK state to the hardware |
| 2524 | 2591 | * @state: intel atomic state |
| @@ -2534,7 +2601,8 @@ intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state) · 9 unmodified lines | ||
| 2534 | 2601 | intel_atomic_get_old_cdclk_state(state); |
| 2535 | 2602 | const struct intel_cdclk_state *new_cdclk_state = |
| 2536 | 2603 | intel_atomic_get_new_cdclk_state(state); |
| 2537 | − enum pipe pipe = new_cdclk_state->pipe; | |
| 2604 | + struct intel_cdclk_config cdclk_config; | |
| 2605 | + enum pipe pipe; | |
| 2538 | 2606 | |
| 2539 | 2607 | if (!intel_cdclk_changed(&old_cdclk_state->actual, |
| 2540 | 2608 | &new_cdclk_state->actual)) |
| @@ -2543,12 +2611,32 @@ intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state) · 2 unmodified lines | ||
| 2543 | 2611 | if (IS_DG2(i915)) |
| 2544 | 2612 | intel_cdclk_pcode_pre_notify(state); |
| 2545 | 2613 | |
| 2546 | − if (pipe == INVALID_PIPE || | |
| 2547 | − old_cdclk_state->actual.cdclk <= new_cdclk_state->actual.cdclk) { | |
| 2548 | − drm_WARN_ON(&i915->drm, !new_cdclk_state->base.changed); | |
| 2614 | + if (new_cdclk_state->disable_pipes) { | |
| 2615 | + cdclk_config = new_cdclk_state->actual; | |
| 2616 | + pipe = INVALID_PIPE; | |
| 2617 | + } else { | |
| 2618 | + if (new_cdclk_state->actual.cdclk >= old_cdclk_state->actual.cdclk) { | |
| 2619 | + cdclk_config = new_cdclk_state->actual; | |
| 2620 | + pipe = new_cdclk_state->pipe; | |
| 2621 | + } else { | |
| 2622 | + cdclk_config = old_cdclk_state->actual; | |
| 2623 | + pipe = INVALID_PIPE; | |
| 2624 | + } | |
| 2549 | 2625 | |
| 2550 | − intel_set_cdclk(i915, &new_cdclk_state->actual, pipe); | |
| 2626 | + cdclk_config.voltage_level = max(new_cdclk_state->actual.voltage_level, | |
| 2627 | + old_cdclk_state->actual.voltage_level); | |
| 2551 | 2628 | } |
| 2629 | + | |
| 2630 | + /* | |
| 2631 | + * mbus joining will be changed later by | |
| 2632 | + * intel_dbuf_mbus_{pre,post}_ddb_update() | |
| 2633 | + */ | |
| 2634 | + cdclk_config.joined_mbus = old_cdclk_state->actual.joined_mbus; | |
| 2635 | + | |
| 2636 | + drm_WARN_ON(&i915->drm, !new_cdclk_state->base.changed); | |
| 2637 | + | |
| 2638 | + intel_set_cdclk(i915, &cdclk_config, pipe, | |
| 2639 | + "Pre changing CDCLK to"); | |
| 2552 | 2640 | } |
| 2553 | 2641 | |
| 2554 | 2642 | /** |
| @@ -2566,7 +2654,7 @@ intel_set_cdclk_post_plane_update(struct intel_atomic_state *state) · 11 unmodified lines | ||
| 2566 | 2654 | intel_atomic_get_old_cdclk_state(state); |
| 2567 | 2655 | const struct intel_cdclk_state *new_cdclk_state = |
| 2568 | 2656 | intel_atomic_get_new_cdclk_state(state); |
| 2569 | − enum pipe pipe = new_cdclk_state->pipe; | |
| 2657 | + enum pipe pipe; | |
| 2570 | 2658 | |
| 2571 | 2659 | if (!intel_cdclk_changed(&old_cdclk_state->actual, |
| 2572 | 2660 | &new_cdclk_state->actual)) |
| @@ -2575,12 +2663,16 @@ intel_set_cdclk_post_plane_update(struct intel_atomic_state *state) · 2 unmodified lines | ||
| 2575 | 2663 | if (IS_DG2(i915)) |
| 2576 | 2664 | intel_cdclk_pcode_post_notify(state); |
| 2577 | 2665 | |
| 2578 | − if (pipe != INVALID_PIPE && | |
| 2579 | − old_cdclk_state->actual.cdclk > new_cdclk_state->actual.cdclk) { | |
| 2580 | − drm_WARN_ON(&i915->drm, !new_cdclk_state->base.changed); | |
| 2666 | + if (!new_cdclk_state->disable_pipes && | |
| 2667 | + new_cdclk_state->actual.cdclk < old_cdclk_state->actual.cdclk) | |
| 2668 | + pipe = new_cdclk_state->pipe; | |
| 2669 | + else | |
| 2670 | + pipe = INVALID_PIPE; | |
| 2581 | 2671 | |
| 2582 | − intel_set_cdclk(i915, &new_cdclk_state->actual, pipe); | |
| 2583 | − } | |
| 2672 | + drm_WARN_ON(&i915->drm, !new_cdclk_state->base.changed); | |
| 2673 | + | |
| 2674 | + intel_set_cdclk(i915, &new_cdclk_state->actual, pipe, | |
| 2675 | + "Post changing CDCLK to"); | |
| 2584 | 2676 | } |
| 2585 | 2677 | |
| 2586 | 2678 | static int intel_pixel_rate_to_cdclk(const struct intel_crtc_state *crtc_state) |
| @@ -2731,25 +2823,6 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state) · 144 unmodified lines | ||
| 2731 | 2823 | if (crtc_state->dsc.compression_enable) |
| 2732 | 2824 | min_cdclk = max(min_cdclk, intel_vdsc_min_cdclk(crtc_state)); |
| 2733 | 2825 | |
| 2734 | − /* | |
| 2735 | − * HACK. Currently for TGL/DG2 platforms we calculate | |
| 2736 | − * min_cdclk initially based on pixel_rate divided | |
| 2737 | − * by 2, accounting for also plane requirements, | |
| 2738 | − * however in some cases the lowest possible CDCLK | |
| 2739 | − * doesn't work and causing the underruns. | |
| 2740 | − * Explicitly stating here that this seems to be currently | |
| 2741 | − * rather a Hack, than final solution. | |
| 2742 | − */ | |
| 2743 | − if (IS_TIGERLAKE(dev_priv) || IS_DG2(dev_priv)) { | |
| 2744 | − /* | |
| 2745 | − * Clamp to max_cdclk_freq in case pixel rate is higher, | |
| 2746 | − * in order not to break an 8K, but still leave W/A at place. | |
| 2747 | − */ | |
| 2748 | − min_cdclk = max_t(int, min_cdclk, | |
| 2749 | − min_t(int, crtc_state->pixel_rate, | |
| 2750 | − dev_priv->display.cdclk.max_cdclk_freq)); | |
| 2751 | − } | |
| 2752 | − | |
| 2753 | 2826 | return min_cdclk; |
| 2754 | 2827 | } |
| 2755 | 2828 | |
| @@ -2937,7 +3010,7 @@ static int skl_dpll0_vco(struct intel_cdclk_state *cdclk_state) · 181 unmodified lines | ||
| 2937 | 3010 | |
| 2938 | 3011 | vco = cdclk_state->logical.vco; |
| 2939 | 3012 | if (!vco) |
| 2940 | − vco = dev_priv->skl_preferred_vco_freq; | |
| 3013 | + vco = dev_priv->display.cdclk.skl_preferred_vco_freq; | |
| 2941 | 3014 | |
| 2942 | 3015 | for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) { |
| 2943 | 3016 | if (!crtc_state->hw.enable) |
| @@ -3058,6 +3131,7 @@ static struct intel_global_state *intel_cdclk_duplicate_state(struct intel_globa · 114 unmodified lines | ||
| 3058 | 3131 | return NULL; |
| 3059 | 3132 | |
| 3060 | 3133 | cdclk_state->pipe = INVALID_PIPE; |
| 3134 | + cdclk_state->disable_pipes = false; | |
| 3061 | 3135 | |
| 3062 | 3136 | return &cdclk_state->base; |
| 3063 | 3137 | } |
| @@ -3121,6 +3195,20 @@ int intel_cdclk_atomic_check(struct intel_atomic_state *state, · 57 unmodified lines | ||
| 3121 | 3195 | return 0; |
| 3122 | 3196 | } |
| 3123 | 3197 | |
| 3198 | +int intel_cdclk_state_set_joined_mbus(struct intel_atomic_state *state, bool joined_mbus) | |
| 3199 | +{ | |
| 3200 | + struct intel_cdclk_state *cdclk_state; | |
| 3201 | + | |
| 3202 | + cdclk_state = intel_atomic_get_cdclk_state(state); | |
| 3203 | + if (IS_ERR(cdclk_state)) | |
| 3204 | + return PTR_ERR(cdclk_state); | |
| 3205 | + | |
| 3206 | + cdclk_state->actual.joined_mbus = joined_mbus; | |
| 3207 | + cdclk_state->logical.joined_mbus = joined_mbus; | |
| 3208 | + | |
| 3209 | + return intel_atomic_lock_global_state(&cdclk_state->base); | |
| 3210 | +} | |
| 3211 | + | |
| 3124 | 3212 | int intel_cdclk_init(struct drm_i915_private *dev_priv) |
| 3125 | 3213 | { |
| 3126 | 3214 | struct intel_cdclk_state *cdclk_state; |
| @@ -3229,17 +3317,28 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) · 102 unmodified lines | ||
| 3229 | 3317 | drm_dbg_kms(&dev_priv->drm, |
| 3230 | 3318 | "Can change cdclk cd2x divider with pipe %c active\n", |
| 3231 | 3319 | pipe_name(pipe)); |
| 3232 | − } else if (intel_cdclk_needs_modeset(&old_cdclk_state->actual, | |
| 3320 | + } else if (intel_cdclk_clock_changed(&old_cdclk_state->actual, | |
| 3233 | 3321 | &new_cdclk_state->actual)) { |
| 3234 | 3322 | /* All pipes must be switched off while we change the cdclk. */ |
| 3235 | 3323 | ret = intel_modeset_all_pipes_late(state, "CDCLK change"); |
| 3236 | 3324 | if (ret) |
| 3237 | 3325 | return ret; |
| 3238 | 3326 | |
| 3327 | + new_cdclk_state->disable_pipes = true; | |
| 3328 | + | |
| 3239 | 3329 | drm_dbg_kms(&dev_priv->drm, |
| 3240 | 3330 | "Modeset required for cdclk change\n"); |
| 3241 | 3331 | } |
| 3242 | 3332 | |
| 3333 | + if (intel_mdclk_cdclk_ratio(dev_priv, &old_cdclk_state->actual) != | |
| 3334 | + intel_mdclk_cdclk_ratio(dev_priv, &new_cdclk_state->actual)) { | |
| 3335 | + int ratio = intel_mdclk_cdclk_ratio(dev_priv, &new_cdclk_state->actual); | |
| 3336 | + | |
| 3337 | + ret = intel_dbuf_state_set_mdclk_cdclk_ratio(state, ratio); | |
| 3338 | + if (ret) | |
| 3339 | + return ret; | |
| 3340 | + } | |
| 3341 | + | |
| 3243 | 3342 | drm_dbg_kms(&dev_priv->drm, |
| 3244 | 3343 | "New cdclk calculated to be logical %u kHz, actual %u kHz\n", |
| 3245 | 3344 | new_cdclk_state->logical.cdclk, |
| @@ -3297,7 +3396,7 @@ void intel_update_max_cdclk(struct drm_i915_private *dev_priv) · 51 unmodified lines | ||
| 3297 | 3396 | u32 limit = intel_de_read(dev_priv, SKL_DFSM) & SKL_DFSM_CDCLK_LIMIT_MASK; |
| 3298 | 3397 | int max_cdclk, vco; |
| 3299 | 3398 | |
| 3300 | − vco = dev_priv->skl_preferred_vco_freq; | |
| 3399 | + vco = dev_priv->display.cdclk.skl_preferred_vco_freq; | |
| 3301 | 3400 | drm_WARN_ON(&dev_priv->drm, vco != 8100000 && vco != 8640000); |
| 3302 | 3401 | |
| 3303 | 3402 | /* |
| @@ -3339,13 +3438,13 @@ void intel_update_max_cdclk(struct drm_i915_private *dev_priv) · 35 unmodified lines | ||
| 3339 | 3438 | dev_priv->display.cdclk.max_cdclk_freq = dev_priv->display.cdclk.hw.cdclk; |
| 3340 | 3439 | } |
| 3341 | 3440 | |
| 3342 | − dev_priv->max_dotclk_freq = intel_compute_max_dotclk(dev_priv); | |
| 3441 | + dev_priv->display.cdclk.max_dotclk_freq = intel_compute_max_dotclk(dev_priv); | |
| 3343 | 3442 | |
| 3344 | 3443 | drm_dbg(&dev_priv->drm, "Max CD clock rate: %d kHz\n", |
| 3345 | 3444 | dev_priv->display.cdclk.max_cdclk_freq); |
| 3346 | 3445 | |
| 3347 | 3446 | drm_dbg(&dev_priv->drm, "Max dotclock rate: %d kHz\n", |
| 3348 | − dev_priv->max_dotclk_freq); | |
| 3447 | + dev_priv->display.cdclk.max_dotclk_freq); | |
| 3349 | 3448 | } |
| 3350 | 3449 | |
| 3351 | 3450 | /** |
| @@ -3519,7 +3618,7 @@ static int i915_cdclk_info_show(struct seq_file *m, void *unused) · 167 unmodified lines | ||
| 3519 | 3618 | |
| 3520 | 3619 | seq_printf(m, "Current CD clock frequency: %d kHz\n", i915->display.cdclk.hw.cdclk); |
| 3521 | 3620 | seq_printf(m, "Max CD clock frequency: %d kHz\n", i915->display.cdclk.max_cdclk_freq); |
| 3522 | − seq_printf(m, "Max pixel clock frequency: %d kHz\n", i915->max_dotclk_freq); | |
| 3621 | + seq_printf(m, "Max pixel clock frequency: %d kHz\n", i915->display.cdclk.max_dotclk_freq); | |
| 3523 | 3622 | |
| 3524 | 3623 | return 0; |
| 3525 | 3624 | } |
| @@ -3534,13 +3633,6 @@ void intel_cdclk_debugfs_register(struct drm_i915_private *i915) · 8 unmodified lines | ||
| 3534 | 3633 | i915, &i915_cdclk_info_fops); |
| 3535 | 3634 | } |
| 3536 | 3635 | |
| 3537 | −static const struct intel_cdclk_funcs mtl_cdclk_funcs = { | |
| 3538 | − .get_cdclk = bxt_get_cdclk, | |
| 3539 | − .set_cdclk = bxt_set_cdclk, | |
| 3540 | − .modeset_calc_cdclk = bxt_modeset_calc_cdclk, | |
| 3541 | − .calc_voltage_level = rplu_calc_voltage_level, | |
| 3542 | −}; | |
| 3543 | − | |
| 3544 | 3636 | static const struct intel_cdclk_funcs rplu_cdclk_funcs = { |
| 3545 | 3637 | .get_cdclk = bxt_get_cdclk, |
| 3546 | 3638 | .set_cdclk = bxt_set_cdclk, |
| @@ -3684,10 +3776,10 @@ static const struct intel_cdclk_funcs i830_cdclk_funcs = { · 137 unmodified lines | ||
| 3684 | 3776 | void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) |
| 3685 | 3777 | { |
| 3686 | 3778 | if (DISPLAY_VER(dev_priv) >= 20) { |
| 3687 | − dev_priv->display.funcs.cdclk = &mtl_cdclk_funcs; | |
| 3688 | − dev_priv->display.cdclk.table = lnl_cdclk_table; | |
| 3779 | + dev_priv->display.funcs.cdclk = &rplu_cdclk_funcs; | |
| 3780 | + dev_priv->display.cdclk.table = xe2lpd_cdclk_table; | |
| 3689 | 3781 | } else if (DISPLAY_VER(dev_priv) >= 14) { |
| 3690 | − dev_priv->display.funcs.cdclk = &mtl_cdclk_funcs; | |
| 3782 | + dev_priv->display.funcs.cdclk = &rplu_cdclk_funcs; | |
| 3691 | 3783 | dev_priv->display.cdclk.table = mtl_cdclk_table; |
| 3692 | 3784 | } else if (IS_DG2(dev_priv)) { |
| 3693 | 3785 | dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; |
| @@ -18,6 +18,8 @@ struct intel_crtc_state; · 17 unmodified lines | ||
| 18 | 18 | struct intel_cdclk_config { |
| 19 | 19 | unsigned int cdclk, vco, ref, bypass; |
| 20 | 20 | u8 voltage_level; |
| 21 | + /* This field is only valid for Xe2LPD and above. */ | |
| 22 | + bool joined_mbus; | |
| 21 | 23 | }; |
| 22 | 24 | |
| 23 | 25 | struct intel_cdclk_state { |
| @@ -51,6 +53,9 @@ struct intel_cdclk_state { · 27 unmodified lines | ||
| 51 | 53 | |
| 52 | 54 | /* bitmask of active pipes */ |
| 53 | 55 | u8 active_pipes; |
| 56 | + | |
| 57 | + /* update cdclk with pipes disabled */ | |
| 58 | + bool disable_pipes; | |
| 54 | 59 | }; |
| 55 | 60 | |
| 56 | 61 | int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state); |
| @@ -60,8 +65,11 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv); · 3 unmodified lines | ||
| 60 | 65 | void intel_update_max_cdclk(struct drm_i915_private *dev_priv); |
| 61 | 66 | void intel_update_cdclk(struct drm_i915_private *dev_priv); |
| 62 | 67 | u32 intel_read_rawclk(struct drm_i915_private *dev_priv); |
| 63 | −bool intel_cdclk_needs_modeset(const struct intel_cdclk_config *a, | |
| 68 | +bool intel_cdclk_clock_changed(const struct intel_cdclk_config *a, | |
| 64 | 69 | const struct intel_cdclk_config *b); |
| 70 | +int intel_mdclk_cdclk_ratio(struct drm_i915_private *i915, | |
| 71 | + const struct intel_cdclk_config *cdclk_config); | |
| 72 | +bool intel_cdclk_is_decreasing_later(struct intel_atomic_state *state); | |
| 65 | 73 | void intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state); |
| 66 | 74 | void intel_set_cdclk_post_plane_update(struct intel_atomic_state *state); |
| 67 | 75 | void intel_cdclk_dump_config(struct drm_i915_private *i915, |
| @@ -72,10 +80,13 @@ void intel_cdclk_get_cdclk(struct drm_i915_private *dev_priv, · 4 unmodified lines | ||
| 72 | 80 | struct intel_cdclk_config *cdclk_config); |
| 73 | 81 | int intel_cdclk_atomic_check(struct intel_atomic_state *state, |
| 74 | 82 | bool *need_cdclk_calc); |
| 83 | +int intel_cdclk_state_set_joined_mbus(struct intel_atomic_state *state, bool joined_mbus); | |
| 75 | 84 | struct intel_cdclk_state * |
| 76 | 85 | intel_atomic_get_cdclk_state(struct intel_atomic_state *state); |
| 77 | 86 | |
| 78 | −#define to_intel_cdclk_state(x) container_of((x), struct intel_cdclk_state, base) | |
| 87 | +#define to_intel_cdclk_state(global_state) \ | |
| 88 | + container_of_const((global_state), struct intel_cdclk_state, base) | |
| 89 | + | |
| 79 | 90 | #define intel_atomic_get_old_cdclk_state(state) \ |
| 80 | 91 | to_intel_cdclk_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.cdclk.obj)) |
| 81 | 92 | #define intel_atomic_get_new_cdclk_state(state) \ |
| @@ -25,28 +25,26 @@ · 24 unmodified lines | ||
| 25 | 25 | 4 * (dw)) |
| 26 | 26 | |
| 27 | 27 | #define ICL_PORT_CL_DW5(phy) _MMIO(_ICL_PORT_CL_DW(5, phy)) |
| 28 | −#define CL_POWER_DOWN_ENABLE (1 << 4) | |
| 29 | −#define SUS_CLOCK_CONFIG (3 << 0) | |
| 28 | +#define CL_POWER_DOWN_ENABLE REG_BIT(4) | |
| 29 | +#define SUS_CLOCK_CONFIG REG_GENMASK(1, 0) | |
| 30 | 30 | |
| 31 | 31 | #define ICL_PORT_CL_DW10(phy) _MMIO(_ICL_PORT_CL_DW(10, phy)) |
| 32 | −#define PG_SEQ_DELAY_OVERRIDE_MASK (3 << 25) | |
| 33 | −#define PG_SEQ_DELAY_OVERRIDE_SHIFT 25 | |
| 34 | −#define PG_SEQ_DELAY_OVERRIDE_ENABLE (1 << 24) | |
| 35 | −#define PWR_UP_ALL_LANES (0x0 << 4) | |
| 36 | −#define PWR_DOWN_LN_3_2_1 (0xe << 4) | |
| 37 | −#define PWR_DOWN_LN_3_2 (0xc << 4) | |
| 38 | −#define PWR_DOWN_LN_3 (0x8 << 4) | |
| 39 | −#define PWR_DOWN_LN_2_1_0 (0x7 << 4) | |
| 40 | −#define PWR_DOWN_LN_1_0 (0x3 << 4) | |
| 41 | −#define PWR_DOWN_LN_3_1 (0xa << 4) | |
| 42 | −#define PWR_DOWN_LN_3_1_0 (0xb << 4) | |
| 43 | −#define PWR_DOWN_LN_MASK (0xf << 4) | |
| 44 | −#define PWR_DOWN_LN_SHIFT 4 | |
| 45 | −#define EDP4K2K_MODE_OVRD_EN (1 << 3) | |
| 46 | −#define EDP4K2K_MODE_OVRD_OPTIMIZED (1 << 2) | |
| 32 | +#define PG_SEQ_DELAY_OVERRIDE_MASK REG_GENMASK(26, 25) | |
| 33 | +#define PG_SEQ_DELAY_OVERRIDE_ENABLE REG_BIT(24) | |
| 34 | +#define PWR_DOWN_LN_MASK REG_GENMASK(7, 4) | |
| 35 | +#define PWR_UP_ALL_LANES REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0x0) | |
| 36 | +#define PWR_DOWN_LN_3_2_1 REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0xe) | |
| 37 | +#define PWR_DOWN_LN_3_2 REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0xc) | |
| 38 | +#define PWR_DOWN_LN_3 REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0x8) | |
| 39 | +#define PWR_DOWN_LN_2_1_0 REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0x7) | |
| 40 | +#define PWR_DOWN_LN_1_0 REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0x3) | |
| 41 | +#define PWR_DOWN_LN_3_1 REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0xa) | |
| 42 | +#define PWR_DOWN_LN_3_1_0 REG_FIELD_PREP(PWR_DOWN_LN_MASK, 0xb) | |
| 43 | +#define EDP4K2K_MODE_OVRD_EN REG_BIT(3) | |
| 44 | +#define EDP4K2K_MODE_OVRD_OPTIMIZED REG_BIT(2) | |
| 47 | 45 | |
| 48 | 46 | #define ICL_PORT_CL_DW12(phy) _MMIO(_ICL_PORT_CL_DW(12, phy)) |
| 49 | −#define ICL_LANE_ENABLE_AUX (1 << 0) | |
| 47 | +#define ICL_LANE_ENABLE_AUX REG_BIT(0) | |
| 50 | 48 | |
| 51 | 49 | /* ICL Port COMP_DW registers */ |
| 52 | 50 | #define _ICL_PORT_COMP 0x100 |
| @@ -54,24 +52,22 @@ · 1 unmodified line | ||
| 54 | 52 | _ICL_PORT_COMP + 4 * (dw)) |
| 55 | 53 | |
| 56 | 54 | #define ICL_PORT_COMP_DW0(phy) _MMIO(_ICL_PORT_COMP_DW(0, phy)) |
| 57 | −#define COMP_INIT (1 << 31) | |
| 55 | +#define COMP_INIT REG_BIT(31) | |
| 58 | 56 | |
| 59 | 57 | #define ICL_PORT_COMP_DW1(phy) _MMIO(_ICL_PORT_COMP_DW(1, phy)) |
| 60 | 58 | |
| 61 | 59 | #define ICL_PORT_COMP_DW3(phy) _MMIO(_ICL_PORT_COMP_DW(3, phy)) |
| 62 | −#define PROCESS_INFO_DOT_0 (0 << 26) | |
| 63 | −#define PROCESS_INFO_DOT_1 (1 << 26) | |
| 64 | −#define PROCESS_INFO_DOT_4 (2 << 26) | |
| 65 | −#define PROCESS_INFO_MASK (7 << 26) | |
| 66 | −#define PROCESS_INFO_SHIFT 26 | |
| 67 | −#define VOLTAGE_INFO_0_85V (0 << 24) | |
| 68 | −#define VOLTAGE_INFO_0_95V (1 << 24) | |
| 69 | −#define VOLTAGE_INFO_1_05V (2 << 24) | |
| 70 | −#define VOLTAGE_INFO_MASK (3 << 24) | |
| 71 | −#define VOLTAGE_INFO_SHIFT 24 | |
| 60 | +#define PROCESS_INFO_MASK REG_GENMASK(28, 26) | |
| 61 | +#define PROCESS_INFO_DOT_0 REG_FIELD_PREP(PROCESS_INFO_MASK, 0) | |
| 62 | +#define PROCESS_INFO_DOT_1 REG_FIELD_PREP(PROCESS_INFO_MASK, 1) | |
| 63 | +#define PROCESS_INFO_DOT_4 REG_FIELD_PREP(PROCESS_INFO_MASK, 2) | |
| 64 | +#define VOLTAGE_INFO_MASK REG_GENMASK(25, 24) | |
| 65 | +#define VOLTAGE_INFO_0_85V REG_FIELD_PREP(VOLTAGE_INFO_MASK, 0) | |
| 66 | +#define VOLTAGE_INFO_0_95V REG_FIELD_PREP(VOLTAGE_INFO_MASK, 1) | |
| 67 | +#define VOLTAGE_INFO_1_05V REG_FIELD_PREP(VOLTAGE_INFO_MASK, 2) | |
| 72 | 68 | |
| 73 | 69 | #define ICL_PORT_COMP_DW8(phy) _MMIO(_ICL_PORT_COMP_DW(8, phy)) |
| 74 | −#define IREFGEN (1 << 24) | |
| 70 | +#define IREFGEN REG_BIT(24) | |
| 75 | 71 | |
| 76 | 72 | #define ICL_PORT_COMP_DW9(phy) _MMIO(_ICL_PORT_COMP_DW(9, phy)) |
| 77 | 73 | |
| @@ -92,9 +88,9 @@ · 14 unmodified lines | ||
| 92 | 88 | #define ICL_PORT_PCS_DW1_LN(ln, phy) _MMIO(_ICL_PORT_PCS_DW_LN(1, ln, phy)) |
| 93 | 89 | #define DCC_MODE_SELECT_MASK REG_GENMASK(21, 20) |
| 94 | 90 | #define RUN_DCC_ONCE REG_FIELD_PREP(DCC_MODE_SELECT_MASK, 0) |
| 95 | −#define COMMON_KEEPER_EN (1 << 26) | |
| 96 | −#define LATENCY_OPTIM_MASK (0x3 << 2) | |
| 97 | −#define LATENCY_OPTIM_VAL(x) ((x) << 2) | |
| 91 | +#define COMMON_KEEPER_EN REG_BIT(26) | |
| 92 | +#define LATENCY_OPTIM_MASK REG_GENMASK(3, 2) | |
| 93 | +#define LATENCY_OPTIM_VAL(x) REG_FIELD_PREP(LATENCY_OPTIM_MASK, (x)) | |
| 98 | 94 | |
| 99 | 95 | /* ICL Port TX registers */ |
| 100 | 96 | #define _ICL_PORT_TX_AUX 0x380 |
| @@ -111,42 +107,49 @@ · 10 unmodified lines | ||
| 111 | 107 | #define ICL_PORT_TX_DW2_AUX(phy) _MMIO(_ICL_PORT_TX_DW_AUX(2, phy)) |
| 112 | 108 | #define ICL_PORT_TX_DW2_GRP(phy) _MMIO(_ICL_PORT_TX_DW_GRP(2, phy)) |
| 113 | 109 | #define ICL_PORT_TX_DW2_LN(ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(2, ln, phy)) |
| 114 | −#define SWING_SEL_UPPER(x) (((x) >> 3) << 15) | |
| 115 | −#define SWING_SEL_UPPER_MASK (1 << 15) | |
| 116 | −#define SWING_SEL_LOWER(x) (((x) & 0x7) << 11) | |
| 117 | −#define SWING_SEL_LOWER_MASK (0x7 << 11) | |
| 118 | −#define FRC_LATENCY_OPTIM_MASK (0x7 << 8) | |
| 119 | −#define FRC_LATENCY_OPTIM_VAL(x) ((x) << 8) | |
| 120 | −#define RCOMP_SCALAR(x) ((x) << 0) | |
| 121 | −#define RCOMP_SCALAR_MASK (0xFF << 0) | |
| 110 | +#define SWING_SEL_UPPER_MASK REG_BIT(15) | |
| 111 | +#define SWING_SEL_UPPER(x) REG_FIELD_PREP(SWING_SEL_UPPER_MASK, (x) >> 3) | |
| 112 | +#define SWING_SEL_LOWER_MASK REG_GENMASK(13, 11) | |
| 113 | +#define SWING_SEL_LOWER(x) REG_FIELD_PREP(SWING_SEL_LOWER_MASK, (x) & 0x7) | |
| 114 | +#define FRC_LATENCY_OPTIM_MASK REG_GENMASK(10, 8) | |
| 115 | +#define FRC_LATENCY_OPTIM_VAL(x) REG_FIELD_PREP(FRC_LATENCY_OPTIM_MASK, (x)) | |
| 116 | +#define RCOMP_SCALAR_MASK REG_GENMASK(7, 0) | |
| 117 | +#define RCOMP_SCALAR(x) REG_FIELD_PREP(RCOMP_SCALAR_MASK, (x)) | |
| 122 | 118 | |
| 123 | 119 | #define ICL_PORT_TX_DW4_AUX(phy) _MMIO(_ICL_PORT_TX_DW_AUX(4, phy)) |
| 124 | 120 | #define ICL_PORT_TX_DW4_GRP(phy) _MMIO(_ICL_PORT_TX_DW_GRP(4, phy)) |
| 125 | 121 | #define ICL_PORT_TX_DW4_LN(ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(4, ln, phy)) |
| 126 | −#define LOADGEN_SELECT (1 << 31) | |
| 127 | −#define POST_CURSOR_1(x) ((x) << 12) | |
| 128 | −#define POST_CURSOR_1_MASK (0x3F << 12) | |
| 129 | −#define POST_CURSOR_2(x) ((x) << 6) | |
| 130 | −#define POST_CURSOR_2_MASK (0x3F << 6) | |
| 131 | −#define CURSOR_COEFF(x) ((x) << 0) | |
| 132 | −#define CURSOR_COEFF_MASK (0x3F << 0) | |
| 122 | +#define LOADGEN_SELECT REG_BIT(31) | |
| 123 | +#define POST_CURSOR_1_MASK REG_GENMASK(17, 12) | |
| 124 | +#define POST_CURSOR_1(x) REG_FIELD_PREP(POST_CURSOR_1_MASK, (x)) | |
| 125 | +#define POST_CURSOR_2_MASK REG_GENMASK(11, 6) | |
| 126 | +#define POST_CURSOR_2(x) REG_FIELD_PREP(POST_CURSOR_2_MASK, (x)) | |
| 127 | +#define CURSOR_COEFF_MASK REG_GENMASK(5, 0) | |
| 128 | +#define CURSOR_COEFF(x) REG_FIELD_PREP(CURSOR_COEFF_MASK, (x)) | |
| 133 | 129 | |
| 134 | 130 | #define ICL_PORT_TX_DW5_AUX(phy) _MMIO(_ICL_PORT_TX_DW_AUX(5, phy)) |
| 135 | 131 | #define ICL_PORT_TX_DW5_GRP(phy) _MMIO(_ICL_PORT_TX_DW_GRP(5, phy)) |
| 136 | 132 | #define ICL_PORT_TX_DW5_LN(ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(5, ln, phy)) |
| 137 | −#define TX_TRAINING_EN (1 << 31) | |
| 138 | −#define TAP2_DISABLE (1 << 30) | |
| 139 | −#define TAP3_DISABLE (1 << 29) | |
| 140 | −#define SCALING_MODE_SEL(x) ((x) << 18) | |
| 141 | −#define SCALING_MODE_SEL_MASK (0x7 << 18) | |
| 142 | −#define RTERM_SELECT(x) ((x) << 3) | |
| 143 | −#define RTERM_SELECT_MASK (0x7 << 3) | |
| 133 | +#define TX_TRAINING_EN REG_BIT(31) | |
| 134 | +#define TAP2_DISABLE REG_BIT(30) | |
| 135 | +#define TAP3_DISABLE REG_BIT(29) | |
| 136 | +#define SCALING_MODE_SEL_MASK REG_GENMASK(20, 18) | |
| 137 | +#define SCALING_MODE_SEL(x) REG_FIELD_PREP(SCALING_MODE_SEL_MASK, (x)) | |
| 138 | +#define RTERM_SELECT_MASK REG_GENMASK(5, 3) | |
| 139 | +#define RTERM_SELECT(x) REG_FIELD_PREP(RTERM_SELECT_MASK, (x)) | |
| 140 | + | |
| 141 | +#define ICL_PORT_TX_DW6_AUX(phy) _MMIO(_ICL_PORT_TX_DW_AUX(6, phy)) | |
| 142 | +#define ICL_PORT_TX_DW6_GRP(phy) _MMIO(_ICL_PORT_TX_DW_GRP(6, phy)) | |
| 143 | +#define ICL_PORT_TX_DW6_LN(ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(6, ln, phy)) | |
| 144 | +#define O_FUNC_OVRD_EN REG_BIT(7) | |
| 145 | +#define O_LDO_REF_SEL_CRI REG_GENMASK(6, 1) | |
| 146 | +#define O_LDO_BYPASS_CRI REG_BIT(0) | |
| 144 | 147 | |
| 145 | 148 | #define ICL_PORT_TX_DW7_AUX(phy) _MMIO(_ICL_PORT_TX_DW_AUX(7, phy)) |
| 146 | 149 | #define ICL_PORT_TX_DW7_GRP(phy) _MMIO(_ICL_PORT_TX_DW_GRP(7, phy)) |
| 147 | 150 | #define ICL_PORT_TX_DW7_LN(ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(7, ln, phy)) |
| 148 | −#define N_SCALAR(x) ((x) << 24) | |
| 149 | −#define N_SCALAR_MASK (0x7F << 24) | |
| 151 | +#define N_SCALAR_MASK REG_GENMASK(30, 24) | |
| 152 | +#define N_SCALAR(x) REG_FIELD_PREP(N_SCALAR_MASK, (x)) | |
| 150 | 153 | |
| 151 | 154 | #define ICL_PORT_TX_DW8_AUX(phy) _MMIO(_ICL_PORT_TX_DW_AUX(8, phy)) |
| 152 | 155 | #define ICL_PORT_TX_DW8_GRP(phy) _MMIO(_ICL_PORT_TX_DW_GRP(8, phy)) |
| @@ -348,7 +348,7 @@ intel_crt_mode_valid(struct drm_connector *connector, · 347 unmodified lines | ||
| 348 | 348 | { |
| 349 | 349 | struct drm_device *dev = connector->dev; |
| 350 | 350 | struct drm_i915_private *dev_priv = to_i915(dev); |
| 351 | − int max_dotclk = dev_priv->max_dotclk_freq; | |
| 351 | + int max_dotclk = dev_priv->display.cdclk.max_dotclk_freq; | |
| 352 | 352 | enum drm_mode_status status; |
| 353 | 353 | int max_clock; |
| 354 | 354 | |
| @@ -356,9 +356,6 @@ intel_crt_mode_valid(struct drm_connector *connector, · 1 unmodified line | ||
| 356 | 356 | if (status != MODE_OK) |
| 357 | 357 | return status; |
| 358 | 358 | |
| 359 | − if (mode->flags & DRM_MODE_FLAG_DBLSCAN) | |
| 360 | − return MODE_NO_DBLESCAN; | |
| 361 | − | |
| 362 | 359 | if (mode->clock < 25000) |
| 363 | 360 | return MODE_CLOCK_LOW; |
| 364 | 361 | |
| @@ -12,33 +12,31 @@ · 11 unmodified lines | ||
| 12 | 12 | #include "intel_hdmi.h" |
| 13 | 13 | #include "intel_vrr.h" |
| 14 | 14 | |
| 15 | −static void intel_dump_crtc_timings(struct drm_i915_private *i915, | |
| 15 | +static void intel_dump_crtc_timings(struct drm_printer *p, | |
| 16 | 16 | const struct drm_display_mode *mode) |
| 17 | 17 | { |
| 18 | − drm_dbg_kms(&i915->drm, "crtc timings: clock=%d, " | |
| 19 | − "hd=%d hb=%d-%d hs=%d-%d ht=%d, " | |
| 20 | − "vd=%d vb=%d-%d vs=%d-%d vt=%d, " | |
| 21 | − "flags=0x%x\n", | |
| 22 | − mode->crtc_clock, | |
| 23 | − mode->crtc_hdisplay, mode->crtc_hblank_start, mode->crtc_hblank_end, | |
| 24 | − mode->crtc_hsync_start, mode->crtc_hsync_end, mode->crtc_htotal, | |
| 25 | − mode->crtc_vdisplay, mode->crtc_vblank_start, mode->crtc_vblank_end, | |
| 26 | − mode->crtc_vsync_start, mode->crtc_vsync_end, mode->crtc_vtotal, | |
| 27 | − mode->flags); | |
| 18 | + drm_printf(p, "crtc timings: clock=%d, " | |
| 19 | + "hd=%d hb=%d-%d hs=%d-%d ht=%d, " | |
| 20 | + "vd=%d vb=%d-%d vs=%d-%d vt=%d, " | |
| 21 | + "flags=0x%x\n", | |
| 22 | + mode->crtc_clock, | |
| 23 | + mode->crtc_hdisplay, mode->crtc_hblank_start, mode->crtc_hblank_end, | |
| 24 | + mode->crtc_hsync_start, mode->crtc_hsync_end, mode->crtc_htotal, | |
| 25 | + mode->crtc_vdisplay, mode->crtc_vblank_start, mode->crtc_vblank_end, | |
| 26 | + mode->crtc_vsync_start, mode->crtc_vsync_end, mode->crtc_vtotal, | |
| 27 | + mode->flags); | |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | static void |
| 31 | −intel_dump_m_n_config(const struct intel_crtc_state *pipe_config, | |
| 31 | +intel_dump_m_n_config(struct drm_printer *p, | |
| 32 | + const struct intel_crtc_state *pipe_config, | |
| 32 | 33 | const char *id, unsigned int lane_count, |
| 33 | 34 | const struct intel_link_m_n *m_n) |
| 34 | 35 | { |
| 35 | − struct drm_i915_private *i915 = to_i915(pipe_config->uapi.crtc->dev); | |
| 36 | − | |
| 37 | − drm_dbg_kms(&i915->drm, | |
| 38 | − "%s: lanes: %i; data_m: %u, data_n: %u, link_m: %u, link_n: %u, tu: %u\n", | |
| 39 | − id, lane_count, | |
| 40 | − m_n->data_m, m_n->data_n, | |
| 41 | − m_n->link_m, m_n->link_n, m_n->tu); | |
| 36 | + drm_printf(p, "%s: lanes: %i; data_m: %u, data_n: %u, link_m: %u, link_n: %u, tu: %u\n", | |
| 37 | + id, lane_count, | |
| 38 | + m_n->data_m, m_n->data_n, | |
| 39 | + m_n->link_m, m_n->link_n, m_n->tu); | |
| 42 | 40 | } |
| 43 | 41 | |
| 44 | 42 | static void |
| @@ -52,17 +50,7 @@ intel_dump_infoframe(struct drm_i915_private *i915, · 7 unmodified lines | ||
| 52 | 50 | } |
| 53 | 51 | |
| 54 | 52 | static void |
| 55 | −intel_dump_dp_vsc_sdp(struct drm_i915_private *i915, | |
| 56 | − const struct drm_dp_vsc_sdp *vsc) | |
| 57 | −{ | |
| 58 | − struct drm_printer p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); | |
| 59 | − | |
| 60 | − drm_dp_vsc_sdp_log(&p, vsc); | |
| 61 | −} | |
| 62 | − | |
| 63 | −static void | |
| 64 | −intel_dump_buffer(struct drm_i915_private *i915, | |
| 65 | − const char *prefix, const u8 *buf, size_t len) | |
| 53 | +intel_dump_buffer(const char *prefix, const u8 *buf, size_t len) | |
| 66 | 54 | { |
| 67 | 55 | if (!drm_debug_enabled(DRM_UT_KMS)) |
| 68 | 56 | return; |
| @@ -130,71 +118,66 @@ const char *intel_output_format_name(enum intel_output_format format) · 61 unmodified lines | ||
| 130 | 118 | return output_format_str[format]; |
| 131 | 119 | } |
| 132 | 120 | |
| 133 | −static void intel_dump_plane_state(const struct intel_plane_state *plane_state) | |
| 121 | +static void intel_dump_plane_state(struct drm_printer *p, | |
| 122 | + const struct intel_plane_state *plane_state) | |
| 134 | 123 | { |
| 135 | 124 | struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane); |
| 136 | − struct drm_i915_private *i915 = to_i915(plane->base.dev); | |
| 137 | 125 | const struct drm_framebuffer *fb = plane_state->hw.fb; |
| 138 | 126 | |
| 139 | 127 | if (!fb) { |
| 140 | − drm_dbg_kms(&i915->drm, | |
| 141 | − "[PLANE:%d:%s] fb: [NOFB], visible: %s\n", | |
| 142 | − plane->base.base.id, plane->base.name, | |
| 143 | − str_yes_no(plane_state->uapi.visible)); | |
| 128 | + drm_printf(p, "[PLANE:%d:%s] fb: [NOFB], visible: %s\n", | |
| 129 | + plane->base.base.id, plane->base.name, | |
| 130 | + str_yes_no(plane_state->uapi.visible)); | |
| 144 | 131 | return; |
| 145 | 132 | } |
| 146 | 133 | |
| 147 | − drm_dbg_kms(&i915->drm, | |
| 148 | − "[PLANE:%d:%s] fb: [FB:%d] %ux%u format = %p4cc modifier = 0x%llx, visible: %s\n", | |
| 149 | − plane->base.base.id, plane->base.name, | |
| 150 | − fb->base.id, fb->width, fb->height, &fb->format->format, | |
| 151 | − fb->modifier, str_yes_no(plane_state->uapi.visible)); | |
| 152 | − drm_dbg_kms(&i915->drm, "\trotation: 0x%x, scaler: %d, scaling_filter: %d\n", | |
| 153 | − plane_state->hw.rotation, plane_state->scaler_id, plane_state->hw.scaling_filter); | |
| 134 | + drm_printf(p, "[PLANE:%d:%s] fb: [FB:%d] %ux%u format = %p4cc modifier = 0x%llx, visible: %s\n", | |
| 135 | + plane->base.base.id, plane->base.name, | |
| 136 | + fb->base.id, fb->width, fb->height, &fb->format->format, | |
| 137 | + fb->modifier, str_yes_no(plane_state->uapi.visible)); | |
| 138 | + drm_printf(p, "\trotation: 0x%x, scaler: %d, scaling_filter: %d\n", | |
| 139 | + plane_state->hw.rotation, plane_state->scaler_id, plane_state->hw.scaling_filter); | |
| 154 | 140 | if (plane_state->uapi.visible) |
| 155 | − drm_dbg_kms(&i915->drm, | |
| 156 | − "\tsrc: " DRM_RECT_FP_FMT " dst: " DRM_RECT_FMT "\n", | |
| 157 | − DRM_RECT_FP_ARG(&plane_state->uapi.src), | |
| 158 | − DRM_RECT_ARG(&plane_state->uapi.dst)); | |
| 141 | + drm_printf(p, "\tsrc: " DRM_RECT_FP_FMT " dst: " DRM_RECT_FMT "\n", | |
| 142 | + DRM_RECT_FP_ARG(&plane_state->uapi.src), | |
| 143 | + DRM_RECT_ARG(&plane_state->uapi.dst)); | |
| 159 | 144 | } |
| 160 | 145 | |
| 161 | 146 | static void |
| 162 | −ilk_dump_csc(struct drm_i915_private *i915, const char *name, | |
| 147 | +ilk_dump_csc(struct drm_i915_private *i915, | |
| 148 | + struct drm_printer *p, | |
| 149 | + const char *name, | |
| 163 | 150 | const struct intel_csc_matrix *csc) |
| 164 | 151 | { |
| 165 | 152 | int i; |
| 166 | 153 | |
| 167 | − drm_dbg_kms(&i915->drm, | |
| 168 | − "%s: pre offsets: 0x%04x 0x%04x 0x%04x\n", name, | |
| 169 | − csc->preoff[0], csc->preoff[1], csc->preoff[2]); | |
| 154 | + drm_printf(p, "%s: pre offsets: 0x%04x 0x%04x 0x%04x\n", name, | |
| 155 | + csc->preoff[0], csc->preoff[1], csc->preoff[2]); | |
| 170 | 156 | |
| 171 | 157 | for (i = 0; i < 3; i++) |
| 172 | − drm_dbg_kms(&i915->drm, | |
| 173 | − "%s: coefficients: 0x%04x 0x%04x 0x%04x\n", name, | |
| 174 | − csc->coeff[3 * i + 0], | |
| 175 | − csc->coeff[3 * i + 1], | |
| 176 | − csc->coeff[3 * i + 2]); | |
| 158 | + drm_printf(p, "%s: coefficients: 0x%04x 0x%04x 0x%04x\n", name, | |
| 159 | + csc->coeff[3 * i + 0], | |
| 160 | + csc->coeff[3 * i + 1], | |
| 161 | + csc->coeff[3 * i + 2]); | |
| 177 | 162 | |
| 178 | 163 | if (DISPLAY_VER(i915) < 7) |
| 179 | 164 | return; |
| 180 | 165 | |
| 181 | − drm_dbg_kms(&i915->drm, | |
| 182 | − "%s: post offsets: 0x%04x 0x%04x 0x%04x\n", name, | |
| 183 | − csc->postoff[0], csc->postoff[1], csc->postoff[2]); | |
| 166 | + drm_printf(p, "%s: post offsets: 0x%04x 0x%04x 0x%04x\n", name, | |
| 167 | + csc->postoff[0], csc->postoff[1], csc->postoff[2]); | |
| 184 | 168 | } |
| 185 | 169 | |
| 186 | 170 | static void |
| 187 | −vlv_dump_csc(struct drm_i915_private *i915, const char *name, | |
| 171 | +vlv_dump_csc(struct drm_printer *p, const char *name, | |
| 188 | 172 | const struct intel_csc_matrix *csc) |
| 189 | 173 | { |
| 190 | 174 | int i; |
| 191 | 175 | |
| 192 | 176 | for (i = 0; i < 3; i++) |
| 193 | − drm_dbg_kms(&i915->drm, | |
| 194 | − "%s: coefficients: 0x%04x 0x%04x 0x%04x\n", name, | |
| 195 | − csc->coeff[3 * i + 0], | |
| 196 | − csc->coeff[3 * i + 1], | |
| 197 | − csc->coeff[3 * i + 2]); | |
| 177 | + drm_printf(p, "%s: coefficients: 0x%04x 0x%04x 0x%04x\n", name, | |
| 178 | + csc->coeff[3 * i + 0], | |
| 179 | + csc->coeff[3 * i + 1], | |
| 180 | + csc->coeff[3 * i + 2]); | |
| 198 | 181 | } |
| 199 | 182 | |
| 200 | 183 | void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config, |
| @@ -205,85 +188,86 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config, · 4 unmodified lines | ||
| 205 | 188 | struct drm_i915_private *i915 = to_i915(crtc->base.dev); |
| 206 | 189 | const struct intel_plane_state *plane_state; |
| 207 | 190 | struct intel_plane *plane; |
| 191 | + struct drm_printer p; | |
| 208 | 192 | char buf[64]; |
| 209 | 193 | int i; |
| 210 | 194 | |
| 211 | − drm_dbg_kms(&i915->drm, "[CRTC:%d:%s] enable: %s [%s]\n", | |
| 212 | − crtc->base.base.id, crtc->base.name, | |
| 213 | − str_yes_no(pipe_config->hw.enable), context); | |
| 195 | + if (!drm_debug_enabled(DRM_UT_KMS)) | |
| 196 | + return; | |
| 197 | + | |
| 198 | + p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); | |
| 199 | + | |
| 200 | + drm_printf(&p, "[CRTC:%d:%s] enable: %s [%s]\n", | |
| 201 | + crtc->base.base.id, crtc->base.name, | |
| 202 | + str_yes_no(pipe_config->hw.enable), context); | |
| 214 | 203 | |
| 215 | 204 | if (!pipe_config->hw.enable) |
| 216 | 205 | goto dump_planes; |
| 217 | 206 | |
| 218 | 207 | snprintf_output_types(buf, sizeof(buf), pipe_config->output_types); |
| 219 | − drm_dbg_kms(&i915->drm, | |
| 220 | − "active: %s, output_types: %s (0x%x), output format: %s, sink format: %s\n", | |
| 221 | − str_yes_no(pipe_config->hw.active), | |
| 222 | − buf, pipe_config->output_types, | |
| 223 | − intel_output_format_name(pipe_config->output_format), | |
| 224 | − intel_output_format_name(pipe_config->sink_format)); | |
| 225 | − | |
| 226 | − drm_dbg_kms(&i915->drm, | |
| 227 | − "cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n", | |
| 228 | − transcoder_name(pipe_config->cpu_transcoder), | |
| 229 | − pipe_config->pipe_bpp, pipe_config->dither); | |
| 230 | − | |
| 231 | − drm_dbg_kms(&i915->drm, "MST master transcoder: %s\n", | |
| 232 | − transcoder_name(pipe_config->mst_master_transcoder)); | |
| 233 | − | |
| 234 | − drm_dbg_kms(&i915->drm, | |
| 235 | − "port sync: master transcoder: %s, slave transcoder bitmask = 0x%x\n", | |
| 236 | − transcoder_name(pipe_config->master_transcoder), | |
| 237 | − pipe_config->sync_mode_slaves_mask); | |
| 238 | − | |
| 239 | − drm_dbg_kms(&i915->drm, "bigjoiner: %s, pipes: 0x%x\n", | |
| 240 | − intel_crtc_is_bigjoiner_slave(pipe_config) ? "slave" : | |
| 241 | − intel_crtc_is_bigjoiner_master(pipe_config) ? "master" : "no", | |
| 242 | − pipe_config->bigjoiner_pipes); | |
| 243 | − | |
| 244 | − drm_dbg_kms(&i915->drm, "splitter: %s, link count %d, overlap %d\n", | |
| 245 | − str_enabled_disabled(pipe_config->splitter.enable), | |
| 246 | − pipe_config->splitter.link_count, | |
| 247 | − pipe_config->splitter.pixel_overlap); | |
| 208 | + drm_printf(&p, "active: %s, output_types: %s (0x%x), output format: %s, sink format: %s\n", | |
| 209 | + str_yes_no(pipe_config->hw.active), | |
| 210 | + buf, pipe_config->output_types, | |
| 211 | + intel_output_format_name(pipe_config->output_format), | |
| 212 | + intel_output_format_name(pipe_config->sink_format)); | |
| 213 | + | |
| 214 | + drm_printf(&p, "cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n", | |
| 215 | + transcoder_name(pipe_config->cpu_transcoder), | |
| 216 | + pipe_config->pipe_bpp, pipe_config->dither); | |
| 217 | + | |
| 218 | + drm_printf(&p, "MST master transcoder: %s\n", | |
| 219 | + transcoder_name(pipe_config->mst_master_transcoder)); | |
| 220 | + | |
| 221 | + drm_printf(&p, "port sync: master transcoder: %s, slave transcoder bitmask = 0x%x\n", | |
| 222 | + transcoder_name(pipe_config->master_transcoder), | |
| 223 | + pipe_config->sync_mode_slaves_mask); | |
| 224 | + | |
| 225 | + drm_printf(&p, "bigjoiner: %s, pipes: 0x%x\n", | |
| 226 | + intel_crtc_is_bigjoiner_slave(pipe_config) ? "slave" : | |
| 227 | + intel_crtc_is_bigjoiner_master(pipe_config) ? "master" : "no", | |
| 228 | + pipe_config->bigjoiner_pipes); | |
| 229 | + | |
| 230 | + drm_printf(&p, "splitter: %s, link count %d, overlap %d\n", | |
| 231 | + str_enabled_disabled(pipe_config->splitter.enable), | |
| 232 | + pipe_config->splitter.link_count, | |
| 233 | + pipe_config->splitter.pixel_overlap); | |
| 248 | 234 | |
| 249 | 235 | if (pipe_config->has_pch_encoder) |
| 250 | − intel_dump_m_n_config(pipe_config, "fdi", | |
| 236 | + intel_dump_m_n_config(&p, pipe_config, "fdi", | |
| 251 | 237 | pipe_config->fdi_lanes, |
| 252 | 238 | &pipe_config->fdi_m_n); |
| 253 | 239 | |
| 254 | 240 | if (intel_crtc_has_dp_encoder(pipe_config)) { |
| 255 | − intel_dump_m_n_config(pipe_config, "dp m_n", | |
| 241 | + intel_dump_m_n_config(&p, pipe_config, "dp m_n", | |
| 256 | 242 | pipe_config->lane_count, |
| 257 | 243 | &pipe_config->dp_m_n); |
| 258 | − intel_dump_m_n_config(pipe_config, "dp m2_n2", | |
| 244 | + intel_dump_m_n_config(&p, pipe_config, "dp m2_n2", | |
| 259 | 245 | pipe_config->lane_count, |
| 260 | 246 | &pipe_config->dp_m2_n2); |
| 261 | − drm_dbg_kms(&i915->drm, "fec: %s, enhanced framing: %s\n", | |
| 262 | − str_enabled_disabled(pipe_config->fec_enable), | |
| 263 | − str_enabled_disabled(pipe_config->enhanced_framing)); | |
| 264 | − | |
| 265 | − drm_dbg_kms(&i915->drm, "sdp split: %s\n", | |
| 266 | − str_enabled_disabled(pipe_config->sdp_split_enable)); | |
| 267 | − | |
| 268 | − drm_dbg_kms(&i915->drm, "psr: %s, psr2: %s, panel replay: %s, selective fetch: %s\n", | |
| 269 | − str_enabled_disabled(pipe_config->has_psr), | |
| 270 | − str_enabled_disabled(pipe_config->has_psr2), | |
| 271 | − str_enabled_disabled(pipe_config->has_panel_replay), | |
| 272 | − str_enabled_disabled(pipe_config->enable_psr2_sel_fetch)); | |
| 247 | + drm_printf(&p, "fec: %s, enhanced framing: %s\n", | |
| 248 | + str_enabled_disabled(pipe_config->fec_enable), | |
| 249 | + str_enabled_disabled(pipe_config->enhanced_framing)); | |
| 250 | + | |
| 251 | + drm_printf(&p, "sdp split: %s\n", | |
| 252 | + str_enabled_disabled(pipe_config->sdp_split_enable)); | |
| 253 | + | |
| 254 | + drm_printf(&p, "psr: %s, psr2: %s, panel replay: %s, selective fetch: %s\n", | |
| 255 | + str_enabled_disabled(pipe_config->has_psr), | |
| 256 | + str_enabled_disabled(pipe_config->has_psr2), | |
| 257 | + str_enabled_disabled(pipe_config->has_panel_replay), | |
| 258 | + str_enabled_disabled(pipe_config->enable_psr2_sel_fetch)); | |
| 273 | 259 | } |
| 274 | 260 | |
| 275 | − drm_dbg_kms(&i915->drm, "framestart delay: %d, MSA timing delay: %d\n", | |
| 276 | − pipe_config->framestart_delay, pipe_config->msa_timing_delay); | |
| 261 | + drm_printf(&p, "framestart delay: %d, MSA timing delay: %d\n", | |
| 262 | + pipe_config->framestart_delay, pipe_config->msa_timing_delay); | |
| 277 | 263 | |
| 278 | − drm_dbg_kms(&i915->drm, | |
| 279 | − "audio: %i, infoframes: %i, infoframes enabled: 0x%x\n", | |
| 280 | − pipe_config->has_audio, pipe_config->has_infoframe, | |
| 281 | − pipe_config->infoframes.enable); | |
| 264 | + drm_printf(&p, "audio: %i, infoframes: %i, infoframes enabled: 0x%x\n", | |
| 265 | + pipe_config->has_audio, pipe_config->has_infoframe, | |
| 266 | + pipe_config->infoframes.enable); | |
| 282 | 267 | |
| 283 | 268 | if (pipe_config->infoframes.enable & |
| 284 | 269 | intel_hdmi_infoframe_enable(HDMI_PACKET_TYPE_GENERAL_CONTROL)) |
| 285 | − drm_dbg_kms(&i915->drm, "GCP: 0x%x\n", | |
| 286 | − pipe_config->infoframes.gcp); | |
| 270 | + drm_printf(&p, "GCP: 0x%x\n", pipe_config->infoframes.gcp); | |
| 287 | 271 | if (pipe_config->infoframes.enable & |
| 288 | 272 | intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI)) |
| 289 | 273 | intel_dump_infoframe(i915, &pipe_config->infoframes.avi); |
| @@ -301,91 +285,88 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config, · 11 unmodified lines | ||
| 301 | 285 | intel_dump_infoframe(i915, &pipe_config->infoframes.drm); |
| 302 | 286 | if (pipe_config->infoframes.enable & |
| 303 | 287 | intel_hdmi_infoframe_enable(DP_SDP_VSC)) |
| 304 | − intel_dump_dp_vsc_sdp(i915, &pipe_config->infoframes.vsc); | |
| 288 | + drm_dp_vsc_sdp_log(&p, &pipe_config->infoframes.vsc); | |
| 289 | + if (pipe_config->infoframes.enable & | |
| 290 | + intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC)) | |
| 291 | + drm_dp_as_sdp_log(&p, &pipe_config->infoframes.as_sdp); | |
| 305 | 292 | |
| 306 | 293 | if (pipe_config->has_audio) |
| 307 | − intel_dump_buffer(i915, "ELD: ", pipe_config->eld, | |
| 294 | + intel_dump_buffer("ELD: ", pipe_config->eld, | |
| 308 | 295 | drm_eld_size(pipe_config->eld)); |
| 309 | 296 | |
| 310 | − drm_dbg_kms(&i915->drm, "vrr: %s, vmin: %d, vmax: %d, pipeline full: %d, guardband: %d flipline: %d, vmin vblank: %d, vmax vblank: %d\n", | |
| 311 | − str_yes_no(pipe_config->vrr.enable), | |
| 312 | − pipe_config->vrr.vmin, pipe_config->vrr.vmax, | |
| 313 | − pipe_config->vrr.pipeline_full, pipe_config->vrr.guardband, | |
| 314 | − pipe_config->vrr.flipline, | |
| 315 | − intel_vrr_vmin_vblank_start(pipe_config), | |
| 316 | − intel_vrr_vmax_vblank_start(pipe_config)); | |
| 317 | − | |
| 318 | − drm_dbg_kms(&i915->drm, "requested mode: " DRM_MODE_FMT "\n", | |
| 319 | − DRM_MODE_ARG(&pipe_config->hw.mode)); | |
| 320 | − drm_dbg_kms(&i915->drm, "adjusted mode: " DRM_MODE_FMT "\n", | |
| 321 | − DRM_MODE_ARG(&pipe_config->hw.adjusted_mode)); | |
| 322 | − intel_dump_crtc_timings(i915, &pipe_config->hw.adjusted_mode); | |
| 323 | − drm_dbg_kms(&i915->drm, "pipe mode: " DRM_MODE_FMT "\n", | |
| 324 | − DRM_MODE_ARG(&pipe_config->hw.pipe_mode)); | |
| 325 | − intel_dump_crtc_timings(i915, &pipe_config->hw.pipe_mode); | |
| 326 | − drm_dbg_kms(&i915->drm, | |
| 327 | − "port clock: %d, pipe src: " DRM_RECT_FMT ", pixel rate %d\n", | |
| 328 | − pipe_config->port_clock, DRM_RECT_ARG(&pipe_config->pipe_src), | |
| 329 | − pipe_config->pixel_rate); | |
| 330 | − | |
| 331 | − drm_dbg_kms(&i915->drm, "linetime: %d, ips linetime: %d\n", | |
| 332 | − pipe_config->linetime, pipe_config->ips_linetime); | |
| 297 | + drm_printf(&p, "vrr: %s, vmin: %d, vmax: %d, pipeline full: %d, guardband: %d flipline: %d, vmin vblank: %d, vmax vblank: %d\n", | |
| 298 | + str_yes_no(pipe_config->vrr.enable), | |
| 299 | + pipe_config->vrr.vmin, pipe_config->vrr.vmax, | |
| 300 | + pipe_config->vrr.pipeline_full, pipe_config->vrr.guardband, | |
| 301 | + pipe_config->vrr.flipline, | |
| 302 | + intel_vrr_vmin_vblank_start(pipe_config), | |
| 303 | + intel_vrr_vmax_vblank_start(pipe_config)); | |
| 304 | + | |
| 305 | + drm_printf(&p, "requested mode: " DRM_MODE_FMT "\n", | |
| 306 | + DRM_MODE_ARG(&pipe_config->hw.mode)); | |
| 307 | + drm_printf(&p, "adjusted mode: " DRM_MODE_FMT "\n", | |
| 308 | + DRM_MODE_ARG(&pipe_config->hw.adjusted_mode)); | |
| 309 | + intel_dump_crtc_timings(&p, &pipe_config->hw.adjusted_mode); | |
| 310 | + drm_printf(&p, "pipe mode: " DRM_MODE_FMT "\n", | |
| 311 | + DRM_MODE_ARG(&pipe_config->hw.pipe_mode)); | |
| 312 | + intel_dump_crtc_timings(&p, &pipe_config->hw.pipe_mode); | |
| 313 | + drm_printf(&p, "port clock: %d, pipe src: " DRM_RECT_FMT ", pixel rate %d\n", | |
| 314 | + pipe_config->port_clock, DRM_RECT_ARG(&pipe_config->pipe_src), | |
| 315 | + pipe_config->pixel_rate); | |
| 316 | + | |
| 317 | + drm_printf(&p, "linetime: %d, ips linetime: %d\n", | |
| 318 | + pipe_config->linetime, pipe_config->ips_linetime); | |
| 333 | 319 | |
| 334 | 320 | if (DISPLAY_VER(i915) >= 9) |
| 335 | − drm_dbg_kms(&i915->drm, | |
| 336 | − "num_scalers: %d, scaler_users: 0x%x, scaler_id: %d, scaling_filter: %d\n", | |
| 337 | − crtc->num_scalers, | |
| 338 | − pipe_config->scaler_state.scaler_users, | |
| 339 | − pipe_config->scaler_state.scaler_id, | |
| 340 | − pipe_config->hw.scaling_filter); | |
| 321 | + drm_printf(&p, "num_scalers: %d, scaler_users: 0x%x, scaler_id: %d, scaling_filter: %d\n", | |
| 322 | + crtc->num_scalers, | |
| 323 | + pipe_config->scaler_state.scaler_users, | |
| 324 | + pipe_config->scaler_state.scaler_id, | |
| 325 | + pipe_config->hw.scaling_filter); | |
| 341 | 326 | |
| 342 | 327 | if (HAS_GMCH(i915)) |
| 343 | − drm_dbg_kms(&i915->drm, | |
| 344 | − "gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n", | |
| 345 | − pipe_config->gmch_pfit.control, | |
| 346 | − pipe_config->gmch_pfit.pgm_ratios, | |
| 347 | − pipe_config->gmch_pfit.lvds_border_bits); | |
| 328 | + drm_printf(&p, "gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n", | |
| 329 | + pipe_config->gmch_pfit.control, | |
| 330 | + pipe_config->gmch_pfit.pgm_ratios, | |
| 331 | + pipe_config->gmch_pfit.lvds_border_bits); | |
| 348 | 332 | else |
| 349 | − drm_dbg_kms(&i915->drm, | |
| 350 | − "pch pfit: " DRM_RECT_FMT ", %s, force thru: %s\n", | |
| 351 | − DRM_RECT_ARG(&pipe_config->pch_pfit.dst), | |
| 352 | − str_enabled_disabled(pipe_config->pch_pfit.enabled), | |
| 353 | − str_yes_no(pipe_config->pch_pfit.force_thru)); | |
| 333 | + drm_printf(&p, "pch pfit: " DRM_RECT_FMT ", %s, force thru: %s\n", | |
| 334 | + DRM_RECT_ARG(&pipe_config->pch_pfit.dst), | |
| 335 | + str_enabled_disabled(pipe_config->pch_pfit.enabled), | |
| 336 | + str_yes_no(pipe_config->pch_pfit.force_thru)); | |
| 354 | 337 | |
| 355 | − drm_dbg_kms(&i915->drm, "ips: %i, double wide: %i, drrs: %i\n", | |
| 356 | − pipe_config->ips_enabled, pipe_config->double_wide, | |
| 357 | − pipe_config->has_drrs); | |
| 338 | + drm_printf(&p, "ips: %i, double wide: %i, drrs: %i\n", | |
| 339 | + pipe_config->ips_enabled, pipe_config->double_wide, | |
| 340 | + pipe_config->has_drrs); | |
| 358 | 341 | |
| 359 | − intel_dpll_dump_hw_state(i915, &pipe_config->dpll_hw_state); | |
| 342 | + intel_dpll_dump_hw_state(i915, &p, &pipe_config->dpll_hw_state); | |
| 360 | 343 | |
| 361 | 344 | if (IS_CHERRYVIEW(i915)) |
| 362 | − drm_dbg_kms(&i915->drm, | |
| 363 | − "cgm_mode: 0x%x gamma_mode: 0x%x gamma_enable: %d csc_enable: %d\n", | |
| 364 | − pipe_config->cgm_mode, pipe_config->gamma_mode, | |
| 365 | − pipe_config->gamma_enable, pipe_config->csc_enable); | |
| 345 | + drm_printf(&p, "cgm_mode: 0x%x gamma_mode: 0x%x gamma_enable: %d csc_enable: %d\n", | |
| 346 | + pipe_config->cgm_mode, pipe_config->gamma_mode, | |
| 347 | + pipe_config->gamma_enable, pipe_config->csc_enable); | |
| 366 | 348 | else |
| 367 | − drm_dbg_kms(&i915->drm, | |
| 368 | − "csc_mode: 0x%x gamma_mode: 0x%x gamma_enable: %d csc_enable: %d\n", | |
| 369 | − pipe_config->csc_mode, pipe_config->gamma_mode, | |
| 370 | − pipe_config->gamma_enable, pipe_config->csc_enable); | |
| 371 | − | |
| 372 | − drm_dbg_kms(&i915->drm, "pre csc lut: %s%d entries, post csc lut: %d entries\n", | |
| 373 | − pipe_config->pre_csc_lut && pipe_config->pre_csc_lut == | |
| 374 | − i915->display.color.glk_linear_degamma_lut ? "(linear) " : "", | |
| 375 | − pipe_config->pre_csc_lut ? | |
| 376 | − drm_color_lut_size(pipe_config->pre_csc_lut) : 0, | |
| 377 | − pipe_config->post_csc_lut ? | |
| 378 | − drm_color_lut_size(pipe_config->post_csc_lut) : 0); | |
| 349 | + drm_printf(&p, "csc_mode: 0x%x gamma_mode: 0x%x gamma_enable: %d csc_enable: %d\n", | |
| 350 | + pipe_config->csc_mode, pipe_config->gamma_mode, | |
| 351 | + pipe_config->gamma_enable, pipe_config->csc_enable); | |
| 352 | + | |
| 353 | + drm_printf(&p, "pre csc lut: %s%d entries, post csc lut: %d entries\n", | |
| 354 | + pipe_config->pre_csc_lut && pipe_config->pre_csc_lut == | |
| 355 | + i915->display.color.glk_linear_degamma_lut ? "(linear) " : "", | |
| 356 | + pipe_config->pre_csc_lut ? | |
| 357 | + drm_color_lut_size(pipe_config->pre_csc_lut) : 0, | |
| 358 | + pipe_config->post_csc_lut ? | |
| 359 | + drm_color_lut_size(pipe_config->post_csc_lut) : 0); | |
| 379 | 360 | |
| 380 | 361 | if (DISPLAY_VER(i915) >= 11) |
| 381 | − ilk_dump_csc(i915, "output csc", &pipe_config->output_csc); | |
| 362 | + ilk_dump_csc(i915, &p, "output csc", &pipe_config->output_csc); | |
| 382 | 363 | |
| 383 | 364 | if (!HAS_GMCH(i915)) |
| 384 | − ilk_dump_csc(i915, "pipe csc", &pipe_config->csc); | |
| 365 | + ilk_dump_csc(i915, &p, "pipe csc", &pipe_config->csc); | |
| 385 | 366 | else if (IS_CHERRYVIEW(i915)) |
| 386 | − vlv_dump_csc(i915, "cgm csc", &pipe_config->csc); | |
| 367 | + vlv_dump_csc(&p, "cgm csc", &pipe_config->csc); | |
| 387 | 368 | else if (IS_VALLEYVIEW(i915)) |
| 388 | − vlv_dump_csc(i915, "wgc csc", &pipe_config->csc); | |
| 369 | + vlv_dump_csc(&p, "wgc csc", &pipe_config->csc); | |
| 389 | 370 | |
| 390 | 371 | dump_planes: |
| 391 | 372 | if (!state) |
| @@ -393,6 +374,6 @@ dump_planes: · 1 unmodified line | ||
| 393 | 374 | |
| 394 | 375 | for_each_new_intel_plane_in_state(state, plane, plane_state, i) { |
| 395 | 376 | if (plane->pipe == crtc->pipe) |
| 396 | − intel_dump_plane_state(plane_state); | |
| 377 | + intel_dump_plane_state(&p, plane_state); | |
| 397 | 378 | } |
| 398 | 379 | } |
| @@ -509,6 +509,24 @@ static void i9xx_cursor_disable_sel_fetch_arm(struct intel_plane *plane, · 508 unmodified lines | ||
| 509 | 509 | intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_CTL(pipe, plane->id), 0); |
| 510 | 510 | } |
| 511 | 511 | |
| 512 | +static void wa_16021440873(struct intel_plane *plane, | |
| 513 | + const struct intel_crtc_state *crtc_state, | |
| 514 | + const struct intel_plane_state *plane_state) | |
| 515 | +{ | |
| 516 | + struct drm_i915_private *dev_priv = to_i915(plane->base.dev); | |
| 517 | + u32 ctl = plane_state->ctl; | |
| 518 | + int et_y_position = drm_rect_height(&crtc_state->pipe_src) + 1; | |
| 519 | + enum pipe pipe = plane->pipe; | |
| 520 | + | |
| 521 | + ctl &= ~MCURSOR_MODE_MASK; | |
| 522 | + ctl |= MCURSOR_MODE_64_2B; | |
| 523 | + | |
| 524 | + intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_CTL(pipe, plane->id), ctl); | |
| 525 | + | |
| 526 | + intel_de_write(dev_priv, PIPE_SRCSZ_ERLY_TPT(pipe), | |
| 527 | + PIPESRC_HEIGHT(et_y_position)); | |
| 528 | +} | |
| 529 | + | |
| 512 | 530 | static void i9xx_cursor_update_sel_fetch_arm(struct intel_plane *plane, |
| 513 | 531 | const struct intel_crtc_state *crtc_state, |
| 514 | 532 | const struct intel_plane_state *plane_state) |
| @@ -529,7 +547,11 @@ static void i9xx_cursor_update_sel_fetch_arm(struct intel_plane *plane, · 14 unmodified lines | ||
| 529 | 547 | intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_CTL(pipe, plane->id), |
| 530 | 548 | plane_state->ctl); |
| 531 | 549 | } else { |
| 532 | − i9xx_cursor_disable_sel_fetch_arm(plane, crtc_state); | |
| 550 | + /* Wa_16021440873 */ | |
| 551 | + if (crtc_state->enable_psr2_su_region_et) | |
| 552 | + wa_16021440873(plane, crtc_state, plane_state); | |
| 553 | + else | |
| 554 | + i9xx_cursor_disable_sel_fetch_arm(plane, crtc_state); | |
| 533 | 555 | } |
| 534 | 556 | } |
| 535 | 557 | |
| @@ -29,8 +29,11 @@ · 28 unmodified lines | ||
| 29 | 29 | #define INTEL_CX0_LANE1 BIT(1) |
| 30 | 30 | #define INTEL_CX0_BOTH_LANES (INTEL_CX0_LANE1 | INTEL_CX0_LANE0) |
| 31 | 31 | |
| 32 | −bool intel_is_c10phy(struct drm_i915_private *i915, enum phy phy) | |
| 32 | +bool intel_encoder_is_c10phy(struct intel_encoder *encoder) | |
| 33 | 33 | { |
| 34 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 35 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 36 | + | |
| 34 | 37 | if ((IS_LUNARLAKE(i915) || IS_METEORLAKE(i915)) && phy < PHY_C) |
| 35 | 38 | return true; |
| 36 | 39 | |
| @@ -46,8 +49,7 @@ static int lane_mask_to_lane(u8 lane_mask) · 9 unmodified lines | ||
| 46 | 49 | return ilog2(lane_mask); |
| 47 | 50 | } |
| 48 | 51 | |
| 49 | −static u8 intel_cx0_get_owned_lane_mask(struct drm_i915_private *i915, | |
| 50 | − struct intel_encoder *encoder) | |
| 52 | +static u8 intel_cx0_get_owned_lane_mask(struct intel_encoder *encoder) | |
| 51 | 53 | { |
| 52 | 54 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 53 | 55 | |
| @@ -114,16 +116,20 @@ static void intel_cx0_phy_transaction_end(struct intel_encoder *encoder, intel_w · 60 unmodified lines | ||
| 114 | 116 | intel_display_power_put(i915, POWER_DOMAIN_DC_OFF, wakeref); |
| 115 | 117 | } |
| 116 | 118 | |
| 117 | −static void intel_clear_response_ready_flag(struct drm_i915_private *i915, | |
| 118 | − enum port port, int lane) | |
| 119 | +static void intel_clear_response_ready_flag(struct intel_encoder *encoder, | |
| 120 | + int lane) | |
| 119 | 121 | { |
| 120 | − intel_de_rmw(i915, XELPDP_PORT_P2M_MSGBUS_STATUS(i915, port, lane), | |
| 122 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 123 | + | |
| 124 | + intel_de_rmw(i915, XELPDP_PORT_P2M_MSGBUS_STATUS(i915, encoder->port, lane), | |
| 121 | 125 | 0, XELPDP_PORT_P2M_RESPONSE_READY | XELPDP_PORT_P2M_ERROR_SET); |
| 122 | 126 | } |
| 123 | 127 | |
| 124 | −static void intel_cx0_bus_reset(struct drm_i915_private *i915, enum port port, int lane) | |
| 128 | +static void intel_cx0_bus_reset(struct intel_encoder *encoder, int lane) | |
| 125 | 129 | { |
| 126 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 130 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 131 | + enum port port = encoder->port; | |
| 132 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 127 | 133 | |
| 128 | 134 | intel_de_write(i915, XELPDP_PORT_M2P_MSGBUS_CTL(i915, port, lane), |
| 129 | 135 | XELPDP_PORT_M2P_TRANSACTION_RESET); |
| @@ -135,20 +141,22 @@ static void intel_cx0_bus_reset(struct drm_i915_private *i915, enum port port, i · 5 unmodified lines | ||
| 135 | 141 | return; |
| 136 | 142 | } |
| 137 | 143 | |
| 138 | − intel_clear_response_ready_flag(i915, port, lane); | |
| 144 | + intel_clear_response_ready_flag(encoder, lane); | |
| 139 | 145 | } |
| 140 | 146 | |
| 141 | −static int intel_cx0_wait_for_ack(struct drm_i915_private *i915, enum port port, | |
| 147 | +static int intel_cx0_wait_for_ack(struct intel_encoder *encoder, | |
| 142 | 148 | int command, int lane, u32 *val) |
| 143 | 149 | { |
| 144 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 145 | − | |
| 146 | − if (__intel_de_wait_for_register(i915, | |
| 147 | − XELPDP_PORT_P2M_MSGBUS_STATUS(i915, port, lane), | |
| 148 | − XELPDP_PORT_P2M_RESPONSE_READY, | |
| 149 | − XELPDP_PORT_P2M_RESPONSE_READY, | |
| 150 | − XELPDP_MSGBUS_TIMEOUT_FAST_US, | |
| 151 | − XELPDP_MSGBUS_TIMEOUT_SLOW, val)) { | |
| 150 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 151 | + enum port port = encoder->port; | |
| 152 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 153 | + | |
| 154 | + if (intel_de_wait_custom(i915, | |
| 155 | + XELPDP_PORT_P2M_MSGBUS_STATUS(i915, port, lane), | |
| 156 | + XELPDP_PORT_P2M_RESPONSE_READY, | |
| 157 | + XELPDP_PORT_P2M_RESPONSE_READY, | |
| 158 | + XELPDP_MSGBUS_TIMEOUT_FAST_US, | |
| 159 | + XELPDP_MSGBUS_TIMEOUT_SLOW, val)) { | |
| 152 | 160 | drm_dbg_kms(&i915->drm, "PHY %c Timeout waiting for message ACK. Status: 0x%x\n", |
| 153 | 161 | phy_name(phy), *val); |
| 154 | 162 | |
| @@ -158,31 +166,33 @@ static int intel_cx0_wait_for_ack(struct drm_i915_private *i915, enum port port, · 3 unmodified lines | ||
| 158 | 166 | "PHY %c Hardware did not detect a timeout\n", |
| 159 | 167 | phy_name(phy)); |
| 160 | 168 | |
| 161 | − intel_cx0_bus_reset(i915, port, lane); | |
| 169 | + intel_cx0_bus_reset(encoder, lane); | |
| 162 | 170 | return -ETIMEDOUT; |
| 163 | 171 | } |
| 164 | 172 | |
| 165 | 173 | if (*val & XELPDP_PORT_P2M_ERROR_SET) { |
| 166 | 174 | drm_dbg_kms(&i915->drm, "PHY %c Error occurred during %s command. Status: 0x%x\n", phy_name(phy), |
| 167 | 175 | command == XELPDP_PORT_P2M_COMMAND_READ_ACK ? "read" : "write", *val); |
| 168 | − intel_cx0_bus_reset(i915, port, lane); | |
| 176 | + intel_cx0_bus_reset(encoder, lane); | |
| 169 | 177 | return -EINVAL; |
| 170 | 178 | } |
| 171 | 179 | |
| 172 | 180 | if (REG_FIELD_GET(XELPDP_PORT_P2M_COMMAND_TYPE_MASK, *val) != command) { |
| 173 | 181 | drm_dbg_kms(&i915->drm, "PHY %c Not a %s response. MSGBUS Status: 0x%x.\n", phy_name(phy), |
| 174 | 182 | command == XELPDP_PORT_P2M_COMMAND_READ_ACK ? "read" : "write", *val); |
| 175 | − intel_cx0_bus_reset(i915, port, lane); | |
| 183 | + intel_cx0_bus_reset(encoder, lane); | |
| 176 | 184 | return -EINVAL; |
| 177 | 185 | } |
| 178 | 186 | |
| 179 | 187 | return 0; |
| 180 | 188 | } |
| 181 | 189 | |
| 182 | −static int __intel_cx0_read_once(struct drm_i915_private *i915, enum port port, | |
| 190 | +static int __intel_cx0_read_once(struct intel_encoder *encoder, | |
| 183 | 191 | int lane, u16 addr) |
| 184 | 192 | { |
| 185 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 193 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 194 | + enum port port = encoder->port; | |
| 195 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 186 | 196 | int ack; |
| 187 | 197 | u32 val; |
| 188 | 198 | |
| @@ -191,7 +201,7 @@ static int __intel_cx0_read_once(struct drm_i915_private *i915, enum port port, · 2 unmodified lines | ||
| 191 | 201 | XELPDP_MSGBUS_TIMEOUT_SLOW)) { |
| 192 | 202 | drm_dbg_kms(&i915->drm, |
| 193 | 203 | "PHY %c Timeout waiting for previous transaction to complete. Reset the bus and retry.\n", phy_name(phy)); |
| 194 | − intel_cx0_bus_reset(i915, port, lane); | |
| 204 | + intel_cx0_bus_reset(encoder, lane); | |
| 195 | 205 | return -ETIMEDOUT; |
| 196 | 206 | } |
| 197 | 207 | |
| @@ -200,33 +210,34 @@ static int __intel_cx0_read_once(struct drm_i915_private *i915, enum port port, · 2 unmodified lines | ||
| 200 | 210 | XELPDP_PORT_M2P_COMMAND_READ | |
| 201 | 211 | XELPDP_PORT_M2P_ADDRESS(addr)); |
| 202 | 212 | |
| 203 | − ack = intel_cx0_wait_for_ack(i915, port, XELPDP_PORT_P2M_COMMAND_READ_ACK, lane, &val); | |
| 213 | + ack = intel_cx0_wait_for_ack(encoder, XELPDP_PORT_P2M_COMMAND_READ_ACK, lane, &val); | |
| 204 | 214 | if (ack < 0) |
| 205 | 215 | return ack; |
| 206 | 216 | |
| 207 | − intel_clear_response_ready_flag(i915, port, lane); | |
| 217 | + intel_clear_response_ready_flag(encoder, lane); | |
| 208 | 218 | |
| 209 | 219 | /* |
| 210 | 220 | * FIXME: Workaround to let HW to settle |
| 211 | 221 | * down and let the message bus to end up |
| 212 | 222 | * in a known state |
| 213 | 223 | */ |
| 214 | − intel_cx0_bus_reset(i915, port, lane); | |
| 224 | + intel_cx0_bus_reset(encoder, lane); | |
| 215 | 225 | |
| 216 | 226 | return REG_FIELD_GET(XELPDP_PORT_P2M_DATA_MASK, val); |
| 217 | 227 | } |
| 218 | 228 | |
| 219 | −static u8 __intel_cx0_read(struct drm_i915_private *i915, enum port port, | |
| 229 | +static u8 __intel_cx0_read(struct intel_encoder *encoder, | |
| 220 | 230 | int lane, u16 addr) |
| 221 | 231 | { |
| 222 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 232 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 233 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 223 | 234 | int i, status; |
| 224 | 235 | |
| 225 | 236 | assert_dc_off(i915); |
| 226 | 237 | |
| 227 | 238 | /* 3 tries is assumed to be enough to read successfully */ |
| 228 | 239 | for (i = 0; i < 3; i++) { |
| 229 | − status = __intel_cx0_read_once(i915, port, lane, addr); | |
| 240 | + status = __intel_cx0_read_once(encoder, lane, addr); | |
| 230 | 241 | |
| 231 | 242 | if (status >= 0) |
| 232 | 243 | return status; |
| @@ -238,18 +249,20 @@ static u8 __intel_cx0_read(struct drm_i915_private *i915, enum port port, · 5 unmodified lines | ||
| 238 | 249 | return 0; |
| 239 | 250 | } |
| 240 | 251 | |
| 241 | −static u8 intel_cx0_read(struct drm_i915_private *i915, enum port port, | |
| 252 | +static u8 intel_cx0_read(struct intel_encoder *encoder, | |
| 242 | 253 | u8 lane_mask, u16 addr) |
| 243 | 254 | { |
| 244 | 255 | int lane = lane_mask_to_lane(lane_mask); |
| 245 | 256 | |
| 246 | − return __intel_cx0_read(i915, port, lane, addr); | |
| 257 | + return __intel_cx0_read(encoder, lane, addr); | |
| 247 | 258 | } |
| 248 | 259 | |
| 249 | −static int __intel_cx0_write_once(struct drm_i915_private *i915, enum port port, | |
| 260 | +static int __intel_cx0_write_once(struct intel_encoder *encoder, | |
| 250 | 261 | int lane, u16 addr, u8 data, bool committed) |
| 251 | 262 | { |
| 252 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 263 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 264 | + enum port port = encoder->port; | |
| 265 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 253 | 266 | int ack; |
| 254 | 267 | u32 val; |
| 255 | 268 | |
| @@ -258,7 +271,7 @@ static int __intel_cx0_write_once(struct drm_i915_private *i915, enum port port, · 2 unmodified lines | ||
| 258 | 271 | XELPDP_MSGBUS_TIMEOUT_SLOW)) { |
| 259 | 272 | drm_dbg_kms(&i915->drm, |
| 260 | 273 | "PHY %c Timeout waiting for previous transaction to complete. Resetting the bus.\n", phy_name(phy)); |
| 261 | − intel_cx0_bus_reset(i915, port, lane); | |
| 274 | + intel_cx0_bus_reset(encoder, lane); | |
| 262 | 275 | return -ETIMEDOUT; |
| 263 | 276 | } |
| 264 | 277 | |
| @@ -274,45 +287,46 @@ static int __intel_cx0_write_once(struct drm_i915_private *i915, enum port port, · 9 unmodified lines | ||
| 274 | 287 | XELPDP_MSGBUS_TIMEOUT_SLOW)) { |
| 275 | 288 | drm_dbg_kms(&i915->drm, |
| 276 | 289 | "PHY %c Timeout waiting for write to complete. Resetting the bus.\n", phy_name(phy)); |
| 277 | − intel_cx0_bus_reset(i915, port, lane); | |
| 290 | + intel_cx0_bus_reset(encoder, lane); | |
| 278 | 291 | return -ETIMEDOUT; |
| 279 | 292 | } |
| 280 | 293 | |
| 281 | 294 | if (committed) { |
| 282 | − ack = intel_cx0_wait_for_ack(i915, port, XELPDP_PORT_P2M_COMMAND_WRITE_ACK, lane, &val); | |
| 295 | + ack = intel_cx0_wait_for_ack(encoder, XELPDP_PORT_P2M_COMMAND_WRITE_ACK, lane, &val); | |
| 283 | 296 | if (ack < 0) |
| 284 | 297 | return ack; |
| 285 | 298 | } else if ((intel_de_read(i915, XELPDP_PORT_P2M_MSGBUS_STATUS(i915, port, lane)) & |
| 286 | 299 | XELPDP_PORT_P2M_ERROR_SET)) { |
| 287 | 300 | drm_dbg_kms(&i915->drm, |
| 288 | 301 | "PHY %c Error occurred during write command.\n", phy_name(phy)); |
| 289 | − intel_cx0_bus_reset(i915, port, lane); | |
| 302 | + intel_cx0_bus_reset(encoder, lane); | |
| 290 | 303 | return -EINVAL; |
| 291 | 304 | } |
| 292 | 305 | |
| 293 | − intel_clear_response_ready_flag(i915, port, lane); | |
| 306 | + intel_clear_response_ready_flag(encoder, lane); | |
| 294 | 307 | |
| 295 | 308 | /* |
| 296 | 309 | * FIXME: Workaround to let HW to settle |
| 297 | 310 | * down and let the message bus to end up |
| 298 | 311 | * in a known state |
| 299 | 312 | */ |
| 300 | − intel_cx0_bus_reset(i915, port, lane); | |
| 313 | + intel_cx0_bus_reset(encoder, lane); | |
| 301 | 314 | |
| 302 | 315 | return 0; |
| 303 | 316 | } |
| 304 | 317 | |
| 305 | −static void __intel_cx0_write(struct drm_i915_private *i915, enum port port, | |
| 318 | +static void __intel_cx0_write(struct intel_encoder *encoder, | |
| 306 | 319 | int lane, u16 addr, u8 data, bool committed) |
| 307 | 320 | { |
| 308 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 321 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 322 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 309 | 323 | int i, status; |
| 310 | 324 | |
| 311 | 325 | assert_dc_off(i915); |
| 312 | 326 | |
| 313 | 327 | /* 3 tries is assumed to be enough to write successfully */ |
| 314 | 328 | for (i = 0; i < 3; i++) { |
| 315 | − status = __intel_cx0_write_once(i915, port, lane, addr, data, committed); | |
| 329 | + status = __intel_cx0_write_once(encoder, lane, addr, data, committed); | |
| 316 | 330 | |
| 317 | 331 | if (status == 0) |
| 318 | 332 | return; |
| @@ -322,63 +336,66 @@ static void __intel_cx0_write(struct drm_i915_private *i915, enum port port, · 3 unmodified lines | ||
| 322 | 336 | "PHY %c Write %04x failed after %d retries.\n", phy_name(phy), addr, i); |
| 323 | 337 | } |
| 324 | 338 | |
| 325 | −static void intel_cx0_write(struct drm_i915_private *i915, enum port port, | |
| 339 | +static void intel_cx0_write(struct intel_encoder *encoder, | |
| 326 | 340 | u8 lane_mask, u16 addr, u8 data, bool committed) |
| 327 | 341 | { |
| 328 | 342 | int lane; |
| 329 | 343 | |
| 330 | 344 | for_each_cx0_lane_in_mask(lane_mask, lane) |
| 331 | − __intel_cx0_write(i915, port, lane, addr, data, committed); | |
| 345 | + __intel_cx0_write(encoder, lane, addr, data, committed); | |
| 332 | 346 | } |
| 333 | 347 | |
| 334 | −static void intel_c20_sram_write(struct drm_i915_private *i915, enum port port, | |
| 348 | +static void intel_c20_sram_write(struct intel_encoder *encoder, | |
| 335 | 349 | int lane, u16 addr, u16 data) |
| 336 | 350 | { |
| 351 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 352 | + | |
| 337 | 353 | assert_dc_off(i915); |
| 338 | 354 | |
| 339 | − intel_cx0_write(i915, port, lane, PHY_C20_WR_ADDRESS_H, addr >> 8, 0); | |
| 340 | − intel_cx0_write(i915, port, lane, PHY_C20_WR_ADDRESS_L, addr & 0xff, 0); | |
| 355 | + intel_cx0_write(encoder, lane, PHY_C20_WR_ADDRESS_H, addr >> 8, 0); | |
| 356 | + intel_cx0_write(encoder, lane, PHY_C20_WR_ADDRESS_L, addr & 0xff, 0); | |
| 341 | 357 | |
| 342 | − intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_H, data >> 8, 0); | |
| 343 | − intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, 1); | |
| 358 | + intel_cx0_write(encoder, lane, PHY_C20_WR_DATA_H, data >> 8, 0); | |
| 359 | + intel_cx0_write(encoder, lane, PHY_C20_WR_DATA_L, data & 0xff, 1); | |
| 344 | 360 | } |
| 345 | 361 | |
| 346 | −static u16 intel_c20_sram_read(struct drm_i915_private *i915, enum port port, | |
| 362 | +static u16 intel_c20_sram_read(struct intel_encoder *encoder, | |
| 347 | 363 | int lane, u16 addr) |
| 348 | 364 | { |
| 365 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 349 | 366 | u16 val; |
| 350 | 367 | |
| 351 | 368 | assert_dc_off(i915); |
| 352 | 369 | |
| 353 | − intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_H, addr >> 8, 0); | |
| 354 | − intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_L, addr & 0xff, 1); | |
| 370 | + intel_cx0_write(encoder, lane, PHY_C20_RD_ADDRESS_H, addr >> 8, 0); | |
| 371 | + intel_cx0_write(encoder, lane, PHY_C20_RD_ADDRESS_L, addr & 0xff, 1); | |
| 355 | 372 | |
| 356 | − val = intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_H); | |
| 373 | + val = intel_cx0_read(encoder, lane, PHY_C20_RD_DATA_H); | |
| 357 | 374 | val <<= 8; |
| 358 | − val |= intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_L); | |
| 375 | + val |= intel_cx0_read(encoder, lane, PHY_C20_RD_DATA_L); | |
| 359 | 376 | |
| 360 | 377 | return val; |
| 361 | 378 | } |
| 362 | 379 | |
| 363 | −static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, | |
| 380 | +static void __intel_cx0_rmw(struct intel_encoder *encoder, | |
| 364 | 381 | int lane, u16 addr, u8 clear, u8 set, bool committed) |
| 365 | 382 | { |
| 366 | 383 | u8 old, val; |
| 367 | 384 | |
| 368 | − old = __intel_cx0_read(i915, port, lane, addr); | |
| 385 | + old = __intel_cx0_read(encoder, lane, addr); | |
| 369 | 386 | val = (old & ~clear) | set; |
| 370 | 387 | |
| 371 | 388 | if (val != old) |
| 372 | − __intel_cx0_write(i915, port, lane, addr, val, committed); | |
| 389 | + __intel_cx0_write(encoder, lane, addr, val, committed); | |
| 373 | 390 | } |
| 374 | 391 | |
| 375 | −static void intel_cx0_rmw(struct drm_i915_private *i915, enum port port, | |
| 392 | +static void intel_cx0_rmw(struct intel_encoder *encoder, | |
| 376 | 393 | u8 lane_mask, u16 addr, u8 clear, u8 set, bool committed) |
| 377 | 394 | { |
| 378 | 395 | u8 lane; |
| 379 | 396 | |
| 380 | 397 | for_each_cx0_lane_in_mask(lane_mask, lane) |
| 381 | − __intel_cx0_rmw(i915, port, lane, addr, clear, set, committed); | |
| 398 | + __intel_cx0_rmw(encoder, lane, addr, clear, set, committed); | |
| 382 | 399 | } |
| 383 | 400 | |
| 384 | 401 | static u8 intel_c10_get_tx_vboost_lvl(const struct intel_crtc_state *crtc_state) |
| @@ -414,7 +431,6 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, · 29 unmodified lines | ||
| 414 | 431 | { |
| 415 | 432 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 416 | 433 | const struct intel_ddi_buf_trans *trans; |
| 417 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 418 | 434 | u8 owned_lane_mask; |
| 419 | 435 | intel_wakeref_t wakeref; |
| 420 | 436 | int n_entries, ln; |
| @@ -423,7 +439,7 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, · 2 unmodified lines | ||
| 423 | 439 | if (intel_tc_port_in_tbt_alt_mode(dig_port)) |
| 424 | 440 | return; |
| 425 | 441 | |
| 426 | − owned_lane_mask = intel_cx0_get_owned_lane_mask(i915, encoder); | |
| 442 | + owned_lane_mask = intel_cx0_get_owned_lane_mask(encoder); | |
| 427 | 443 | |
| 428 | 444 | wakeref = intel_cx0_phy_transaction_begin(encoder); |
| 429 | 445 | |
| @@ -433,14 +449,14 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, · 3 unmodified lines | ||
| 433 | 449 | return; |
| 434 | 450 | } |
| 435 | 451 | |
| 436 | − if (intel_is_c10phy(i915, phy)) { | |
| 437 | − intel_cx0_rmw(i915, encoder->port, owned_lane_mask, PHY_C10_VDR_CONTROL(1), | |
| 452 | + if (intel_encoder_is_c10phy(encoder)) { | |
| 453 | + intel_cx0_rmw(encoder, owned_lane_mask, PHY_C10_VDR_CONTROL(1), | |
| 438 | 454 | 0, C10_VDR_CTRL_MSGBUS_ACCESS, MB_WRITE_COMMITTED); |
| 439 | − intel_cx0_rmw(i915, encoder->port, owned_lane_mask, PHY_C10_VDR_CMN(3), | |
| 455 | + intel_cx0_rmw(encoder, owned_lane_mask, PHY_C10_VDR_CMN(3), | |
| 440 | 456 | C10_CMN3_TXVBOOST_MASK, |
| 441 | 457 | C10_CMN3_TXVBOOST(intel_c10_get_tx_vboost_lvl(crtc_state)), |
| 442 | 458 | MB_WRITE_UNCOMMITTED); |
| 443 | − intel_cx0_rmw(i915, encoder->port, owned_lane_mask, PHY_C10_VDR_TX(1), | |
| 459 | + intel_cx0_rmw(encoder, owned_lane_mask, PHY_C10_VDR_TX(1), | |
| 444 | 460 | C10_TX1_TERMCTL_MASK, |
| 445 | 461 | C10_TX1_TERMCTL(intel_c10_get_tx_term_ctl(crtc_state)), |
| 446 | 462 | MB_WRITE_COMMITTED); |
| @@ -455,27 +471,27 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, · 8 unmodified lines | ||
| 455 | 471 | if (!(lane_mask & owned_lane_mask)) |
| 456 | 472 | continue; |
| 457 | 473 | |
| 458 | − intel_cx0_rmw(i915, encoder->port, lane_mask, PHY_CX0_VDROVRD_CTL(lane, tx, 0), | |
| 474 | + intel_cx0_rmw(encoder, lane_mask, PHY_CX0_VDROVRD_CTL(lane, tx, 0), | |
| 459 | 475 | C10_PHY_OVRD_LEVEL_MASK, |
| 460 | 476 | C10_PHY_OVRD_LEVEL(trans->entries[level].snps.pre_cursor), |
| 461 | 477 | MB_WRITE_COMMITTED); |
| 462 | − intel_cx0_rmw(i915, encoder->port, lane_mask, PHY_CX0_VDROVRD_CTL(lane, tx, 1), | |
| 478 | + intel_cx0_rmw(encoder, lane_mask, PHY_CX0_VDROVRD_CTL(lane, tx, 1), | |
| 463 | 479 | C10_PHY_OVRD_LEVEL_MASK, |
| 464 | 480 | C10_PHY_OVRD_LEVEL(trans->entries[level].snps.vswing), |
| 465 | 481 | MB_WRITE_COMMITTED); |
| 466 | − intel_cx0_rmw(i915, encoder->port, lane_mask, PHY_CX0_VDROVRD_CTL(lane, tx, 2), | |
| 482 | + intel_cx0_rmw(encoder, lane_mask, PHY_CX0_VDROVRD_CTL(lane, tx, 2), | |
| 467 | 483 | C10_PHY_OVRD_LEVEL_MASK, |
| 468 | 484 | C10_PHY_OVRD_LEVEL(trans->entries[level].snps.post_cursor), |
| 469 | 485 | MB_WRITE_COMMITTED); |
| 470 | 486 | } |
| 471 | 487 | |
| 472 | 488 | /* Write Override enables in 0xD71 */ |
| 473 | − intel_cx0_rmw(i915, encoder->port, owned_lane_mask, PHY_C10_VDR_OVRD, | |
| 489 | + intel_cx0_rmw(encoder, owned_lane_mask, PHY_C10_VDR_OVRD, | |
| 474 | 490 | 0, PHY_C10_VDR_OVRD_TX1 | PHY_C10_VDR_OVRD_TX2, |
| 475 | 491 | MB_WRITE_COMMITTED); |
| 476 | 492 | |
| 477 | − if (intel_is_c10phy(i915, phy)) | |
| 478 | − intel_cx0_rmw(i915, encoder->port, owned_lane_mask, PHY_C10_VDR_CONTROL(1), | |
| 493 | + if (intel_encoder_is_c10phy(encoder)) | |
| 494 | + intel_cx0_rmw(encoder, owned_lane_mask, PHY_C10_VDR_CONTROL(1), | |
| 479 | 495 | 0, C10_VDR_CTRL_UPDATE_CFG, MB_WRITE_COMMITTED); |
| 480 | 496 | |
| 481 | 497 | intel_cx0_phy_transaction_end(encoder, wakeref); |
| @@ -1856,7 +1872,6 @@ static int intel_c10pll_calc_state(struct intel_crtc_state *crtc_state, · 1374 unmodified lines | ||
| 1856 | 1872 | static void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, |
| 1857 | 1873 | struct intel_c10pll_state *pll_state) |
| 1858 | 1874 | { |
| 1859 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 1860 | 1875 | u8 lane = INTEL_CX0_LANE0; |
| 1861 | 1876 | intel_wakeref_t wakeref; |
| 1862 | 1877 | int i; |
| @@ -1867,16 +1882,15 @@ static void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, · 4 unmodified lines | ||
| 1867 | 1882 | * According to C10 VDR Register programming Sequence we need |
| 1868 | 1883 | * to do this to read PHY internal registers from MsgBus. |
| 1869 | 1884 | */ |
| 1870 | − intel_cx0_rmw(i915, encoder->port, lane, PHY_C10_VDR_CONTROL(1), | |
| 1885 | + intel_cx0_rmw(encoder, lane, PHY_C10_VDR_CONTROL(1), | |
| 1871 | 1886 | 0, C10_VDR_CTRL_MSGBUS_ACCESS, |
| 1872 | 1887 | MB_WRITE_COMMITTED); |
| 1873 | 1888 | |
| 1874 | 1889 | for (i = 0; i < ARRAY_SIZE(pll_state->pll); i++) |
| 1875 | − pll_state->pll[i] = intel_cx0_read(i915, encoder->port, lane, | |
| 1876 | − PHY_C10_VDR_PLL(i)); | |
| 1890 | + pll_state->pll[i] = intel_cx0_read(encoder, lane, PHY_C10_VDR_PLL(i)); | |
| 1877 | 1891 | |
| 1878 | − pll_state->cmn = intel_cx0_read(i915, encoder->port, lane, PHY_C10_VDR_CMN(0)); | |
| 1879 | − pll_state->tx = intel_cx0_read(i915, encoder->port, lane, PHY_C10_VDR_TX(0)); | |
| 1892 | + pll_state->cmn = intel_cx0_read(encoder, lane, PHY_C10_VDR_CMN(0)); | |
| 1893 | + pll_state->tx = intel_cx0_read(encoder, lane, PHY_C10_VDR_TX(0)); | |
| 1880 | 1894 | |
| 1881 | 1895 | intel_cx0_phy_transaction_end(encoder, wakeref); |
| 1882 | 1896 | } |
| @@ -1888,28 +1902,28 @@ static void intel_c10_pll_program(struct drm_i915_private *i915, · 5 unmodified lines | ||
| 1888 | 1902 | const struct intel_c10pll_state *pll_state = &crtc_state->cx0pll_state.c10; |
| 1889 | 1903 | int i; |
| 1890 | 1904 | |
| 1891 | − intel_cx0_rmw(i915, encoder->port, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1), | |
| 1905 | + intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1), | |
| 1892 | 1906 | 0, C10_VDR_CTRL_MSGBUS_ACCESS, |
| 1893 | 1907 | MB_WRITE_COMMITTED); |
| 1894 | 1908 | |
| 1895 | 1909 | /* Custom width needs to be programmed to 0 for both the phy lanes */ |
| 1896 | − intel_cx0_rmw(i915, encoder->port, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CUSTOM_WIDTH, | |
| 1910 | + intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CUSTOM_WIDTH, | |
| 1897 | 1911 | C10_VDR_CUSTOM_WIDTH_MASK, C10_VDR_CUSTOM_WIDTH_8_10, |
| 1898 | 1912 | MB_WRITE_COMMITTED); |
| 1899 | − intel_cx0_rmw(i915, encoder->port, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1), | |
| 1913 | + intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1), | |
| 1900 | 1914 | 0, C10_VDR_CTRL_UPDATE_CFG, |
| 1901 | 1915 | MB_WRITE_COMMITTED); |
| 1902 | 1916 | |
| 1903 | 1917 | /* Program the pll values only for the master lane */ |
| 1904 | 1918 | for (i = 0; i < ARRAY_SIZE(pll_state->pll); i++) |
| 1905 | − intel_cx0_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C10_VDR_PLL(i), | |
| 1919 | + intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_PLL(i), | |
| 1906 | 1920 | pll_state->pll[i], |
| 1907 | 1921 | (i % 4) ? MB_WRITE_UNCOMMITTED : MB_WRITE_COMMITTED); |
| 1908 | 1922 | |
| 1909 | − intel_cx0_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C10_VDR_CMN(0), pll_state->cmn, MB_WRITE_COMMITTED); | |
| 1910 | − intel_cx0_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C10_VDR_TX(0), pll_state->tx, MB_WRITE_COMMITTED); | |
| 1923 | + intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_CMN(0), pll_state->cmn, MB_WRITE_COMMITTED); | |
| 1924 | + intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_TX(0), pll_state->tx, MB_WRITE_COMMITTED); | |
| 1911 | 1925 | |
| 1912 | − intel_cx0_rmw(i915, encoder->port, INTEL_CX0_LANE0, PHY_C10_VDR_CONTROL(1), | |
| 1926 | + intel_cx0_rmw(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_CONTROL(1), | |
| 1913 | 1927 | 0, C10_VDR_CTRL_MASTER_LANE | C10_VDR_CTRL_UPDATE_CFG, |
| 1914 | 1928 | MB_WRITE_COMMITTED); |
| 1915 | 1929 | } |
| @@ -2037,10 +2051,8 @@ static int intel_c20_phy_check_hdmi_link_rate(int clock) · 121 unmodified lines | ||
| 2037 | 2051 | int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int clock) |
| 2038 | 2052 | { |
| 2039 | 2053 | struct intel_digital_port *dig_port = hdmi_to_dig_port(hdmi); |
| 2040 | − struct drm_i915_private *i915 = intel_hdmi_to_i915(hdmi); | |
| 2041 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 2042 | 2054 | |
| 2043 | − if (intel_is_c10phy(i915, phy)) | |
| 2055 | + if (intel_encoder_is_c10phy(&dig_port->base)) | |
| 2044 | 2056 | return intel_c10_phy_check_hdmi_link_rate(clock); |
| 2045 | 2057 | return intel_c20_phy_check_hdmi_link_rate(clock); |
| 2046 | 2058 | } |
| @@ -2088,10 +2100,7 @@ static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state, · 41 unmodified lines | ||
| 2088 | 2100 | int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, |
| 2089 | 2101 | struct intel_encoder *encoder) |
| 2090 | 2102 | { |
| 2091 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 2092 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 2093 | − | |
| 2094 | − if (intel_is_c10phy(i915, phy)) | |
| 2103 | + if (intel_encoder_is_c10phy(encoder)) | |
| 2095 | 2104 | return intel_c10pll_calc_state(crtc_state, encoder); |
| 2096 | 2105 | return intel_c20pll_calc_state(crtc_state, encoder); |
| 2097 | 2106 | } |
| @@ -2149,7 +2158,6 @@ static int intel_c20pll_calc_port_clock(struct intel_encoder *encoder, · 51 unmodified lines | ||
| 2149 | 2158 | static void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, |
| 2150 | 2159 | struct intel_c20pll_state *pll_state) |
| 2151 | 2160 | { |
| 2152 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 2153 | 2161 | bool cntx; |
| 2154 | 2162 | intel_wakeref_t wakeref; |
| 2155 | 2163 | int i; |
| @@ -2157,25 +2165,25 @@ static void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, · 1 unmodified line | ||
| 2157 | 2165 | wakeref = intel_cx0_phy_transaction_begin(encoder); |
| 2158 | 2166 | |
| 2159 | 2167 | /* 1. Read current context selection */ |
| 2160 | − cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; | |
| 2168 | + cntx = intel_cx0_read(encoder, INTEL_CX0_LANE0, PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; | |
| 2161 | 2169 | |
| 2162 | 2170 | /* Read Tx configuration */ |
| 2163 | 2171 | for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { |
| 2164 | 2172 | if (cntx) |
| 2165 | − pll_state->tx[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2173 | + pll_state->tx[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2166 | 2174 | PHY_C20_B_TX_CNTX_CFG(i)); |
| 2167 | 2175 | else |
| 2168 | − pll_state->tx[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2176 | + pll_state->tx[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2169 | 2177 | PHY_C20_A_TX_CNTX_CFG(i)); |
| 2170 | 2178 | } |
| 2171 | 2179 | |
| 2172 | 2180 | /* Read common configuration */ |
| 2173 | 2181 | for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { |
| 2174 | 2182 | if (cntx) |
| 2175 | − pll_state->cmn[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2183 | + pll_state->cmn[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2176 | 2184 | PHY_C20_B_CMN_CNTX_CFG(i)); |
| 2177 | 2185 | else |
| 2178 | − pll_state->cmn[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2186 | + pll_state->cmn[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2179 | 2187 | PHY_C20_A_CMN_CNTX_CFG(i)); |
| 2180 | 2188 | } |
| 2181 | 2189 | |
| @@ -2183,20 +2191,20 @@ static void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, · 1 unmodified line | ||
| 2183 | 2191 | /* MPLLB configuration */ |
| 2184 | 2192 | for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { |
| 2185 | 2193 | if (cntx) |
| 2186 | − pll_state->mpllb[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2194 | + pll_state->mpllb[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2187 | 2195 | PHY_C20_B_MPLLB_CNTX_CFG(i)); |
| 2188 | 2196 | else |
| 2189 | − pll_state->mpllb[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2197 | + pll_state->mpllb[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2190 | 2198 | PHY_C20_A_MPLLB_CNTX_CFG(i)); |
| 2191 | 2199 | } |
| 2192 | 2200 | } else { |
| 2193 | 2201 | /* MPLLA configuration */ |
| 2194 | 2202 | for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { |
| 2195 | 2203 | if (cntx) |
| 2196 | − pll_state->mplla[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2204 | + pll_state->mplla[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2197 | 2205 | PHY_C20_B_MPLLA_CNTX_CFG(i)); |
| 2198 | 2206 | else |
| 2199 | − pll_state->mplla[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2207 | + pll_state->mplla[i] = intel_c20_sram_read(encoder, INTEL_CX0_LANE0, | |
| 2200 | 2208 | PHY_C20_A_MPLLA_CNTX_CFG(i)); |
| 2201 | 2209 | } |
| 2202 | 2210 | } |
| @@ -2338,7 +2346,7 @@ static void intel_c20_pll_program(struct drm_i915_private *i915, · 135 unmodified lines | ||
| 2338 | 2346 | dp = true; |
| 2339 | 2347 | |
| 2340 | 2348 | /* 1. Read current context selection */ |
| 2341 | − cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_VDR_CUSTOM_SERDES_RATE) & BIT(0); | |
| 2349 | + cntx = intel_cx0_read(encoder, INTEL_CX0_LANE0, PHY_C20_VDR_CUSTOM_SERDES_RATE) & BIT(0); | |
| 2342 | 2350 | |
| 2343 | 2351 | /* |
| 2344 | 2352 | * 2. If there is a protocol switch from HDMI to DP or vice versa, clear |
| @@ -2347,7 +2355,7 @@ static void intel_c20_pll_program(struct drm_i915_private *i915, · 2 unmodified lines | ||
| 2347 | 2355 | */ |
| 2348 | 2356 | if (intel_c20_protocol_switch_valid(encoder)) { |
| 2349 | 2357 | for (i = 0; i < 4; i++) |
| 2350 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, RAWLANEAONX_DIG_TX_MPLLB_CAL_DONE_BANK(i), 0); | |
| 2358 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, RAWLANEAONX_DIG_TX_MPLLB_CAL_DONE_BANK(i), 0); | |
| 2351 | 2359 | usleep_range(4000, 4100); |
| 2352 | 2360 | } |
| 2353 | 2361 | |
| @@ -2355,63 +2363,63 @@ static void intel_c20_pll_program(struct drm_i915_private *i915, · 1 unmodified line | ||
| 2355 | 2363 | /* 3.1 Tx configuration */ |
| 2356 | 2364 | for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { |
| 2357 | 2365 | if (cntx) |
| 2358 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_A_TX_CNTX_CFG(i), pll_state->tx[i]); | |
| 2366 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, PHY_C20_A_TX_CNTX_CFG(i), pll_state->tx[i]); | |
| 2359 | 2367 | else |
| 2360 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_B_TX_CNTX_CFG(i), pll_state->tx[i]); | |
| 2368 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, PHY_C20_B_TX_CNTX_CFG(i), pll_state->tx[i]); | |
| 2361 | 2369 | } |
| 2362 | 2370 | |
| 2363 | 2371 | /* 3.2 common configuration */ |
| 2364 | 2372 | for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { |
| 2365 | 2373 | if (cntx) |
| 2366 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_A_CMN_CNTX_CFG(i), pll_state->cmn[i]); | |
| 2374 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, PHY_C20_A_CMN_CNTX_CFG(i), pll_state->cmn[i]); | |
| 2367 | 2375 | else |
| 2368 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_B_CMN_CNTX_CFG(i), pll_state->cmn[i]); | |
| 2376 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, PHY_C20_B_CMN_CNTX_CFG(i), pll_state->cmn[i]); | |
| 2369 | 2377 | } |
| 2370 | 2378 | |
| 2371 | 2379 | /* 3.3 mpllb or mplla configuration */ |
| 2372 | 2380 | if (intel_c20phy_use_mpllb(pll_state)) { |
| 2373 | 2381 | for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { |
| 2374 | 2382 | if (cntx) |
| 2375 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2383 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, | |
| 2376 | 2384 | PHY_C20_A_MPLLB_CNTX_CFG(i), |
| 2377 | 2385 | pll_state->mpllb[i]); |
| 2378 | 2386 | else |
| 2379 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2387 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, | |
| 2380 | 2388 | PHY_C20_B_MPLLB_CNTX_CFG(i), |
| 2381 | 2389 | pll_state->mpllb[i]); |
| 2382 | 2390 | } |
| 2383 | 2391 | } else { |
| 2384 | 2392 | for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { |
| 2385 | 2393 | if (cntx) |
| 2386 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2394 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, | |
| 2387 | 2395 | PHY_C20_A_MPLLA_CNTX_CFG(i), |
| 2388 | 2396 | pll_state->mplla[i]); |
| 2389 | 2397 | else |
| 2390 | − intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, | |
| 2398 | + intel_c20_sram_write(encoder, INTEL_CX0_LANE0, | |
| 2391 | 2399 | PHY_C20_B_MPLLA_CNTX_CFG(i), |
| 2392 | 2400 | pll_state->mplla[i]); |
| 2393 | 2401 | } |
| 2394 | 2402 | } |
| 2395 | 2403 | |
| 2396 | 2404 | /* 4. Program custom width to match the link protocol */ |
| 2397 | − intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_WIDTH, | |
| 2405 | + intel_cx0_rmw(encoder, lane, PHY_C20_VDR_CUSTOM_WIDTH, | |
| 2398 | 2406 | PHY_C20_CUSTOM_WIDTH_MASK, |
| 2399 | 2407 | PHY_C20_CUSTOM_WIDTH(intel_get_c20_custom_width(clock, dp)), |
| 2400 | 2408 | MB_WRITE_COMMITTED); |
| 2401 | 2409 | |
| 2402 | 2410 | /* 5. For DP or 6. For HDMI */ |
| 2403 | 2411 | if (dp) { |
| 2404 | − intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, | |
| 2412 | + intel_cx0_rmw(encoder, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, | |
| 2405 | 2413 | BIT(6) | PHY_C20_CUSTOM_SERDES_MASK, |
| 2406 | 2414 | BIT(6) | PHY_C20_CUSTOM_SERDES(intel_c20_get_dp_rate(clock)), |
| 2407 | 2415 | MB_WRITE_COMMITTED); |
| 2408 | 2416 | } else { |
| 2409 | − intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, | |
| 2417 | + intel_cx0_rmw(encoder, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, | |
| 2410 | 2418 | BIT(7) | PHY_C20_CUSTOM_SERDES_MASK, |
| 2411 | 2419 | is_hdmi_frl(clock) ? BIT(7) : 0, |
| 2412 | 2420 | MB_WRITE_COMMITTED); |
| 2413 | 2421 | |
| 2414 | − intel_cx0_write(i915, encoder->port, INTEL_CX0_BOTH_LANES, PHY_C20_VDR_HDMI_RATE, | |
| 2422 | + intel_cx0_write(encoder, INTEL_CX0_BOTH_LANES, PHY_C20_VDR_HDMI_RATE, | |
| 2415 | 2423 | intel_c20_get_hdmi_rate(clock), |
| 2416 | 2424 | MB_WRITE_COMMITTED); |
| 2417 | 2425 | } |
| @@ -2420,7 +2428,7 @@ static void intel_c20_pll_program(struct drm_i915_private *i915, · 2 unmodified lines | ||
| 2420 | 2428 | * 7. Write Vendor specific registers to toggle context setting to load |
| 2421 | 2429 | * the updated programming toggle context bit |
| 2422 | 2430 | */ |
| 2423 | − intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, | |
| 2431 | + intel_cx0_rmw(encoder, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, | |
| 2424 | 2432 | BIT(0), cntx ? 0 : 1, MB_WRITE_COMMITTED); |
| 2425 | 2433 | } |
| 2426 | 2434 | |
| @@ -2508,11 +2516,12 @@ static u32 intel_cx0_get_powerdown_state(u8 lane_mask, u8 state) · 81 unmodified lines | ||
| 2508 | 2516 | return val; |
| 2509 | 2517 | } |
| 2510 | 2518 | |
| 2511 | −static void intel_cx0_powerdown_change_sequence(struct drm_i915_private *i915, | |
| 2512 | − enum port port, | |
| 2519 | +static void intel_cx0_powerdown_change_sequence(struct intel_encoder *encoder, | |
| 2513 | 2520 | u8 lane_mask, u8 state) |
| 2514 | 2521 | { |
| 2515 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 2522 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 2523 | + enum port port = encoder->port; | |
| 2524 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2516 | 2525 | i915_reg_t buf_ctl2_reg = XELPDP_PORT_BUF_CTL2(i915, port); |
| 2517 | 2526 | int lane; |
| 2518 | 2527 | |
| @@ -2528,7 +2537,7 @@ static void intel_cx0_powerdown_change_sequence(struct drm_i915_private *i915, · 9 unmodified lines | ||
| 2528 | 2537 | drm_dbg_kms(&i915->drm, |
| 2529 | 2538 | "PHY %c Timeout waiting for previous transaction to complete. Reset the bus.\n", |
| 2530 | 2539 | phy_name(phy)); |
| 2531 | − intel_cx0_bus_reset(i915, port, lane); | |
| 2540 | + intel_cx0_bus_reset(encoder, lane); | |
| 2532 | 2541 | } |
| 2533 | 2542 | |
| 2534 | 2543 | intel_de_rmw(i915, buf_ctl2_reg, |
| @@ -2536,15 +2545,18 @@ static void intel_cx0_powerdown_change_sequence(struct drm_i915_private *i915, · 1 unmodified line | ||
| 2536 | 2545 | intel_cx0_get_powerdown_update(lane_mask)); |
| 2537 | 2546 | |
| 2538 | 2547 | /* Update Timeout Value */ |
| 2539 | − if (__intel_de_wait_for_register(i915, buf_ctl2_reg, | |
| 2540 | − intel_cx0_get_powerdown_update(lane_mask), 0, | |
| 2541 | − XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US, 0, NULL)) | |
| 2548 | + if (intel_de_wait_custom(i915, buf_ctl2_reg, | |
| 2549 | + intel_cx0_get_powerdown_update(lane_mask), 0, | |
| 2550 | + XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US, 0, NULL)) | |
| 2542 | 2551 | drm_warn(&i915->drm, "PHY %c failed to bring out of Lane reset after %dus.\n", |
| 2543 | 2552 | phy_name(phy), XELPDP_PORT_RESET_START_TIMEOUT_US); |
| 2544 | 2553 | } |
| 2545 | 2554 | |
| 2546 | −static void intel_cx0_setup_powerdown(struct drm_i915_private *i915, enum port port) | |
| 2555 | +static void intel_cx0_setup_powerdown(struct intel_encoder *encoder) | |
| 2547 | 2556 | { |
| 2557 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 2558 | + enum port port = encoder->port; | |
| 2559 | + | |
| 2548 | 2560 | intel_de_rmw(i915, XELPDP_PORT_BUF_CTL2(i915, port), |
| 2549 | 2561 | XELPDP_POWER_STATE_READY_MASK, |
| 2550 | 2562 | XELPDP_POWER_STATE_READY(CX0_P2_STATE_READY)); |
| @@ -2577,13 +2589,13 @@ static u32 intel_cx0_get_pclk_refclk_ack(u8 lane_mask) · 26 unmodified lines | ||
| 2577 | 2589 | return val; |
| 2578 | 2590 | } |
| 2579 | 2591 | |
| 2580 | −static void intel_cx0_phy_lane_reset(struct drm_i915_private *i915, | |
| 2581 | − struct intel_encoder *encoder, | |
| 2592 | +static void intel_cx0_phy_lane_reset(struct intel_encoder *encoder, | |
| 2582 | 2593 | bool lane_reversal) |
| 2583 | 2594 | { |
| 2595 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 2584 | 2596 | enum port port = encoder->port; |
| 2585 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 2586 | − u8 owned_lane_mask = intel_cx0_get_owned_lane_mask(i915, encoder); | |
| 2597 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2598 | + u8 owned_lane_mask = intel_cx0_get_owned_lane_mask(encoder); | |
| 2587 | 2599 | u8 lane_mask = lane_reversal ? INTEL_CX0_LANE1 : INTEL_CX0_LANE0; |
| 2588 | 2600 | u32 lane_pipe_reset = owned_lane_mask == INTEL_CX0_BOTH_LANES |
| 2589 | 2601 | ? XELPDP_LANE_PIPE_RESET(0) | XELPDP_LANE_PIPE_RESET(1) |
| @@ -2593,19 +2605,19 @@ static void intel_cx0_phy_lane_reset(struct drm_i915_private *i915, · 3 unmodified lines | ||
| 2593 | 2605 | XELPDP_LANE_PHY_CURRENT_STATUS(1)) |
| 2594 | 2606 | : XELPDP_LANE_PHY_CURRENT_STATUS(0); |
| 2595 | 2607 | |
| 2596 | − if (__intel_de_wait_for_register(i915, XELPDP_PORT_BUF_CTL1(i915, port), | |
| 2597 | − XELPDP_PORT_BUF_SOC_PHY_READY, | |
| 2598 | − XELPDP_PORT_BUF_SOC_PHY_READY, | |
| 2599 | − XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US, 0, NULL)) | |
| 2608 | + if (intel_de_wait_custom(i915, XELPDP_PORT_BUF_CTL1(i915, port), | |
| 2609 | + XELPDP_PORT_BUF_SOC_PHY_READY, | |
| 2610 | + XELPDP_PORT_BUF_SOC_PHY_READY, | |
| 2611 | + XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US, 0, NULL)) | |
| 2600 | 2612 | drm_warn(&i915->drm, "PHY %c failed to bring out of SOC reset after %dus.\n", |
| 2601 | 2613 | phy_name(phy), XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US); |
| 2602 | 2614 | |
| 2603 | 2615 | intel_de_rmw(i915, XELPDP_PORT_BUF_CTL2(i915, port), lane_pipe_reset, |
| 2604 | 2616 | lane_pipe_reset); |
| 2605 | 2617 | |
| 2606 | − if (__intel_de_wait_for_register(i915, XELPDP_PORT_BUF_CTL2(i915, port), | |
| 2607 | − lane_phy_current_status, lane_phy_current_status, | |
| 2608 | − XELPDP_PORT_RESET_START_TIMEOUT_US, 0, NULL)) | |
| 2618 | + if (intel_de_wait_custom(i915, XELPDP_PORT_BUF_CTL2(i915, port), | |
| 2619 | + lane_phy_current_status, lane_phy_current_status, | |
| 2620 | + XELPDP_PORT_RESET_START_TIMEOUT_US, 0, NULL)) | |
| 2609 | 2621 | drm_warn(&i915->drm, "PHY %c failed to bring out of Lane reset after %dus.\n", |
| 2610 | 2622 | phy_name(phy), XELPDP_PORT_RESET_START_TIMEOUT_US); |
| 2611 | 2623 | |
| @@ -2613,16 +2625,16 @@ static void intel_cx0_phy_lane_reset(struct drm_i915_private *i915, · 1 unmodified line | ||
| 2613 | 2625 | intel_cx0_get_pclk_refclk_request(owned_lane_mask), |
| 2614 | 2626 | intel_cx0_get_pclk_refclk_request(lane_mask)); |
| 2615 | 2627 | |
| 2616 | − if (__intel_de_wait_for_register(i915, XELPDP_PORT_CLOCK_CTL(i915, port), | |
| 2617 | − intel_cx0_get_pclk_refclk_ack(owned_lane_mask), | |
| 2618 | − intel_cx0_get_pclk_refclk_ack(lane_mask), | |
| 2619 | − XELPDP_REFCLK_ENABLE_TIMEOUT_US, 0, NULL)) | |
| 2628 | + if (intel_de_wait_custom(i915, XELPDP_PORT_CLOCK_CTL(i915, port), | |
| 2629 | + intel_cx0_get_pclk_refclk_ack(owned_lane_mask), | |
| 2630 | + intel_cx0_get_pclk_refclk_ack(lane_mask), | |
| 2631 | + XELPDP_REFCLK_ENABLE_TIMEOUT_US, 0, NULL)) | |
| 2620 | 2632 | drm_warn(&i915->drm, "PHY %c failed to request refclk after %dus.\n", |
| 2621 | 2633 | phy_name(phy), XELPDP_REFCLK_ENABLE_TIMEOUT_US); |
| 2622 | 2634 | |
| 2623 | − intel_cx0_powerdown_change_sequence(i915, port, INTEL_CX0_BOTH_LANES, | |
| 2635 | + intel_cx0_powerdown_change_sequence(encoder, INTEL_CX0_BOTH_LANES, | |
| 2624 | 2636 | CX0_P2_STATE_RESET); |
| 2625 | − intel_cx0_setup_powerdown(i915, port); | |
| 2637 | + intel_cx0_setup_powerdown(encoder); | |
| 2626 | 2638 | |
| 2627 | 2639 | intel_de_rmw(i915, XELPDP_PORT_BUF_CTL2(i915, port), lane_pipe_reset, 0); |
| 2628 | 2640 | |
| @@ -2640,11 +2652,10 @@ static void intel_cx0_program_phy_lane(struct drm_i915_private *i915, · 11 unmodified lines | ||
| 2640 | 2652 | int i; |
| 2641 | 2653 | u8 disables; |
| 2642 | 2654 | bool dp_alt_mode = intel_tc_port_in_dp_alt_mode(enc_to_dig_port(encoder)); |
| 2643 | − u8 owned_lane_mask = intel_cx0_get_owned_lane_mask(i915, encoder); | |
| 2644 | − enum port port = encoder->port; | |
| 2655 | + u8 owned_lane_mask = intel_cx0_get_owned_lane_mask(encoder); | |
| 2645 | 2656 | |
| 2646 | − if (intel_is_c10phy(i915, intel_port_to_phy(i915, port))) | |
| 2647 | − intel_cx0_rmw(i915, port, owned_lane_mask, | |
| 2657 | + if (intel_encoder_is_c10phy(encoder)) | |
| 2658 | + intel_cx0_rmw(encoder, owned_lane_mask, | |
| 2648 | 2659 | PHY_C10_VDR_CONTROL(1), 0, |
| 2649 | 2660 | C10_VDR_CTRL_MSGBUS_ACCESS, |
| 2650 | 2661 | MB_WRITE_COMMITTED); |
| @@ -2666,14 +2677,14 @@ static void intel_cx0_program_phy_lane(struct drm_i915_private *i915, · 15 unmodified lines | ||
| 2666 | 2677 | if (!(owned_lane_mask & lane_mask)) |
| 2667 | 2678 | continue; |
| 2668 | 2679 | |
| 2669 | − intel_cx0_rmw(i915, port, lane_mask, PHY_CX0_TX_CONTROL(tx, 2), | |
| 2680 | + intel_cx0_rmw(encoder, lane_mask, PHY_CX0_TX_CONTROL(tx, 2), | |
| 2670 | 2681 | CONTROL2_DISABLE_SINGLE_TX, |
| 2671 | 2682 | disables & BIT(i) ? CONTROL2_DISABLE_SINGLE_TX : 0, |
| 2672 | 2683 | MB_WRITE_COMMITTED); |
| 2673 | 2684 | } |
| 2674 | 2685 | |
| 2675 | − if (intel_is_c10phy(i915, intel_port_to_phy(i915, port))) | |
| 2676 | − intel_cx0_rmw(i915, port, owned_lane_mask, | |
| 2686 | + if (intel_encoder_is_c10phy(encoder)) | |
| 2687 | + intel_cx0_rmw(encoder, owned_lane_mask, | |
| 2677 | 2688 | PHY_C10_VDR_CONTROL(1), 0, |
| 2678 | 2689 | C10_VDR_CTRL_UPDATE_CFG, |
| 2679 | 2690 | MB_WRITE_COMMITTED); |
| @@ -2705,7 +2716,7 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder, · 25 unmodified lines | ||
| 2705 | 2716 | const struct intel_crtc_state *crtc_state) |
| 2706 | 2717 | { |
| 2707 | 2718 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 2708 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 2719 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2709 | 2720 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 2710 | 2721 | bool lane_reversal = dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL; |
| 2711 | 2722 | u8 maxpclk_lane = lane_reversal ? INTEL_CX0_LANE1 : |
| @@ -2719,13 +2730,13 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder, · 7 unmodified lines | ||
| 2719 | 2730 | intel_program_port_clock_ctl(encoder, crtc_state, lane_reversal); |
| 2720 | 2731 | |
| 2721 | 2732 | /* 2. Bring PHY out of reset. */ |
| 2722 | − intel_cx0_phy_lane_reset(i915, encoder, lane_reversal); | |
| 2733 | + intel_cx0_phy_lane_reset(encoder, lane_reversal); | |
| 2723 | 2734 | |
| 2724 | 2735 | /* |
| 2725 | 2736 | * 3. Change Phy power state to Ready. |
| 2726 | 2737 | * TODO: For DP alt mode use only one lane. |
| 2727 | 2738 | */ |
| 2728 | − intel_cx0_powerdown_change_sequence(i915, encoder->port, INTEL_CX0_BOTH_LANES, | |
| 2739 | + intel_cx0_powerdown_change_sequence(encoder, INTEL_CX0_BOTH_LANES, | |
| 2729 | 2740 | CX0_P2_STATE_READY); |
| 2730 | 2741 | |
| 2731 | 2742 | /* |
| @@ -2735,7 +2746,7 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder, · 3 unmodified lines | ||
| 2735 | 2746 | */ |
| 2736 | 2747 | |
| 2737 | 2748 | /* 5. Program PHY internal PLL internal registers. */ |
| 2738 | − if (intel_is_c10phy(i915, phy)) | |
| 2749 | + if (intel_encoder_is_c10phy(encoder)) | |
| 2739 | 2750 | intel_c10_pll_program(i915, crtc_state, encoder); |
| 2740 | 2751 | else |
| 2741 | 2752 | intel_c20_pll_program(i915, crtc_state, encoder); |
| @@ -2767,10 +2778,10 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder, · 25 unmodified lines | ||
| 2767 | 2778 | intel_cx0_get_pclk_pll_request(maxpclk_lane)); |
| 2768 | 2779 | |
| 2769 | 2780 | /* 10. Poll on PORT_CLOCK_CTL PCLK PLL Ack LN<Lane for maxPCLK> == "1". */ |
| 2770 | − if (__intel_de_wait_for_register(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2771 | − intel_cx0_get_pclk_pll_ack(INTEL_CX0_BOTH_LANES), | |
| 2772 | − intel_cx0_get_pclk_pll_ack(maxpclk_lane), | |
| 2773 | − XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US, 0, NULL)) | |
| 2781 | + if (intel_de_wait_custom(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2782 | + intel_cx0_get_pclk_pll_ack(INTEL_CX0_BOTH_LANES), | |
| 2783 | + intel_cx0_get_pclk_pll_ack(maxpclk_lane), | |
| 2784 | + XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US, 0, NULL)) | |
| 2774 | 2785 | drm_warn(&i915->drm, "Port %c PLL not locked after %dus.\n", |
| 2775 | 2786 | phy_name(phy), XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US); |
| 2776 | 2787 | |
| @@ -2831,7 +2842,7 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder, · 54 unmodified lines | ||
| 2831 | 2842 | const struct intel_crtc_state *crtc_state) |
| 2832 | 2843 | { |
| 2833 | 2844 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 2834 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 2845 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2835 | 2846 | u32 val = 0; |
| 2836 | 2847 | |
| 2837 | 2848 | /* |
| @@ -2858,10 +2869,10 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder, · 20 unmodified lines | ||
| 2858 | 2869 | intel_de_write(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), val); |
| 2859 | 2870 | |
| 2860 | 2871 | /* 5. Poll on PORT_CLOCK_CTL TBT CLOCK Ack == "1". */ |
| 2861 | − if (__intel_de_wait_for_register(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2862 | − XELPDP_TBT_CLOCK_ACK, | |
| 2863 | − XELPDP_TBT_CLOCK_ACK, | |
| 2864 | − 100, 0, NULL)) | |
| 2872 | + if (intel_de_wait_custom(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2873 | + XELPDP_TBT_CLOCK_ACK, | |
| 2874 | + XELPDP_TBT_CLOCK_ACK, | |
| 2875 | + 100, 0, NULL)) | |
| 2865 | 2876 | drm_warn(&i915->drm, "[ENCODER:%d:%s][%c] PHY PLL not locked after 100us.\n", |
| 2866 | 2877 | encoder->base.base.id, encoder->base.name, phy_name(phy)); |
| 2867 | 2878 | |
| @@ -2892,12 +2903,12 @@ void intel_mtl_pll_enable(struct intel_encoder *encoder, · 24 unmodified lines | ||
| 2892 | 2903 | static void intel_cx0pll_disable(struct intel_encoder *encoder) |
| 2893 | 2904 | { |
| 2894 | 2905 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 2895 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 2896 | − bool is_c10 = intel_is_c10phy(i915, phy); | |
| 2906 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2907 | + bool is_c10 = intel_encoder_is_c10phy(encoder); | |
| 2897 | 2908 | intel_wakeref_t wakeref = intel_cx0_phy_transaction_begin(encoder); |
| 2898 | 2909 | |
| 2899 | 2910 | /* 1. Change owned PHY lane power to Disable state. */ |
| 2900 | − intel_cx0_powerdown_change_sequence(i915, encoder->port, INTEL_CX0_BOTH_LANES, | |
| 2911 | + intel_cx0_powerdown_change_sequence(encoder, INTEL_CX0_BOTH_LANES, | |
| 2901 | 2912 | is_c10 ? CX0_P2PG_STATE_DISABLE : |
| 2902 | 2913 | CX0_P4PG_STATE_DISABLE); |
| 2903 | 2914 | |
| @@ -2920,10 +2931,10 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder) · 16 unmodified lines | ||
| 2920 | 2931 | /* |
| 2921 | 2932 | * 5. Poll on PORT_CLOCK_CTL PCLK PLL Ack LN<Lane for maxPCLK**> == "0". |
| 2922 | 2933 | */ |
| 2923 | − if (__intel_de_wait_for_register(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2924 | − intel_cx0_get_pclk_pll_ack(INTEL_CX0_BOTH_LANES) | | |
| 2925 | − intel_cx0_get_pclk_refclk_ack(INTEL_CX0_BOTH_LANES), 0, | |
| 2926 | − XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US, 0, NULL)) | |
| 2934 | + if (intel_de_wait_custom(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2935 | + intel_cx0_get_pclk_pll_ack(INTEL_CX0_BOTH_LANES) | | |
| 2936 | + intel_cx0_get_pclk_refclk_ack(INTEL_CX0_BOTH_LANES), 0, | |
| 2937 | + XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US, 0, NULL)) | |
| 2927 | 2938 | drm_warn(&i915->drm, "Port %c PLL not unlocked after %dus.\n", |
| 2928 | 2939 | phy_name(phy), XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US); |
| 2929 | 2940 | |
| @@ -2944,7 +2955,7 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder) · 14 unmodified lines | ||
| 2944 | 2955 | static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder) |
| 2945 | 2956 | { |
| 2946 | 2957 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 2947 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 2958 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2948 | 2959 | |
| 2949 | 2960 | /* |
| 2950 | 2961 | * 1. Follow the Display Voltage Frequency Switching Sequence Before |
| @@ -2958,8 +2969,8 @@ static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder) · 7 unmodified lines | ||
| 2958 | 2969 | XELPDP_TBT_CLOCK_REQUEST, 0); |
| 2959 | 2970 | |
| 2960 | 2971 | /* 3. Poll on PORT_CLOCK_CTL TBT CLOCK Ack == "0". */ |
| 2961 | − if (__intel_de_wait_for_register(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2962 | − XELPDP_TBT_CLOCK_ACK, 0, 10, 0, NULL)) | |
| 2972 | + if (intel_de_wait_custom(i915, XELPDP_PORT_CLOCK_CTL(i915, encoder->port), | |
| 2973 | + XELPDP_TBT_CLOCK_ACK, 0, 10, 0, NULL)) | |
| 2963 | 2974 | drm_warn(&i915->drm, "[ENCODER:%d:%s][%c] PHY PLL not unlocked after 10us.\n", |
| 2964 | 2975 | encoder->base.base.id, encoder->base.name, phy_name(phy)); |
| 2965 | 2976 | |
| @@ -3043,10 +3054,7 @@ static void intel_c10pll_state_verify(const struct intel_crtc_state *state, · 77 unmodified lines | ||
| 3043 | 3054 | void intel_cx0pll_readout_hw_state(struct intel_encoder *encoder, |
| 3044 | 3055 | struct intel_cx0pll_state *pll_state) |
| 3045 | 3056 | { |
| 3046 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 3047 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 3048 | − | |
| 3049 | − if (intel_is_c10phy(i915, phy)) | |
| 3057 | + if (intel_encoder_is_c10phy(encoder)) | |
| 3050 | 3058 | intel_c10pll_readout_hw_state(encoder, &pll_state->c10); |
| 3051 | 3059 | else |
| 3052 | 3060 | intel_c20pll_readout_hw_state(encoder, &pll_state->c20); |
| @@ -3055,10 +3063,7 @@ void intel_cx0pll_readout_hw_state(struct intel_encoder *encoder, · 2 unmodified lines | ||
| 3055 | 3063 | int intel_cx0pll_calc_port_clock(struct intel_encoder *encoder, |
| 3056 | 3064 | const struct intel_cx0pll_state *pll_state) |
| 3057 | 3065 | { |
| 3058 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 3059 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 3060 | − | |
| 3061 | − if (intel_is_c10phy(i915, phy)) | |
| 3066 | + if (intel_encoder_is_c10phy(encoder)) | |
| 3062 | 3067 | return intel_c10pll_calc_port_clock(encoder, &pll_state->c10); |
| 3063 | 3068 | |
| 3064 | 3069 | return intel_c20pll_calc_port_clock(encoder, &pll_state->c20); |
| @@ -3124,7 +3129,6 @@ void intel_cx0pll_state_verify(struct intel_atomic_state *state, · 59 unmodified lines | ||
| 3124 | 3129 | intel_atomic_get_new_crtc_state(state, crtc); |
| 3125 | 3130 | struct intel_encoder *encoder; |
| 3126 | 3131 | struct intel_cx0pll_state mpll_hw_state = {}; |
| 3127 | − enum phy phy; | |
| 3128 | 3132 | |
| 3129 | 3133 | if (DISPLAY_VER(i915) < 14) |
| 3130 | 3134 | return; |
| @@ -3138,14 +3142,13 @@ void intel_cx0pll_state_verify(struct intel_atomic_state *state, · 7 unmodified lines | ||
| 3138 | 3142 | return; |
| 3139 | 3143 | |
| 3140 | 3144 | encoder = intel_get_crtc_new_encoder(state, new_crtc_state); |
| 3141 | − phy = intel_port_to_phy(i915, encoder->port); | |
| 3142 | 3145 | |
| 3143 | 3146 | if (intel_tc_port_in_tbt_alt_mode(enc_to_dig_port(encoder))) |
| 3144 | 3147 | return; |
| 3145 | 3148 | |
| 3146 | 3149 | intel_cx0pll_readout_hw_state(encoder, &mpll_hw_state); |
| 3147 | 3150 | |
| 3148 | − if (intel_is_c10phy(i915, phy)) | |
| 3151 | + if (intel_encoder_is_c10phy(encoder)) | |
| 3149 | 3152 | intel_c10pll_state_verify(new_crtc_state, crtc, encoder, &mpll_hw_state.c10); |
| 3150 | 3153 | else |
| 3151 | 3154 | intel_c20pll_state_verify(new_crtc_state, crtc, encoder, &mpll_hw_state.c20); |
| @@ -11,7 +11,6 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/bits.h> |
| 12 | 12 | |
| 13 | 13 | enum icl_port_dpll_id; |
| 14 | −enum phy; | |
| 15 | 14 | struct drm_i915_private; |
| 16 | 15 | struct intel_atomic_state; |
| 17 | 16 | struct intel_c10pll_state; |
| @@ -22,7 +21,7 @@ struct intel_crtc_state; · 4 unmodified lines | ||
| 22 | 21 | struct intel_encoder; |
| 23 | 22 | struct intel_hdmi; |
| 24 | 23 | |
| 25 | −bool intel_is_c10phy(struct drm_i915_private *dev_priv, enum phy phy); | |
| 24 | +bool intel_encoder_is_c10phy(struct intel_encoder *encoder); | |
| 26 | 25 | void intel_mtl_pll_enable(struct intel_encoder *encoder, |
| 27 | 26 | const struct intel_crtc_state *crtc_state); |
| 28 | 27 | void intel_mtl_pll_disable(struct intel_encoder *encoder); |
| @@ -200,10 +200,10 @@ void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, · 199 unmodified lines | ||
| 200 | 200 | port_name(port)); |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | −static void intel_wait_ddi_buf_active(struct drm_i915_private *dev_priv, | |
| 204 | − enum port port) | |
| 203 | +static void intel_wait_ddi_buf_active(struct intel_encoder *encoder) | |
| 205 | 204 | { |
| 206 | − enum phy phy = intel_port_to_phy(dev_priv, port); | |
| 205 | + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); | |
| 206 | + enum port port = encoder->port; | |
| 207 | 207 | int timeout_us; |
| 208 | 208 | int ret; |
| 209 | 209 | |
| @@ -218,7 +218,7 @@ static void intel_wait_ddi_buf_active(struct drm_i915_private *dev_priv, · 8 unmodified lines | ||
| 218 | 218 | } else if (IS_DG2(dev_priv)) { |
| 219 | 219 | timeout_us = 1200; |
| 220 | 220 | } else if (DISPLAY_VER(dev_priv) >= 12) { |
| 221 | − if (intel_phy_is_tc(dev_priv, phy)) | |
| 221 | + if (intel_encoder_is_tc(encoder)) | |
| 222 | 222 | timeout_us = 3000; |
| 223 | 223 | else |
| 224 | 224 | timeout_us = 1000; |
| @@ -331,7 +331,6 @@ static void intel_ddi_init_dp_buf_reg(struct intel_encoder *encoder, · 106 unmodified lines | ||
| 331 | 331 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 332 | 332 | struct intel_dp *intel_dp = enc_to_intel_dp(encoder); |
| 333 | 333 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 334 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 335 | 334 | |
| 336 | 335 | /* DDI_BUF_CTL_ENABLE will be set by intel_ddi_prepare_link_retrain() later */ |
| 337 | 336 | intel_dp->DP = dig_port->saved_port_bits | |
| @@ -345,7 +344,7 @@ static void intel_ddi_init_dp_buf_reg(struct intel_encoder *encoder, · 7 unmodified lines | ||
| 345 | 344 | intel_dp->DP |= DDI_BUF_PORT_DATA_10BIT; |
| 346 | 345 | } |
| 347 | 346 | |
| 348 | − if (IS_ALDERLAKE_P(i915) && intel_phy_is_tc(i915, phy)) { | |
| 347 | + if (IS_ALDERLAKE_P(i915) && intel_encoder_is_tc(encoder)) { | |
| 349 | 348 | intel_dp->DP |= ddi_buf_phy_link_rate(crtc_state->port_clock); |
| 350 | 349 | if (!intel_tc_port_in_tbt_alt_mode(dig_port)) |
| 351 | 350 | intel_dp->DP |= DDI_BUF_CTL_TC_PHY_OWNERSHIP; |
| @@ -895,7 +894,6 @@ intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port, · 543 unmodified lines | ||
| 895 | 894 | const struct intel_crtc_state *crtc_state) |
| 896 | 895 | { |
| 897 | 896 | struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); |
| 898 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 899 | 897 | |
| 900 | 898 | /* |
| 901 | 899 | * ICL+ HW requires corresponding AUX IOs to be powered up for PSR with |
| @@ -914,7 +912,7 @@ intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port, · 12 unmodified lines | ||
| 914 | 912 | return intel_display_power_aux_io_domain(i915, dig_port->aux_ch); |
| 915 | 913 | else if (DISPLAY_VER(i915) < 14 && |
| 916 | 914 | (intel_crtc_has_dp_encoder(crtc_state) || |
| 917 | − intel_phy_is_tc(i915, phy))) | |
| 915 | + intel_encoder_is_tc(&dig_port->base))) | |
| 918 | 916 | return intel_aux_power_domain(dig_port); |
| 919 | 917 | else |
| 920 | 918 | return POWER_DOMAIN_INVALID; |
| @@ -984,7 +982,7 @@ void intel_ddi_enable_transcoder_clock(struct intel_encoder *encoder, · 63 unmodified lines | ||
| 984 | 982 | struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); |
| 985 | 983 | struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); |
| 986 | 984 | enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; |
| 987 | − enum phy phy = intel_port_to_phy(dev_priv, encoder->port); | |
| 985 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 988 | 986 | u32 val; |
| 989 | 987 | |
| 990 | 988 | if (cpu_transcoder == TRANSCODER_EDP) |
| @@ -1113,7 +1111,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, · 122 unmodified lines | ||
| 1113 | 1111 | { |
| 1114 | 1112 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 1115 | 1113 | const struct intel_ddi_buf_trans *trans; |
| 1116 | − enum phy phy = intel_port_to_phy(dev_priv, encoder->port); | |
| 1114 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1117 | 1115 | int n_entries, ln; |
| 1118 | 1116 | u32 val; |
| 1119 | 1117 | |
| @@ -1176,7 +1174,7 @@ static void icl_combo_phy_set_signal_levels(struct intel_encoder *encoder, · 56 unmodified lines | ||
| 1176 | 1174 | const struct intel_crtc_state *crtc_state) |
| 1177 | 1175 | { |
| 1178 | 1176 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 1179 | − enum phy phy = intel_port_to_phy(dev_priv, encoder->port); | |
| 1177 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1180 | 1178 | u32 val; |
| 1181 | 1179 | int ln; |
| 1182 | 1180 | |
| @@ -1227,7 +1225,7 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder, · 44 unmodified lines | ||
| 1227 | 1225 | const struct intel_crtc_state *crtc_state) |
| 1228 | 1226 | { |
| 1229 | 1227 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 1230 | − enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); | |
| 1228 | + enum tc_port tc_port = intel_encoder_to_tc(encoder); | |
| 1231 | 1229 | const struct intel_ddi_buf_trans *trans; |
| 1232 | 1230 | int n_entries, ln; |
| 1233 | 1231 | |
| @@ -1328,7 +1326,7 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder, · 94 unmodified lines | ||
| 1328 | 1326 | const struct intel_crtc_state *crtc_state) |
| 1329 | 1327 | { |
| 1330 | 1328 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 1331 | − enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); | |
| 1329 | + enum tc_port tc_port = intel_encoder_to_tc(encoder); | |
| 1332 | 1330 | const struct intel_ddi_buf_trans *trans; |
| 1333 | 1331 | int n_entries, ln; |
| 1334 | 1332 | |
| @@ -1526,7 +1524,7 @@ static void adls_ddi_enable_clock(struct intel_encoder *encoder, · 191 unmodified lines | ||
| 1526 | 1524 | { |
| 1527 | 1525 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1528 | 1526 | const struct intel_shared_dpll *pll = crtc_state->shared_dpll; |
| 1529 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1527 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1530 | 1528 | |
| 1531 | 1529 | if (drm_WARN_ON(&i915->drm, !pll)) |
| 1532 | 1530 | return; |
| @@ -1540,7 +1538,7 @@ static void adls_ddi_enable_clock(struct intel_encoder *encoder, · 7 unmodified lines | ||
| 1540 | 1538 | static void adls_ddi_disable_clock(struct intel_encoder *encoder) |
| 1541 | 1539 | { |
| 1542 | 1540 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1543 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1541 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1544 | 1542 | |
| 1545 | 1543 | _icl_ddi_disable_clock(i915, ADLS_DPCLKA_CFGCR(phy), |
| 1546 | 1544 | ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1549,7 +1547,7 @@ static void adls_ddi_disable_clock(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1549 | 1547 | static bool adls_ddi_is_clock_enabled(struct intel_encoder *encoder) |
| 1550 | 1548 | { |
| 1551 | 1549 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1552 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1550 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1553 | 1551 | |
| 1554 | 1552 | return _icl_ddi_is_clock_enabled(i915, ADLS_DPCLKA_CFGCR(phy), |
| 1555 | 1553 | ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1558,7 +1556,7 @@ static bool adls_ddi_is_clock_enabled(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1558 | 1556 | static struct intel_shared_dpll *adls_ddi_get_pll(struct intel_encoder *encoder) |
| 1559 | 1557 | { |
| 1560 | 1558 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1561 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1559 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1562 | 1560 | |
| 1563 | 1561 | return _icl_ddi_get_pll(i915, ADLS_DPCLKA_CFGCR(phy), |
| 1564 | 1562 | ADLS_DPCLKA_CFGCR_DDI_CLK_SEL_MASK(phy), |
| @@ -1570,7 +1568,7 @@ static void rkl_ddi_enable_clock(struct intel_encoder *encoder, · 5 unmodified lines | ||
| 1570 | 1568 | { |
| 1571 | 1569 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1572 | 1570 | const struct intel_shared_dpll *pll = crtc_state->shared_dpll; |
| 1573 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1571 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1574 | 1572 | |
| 1575 | 1573 | if (drm_WARN_ON(&i915->drm, !pll)) |
| 1576 | 1574 | return; |
| @@ -1584,7 +1582,7 @@ static void rkl_ddi_enable_clock(struct intel_encoder *encoder, · 7 unmodified lines | ||
| 1584 | 1582 | static void rkl_ddi_disable_clock(struct intel_encoder *encoder) |
| 1585 | 1583 | { |
| 1586 | 1584 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1587 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1585 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1588 | 1586 | |
| 1589 | 1587 | _icl_ddi_disable_clock(i915, ICL_DPCLKA_CFGCR0, |
| 1590 | 1588 | RKL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1593,7 +1591,7 @@ static void rkl_ddi_disable_clock(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1593 | 1591 | static bool rkl_ddi_is_clock_enabled(struct intel_encoder *encoder) |
| 1594 | 1592 | { |
| 1595 | 1593 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1596 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1594 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1597 | 1595 | |
| 1598 | 1596 | return _icl_ddi_is_clock_enabled(i915, ICL_DPCLKA_CFGCR0, |
| 1599 | 1597 | RKL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1602,7 +1600,7 @@ static bool rkl_ddi_is_clock_enabled(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1602 | 1600 | static struct intel_shared_dpll *rkl_ddi_get_pll(struct intel_encoder *encoder) |
| 1603 | 1601 | { |
| 1604 | 1602 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1605 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1603 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1606 | 1604 | |
| 1607 | 1605 | return _icl_ddi_get_pll(i915, ICL_DPCLKA_CFGCR0, |
| 1608 | 1606 | RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy), |
| @@ -1614,7 +1612,7 @@ static void dg1_ddi_enable_clock(struct intel_encoder *encoder, · 5 unmodified lines | ||
| 1614 | 1612 | { |
| 1615 | 1613 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1616 | 1614 | const struct intel_shared_dpll *pll = crtc_state->shared_dpll; |
| 1617 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1615 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1618 | 1616 | |
| 1619 | 1617 | if (drm_WARN_ON(&i915->drm, !pll)) |
| 1620 | 1618 | return; |
| @@ -1637,7 +1635,7 @@ static void dg1_ddi_enable_clock(struct intel_encoder *encoder, · 16 unmodified lines | ||
| 1637 | 1635 | static void dg1_ddi_disable_clock(struct intel_encoder *encoder) |
| 1638 | 1636 | { |
| 1639 | 1637 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1640 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1638 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1641 | 1639 | |
| 1642 | 1640 | _icl_ddi_disable_clock(i915, DG1_DPCLKA_CFGCR0(phy), |
| 1643 | 1641 | DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1646,7 +1644,7 @@ static void dg1_ddi_disable_clock(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1646 | 1644 | static bool dg1_ddi_is_clock_enabled(struct intel_encoder *encoder) |
| 1647 | 1645 | { |
| 1648 | 1646 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1649 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1647 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1650 | 1648 | |
| 1651 | 1649 | return _icl_ddi_is_clock_enabled(i915, DG1_DPCLKA_CFGCR0(phy), |
| 1652 | 1650 | DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1655,7 +1653,7 @@ static bool dg1_ddi_is_clock_enabled(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1655 | 1653 | static struct intel_shared_dpll *dg1_ddi_get_pll(struct intel_encoder *encoder) |
| 1656 | 1654 | { |
| 1657 | 1655 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1658 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1656 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1659 | 1657 | enum intel_dpll_id id; |
| 1660 | 1658 | u32 val; |
| 1661 | 1659 | |
| @@ -1680,7 +1678,7 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder, · 18 unmodified lines | ||
| 1680 | 1678 | { |
| 1681 | 1679 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1682 | 1680 | const struct intel_shared_dpll *pll = crtc_state->shared_dpll; |
| 1683 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1681 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1684 | 1682 | |
| 1685 | 1683 | if (drm_WARN_ON(&i915->drm, !pll)) |
| 1686 | 1684 | return; |
| @@ -1694,7 +1692,7 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder, · 7 unmodified lines | ||
| 1694 | 1692 | static void icl_ddi_combo_disable_clock(struct intel_encoder *encoder) |
| 1695 | 1693 | { |
| 1696 | 1694 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1697 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1695 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1698 | 1696 | |
| 1699 | 1697 | _icl_ddi_disable_clock(i915, ICL_DPCLKA_CFGCR0, |
| 1700 | 1698 | ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1703,7 +1701,7 @@ static void icl_ddi_combo_disable_clock(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1703 | 1701 | static bool icl_ddi_combo_is_clock_enabled(struct intel_encoder *encoder) |
| 1704 | 1702 | { |
| 1705 | 1703 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1706 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1704 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1707 | 1705 | |
| 1708 | 1706 | return _icl_ddi_is_clock_enabled(i915, ICL_DPCLKA_CFGCR0, |
| 1709 | 1707 | ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); |
| @@ -1712,7 +1710,7 @@ static bool icl_ddi_combo_is_clock_enabled(struct intel_encoder *encoder) · 2 unmodified lines | ||
| 1712 | 1710 | struct intel_shared_dpll *icl_ddi_combo_get_pll(struct intel_encoder *encoder) |
| 1713 | 1711 | { |
| 1714 | 1712 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1715 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1713 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1716 | 1714 | |
| 1717 | 1715 | return _icl_ddi_get_pll(i915, ICL_DPCLKA_CFGCR0, |
| 1718 | 1716 | ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy), |
| @@ -1767,7 +1765,7 @@ static void icl_ddi_tc_enable_clock(struct intel_encoder *encoder, · 48 unmodified lines | ||
| 1767 | 1765 | { |
| 1768 | 1766 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1769 | 1767 | const struct intel_shared_dpll *pll = crtc_state->shared_dpll; |
| 1770 | − enum tc_port tc_port = intel_port_to_tc(i915, encoder->port); | |
| 1768 | + enum tc_port tc_port = intel_encoder_to_tc(encoder); | |
| 1771 | 1769 | enum port port = encoder->port; |
| 1772 | 1770 | |
| 1773 | 1771 | if (drm_WARN_ON(&i915->drm, !pll)) |
| @@ -1787,7 +1785,7 @@ static void icl_ddi_tc_enable_clock(struct intel_encoder *encoder, · 13 unmodified lines | ||
| 1787 | 1785 | static void icl_ddi_tc_disable_clock(struct intel_encoder *encoder) |
| 1788 | 1786 | { |
| 1789 | 1787 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1790 | − enum tc_port tc_port = intel_port_to_tc(i915, encoder->port); | |
| 1788 | + enum tc_port tc_port = intel_encoder_to_tc(encoder); | |
| 1791 | 1789 | enum port port = encoder->port; |
| 1792 | 1790 | |
| 1793 | 1791 | mutex_lock(&i915->display.dpll.lock); |
| @@ -1803,7 +1801,7 @@ static void icl_ddi_tc_disable_clock(struct intel_encoder *encoder) · 9 unmodified lines | ||
| 1803 | 1801 | static bool icl_ddi_tc_is_clock_enabled(struct intel_encoder *encoder) |
| 1804 | 1802 | { |
| 1805 | 1803 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1806 | − enum tc_port tc_port = intel_port_to_tc(i915, encoder->port); | |
| 1804 | + enum tc_port tc_port = intel_encoder_to_tc(encoder); | |
| 1807 | 1805 | enum port port = encoder->port; |
| 1808 | 1806 | u32 tmp; |
| 1809 | 1807 | |
| @@ -1820,7 +1818,7 @@ static bool icl_ddi_tc_is_clock_enabled(struct intel_encoder *encoder) · 10 unmodified lines | ||
| 1820 | 1818 | static struct intel_shared_dpll *icl_ddi_tc_get_pll(struct intel_encoder *encoder) |
| 1821 | 1819 | { |
| 1822 | 1820 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1823 | − enum tc_port tc_port = intel_port_to_tc(i915, encoder->port); | |
| 1821 | + enum tc_port tc_port = intel_encoder_to_tc(encoder); | |
| 1824 | 1822 | enum port port = encoder->port; |
| 1825 | 1823 | enum intel_dpll_id id; |
| 1826 | 1824 | u32 tmp; |
| @@ -2086,12 +2084,11 @@ icl_program_mg_dp_mode(struct intel_digital_port *dig_port, · 259 unmodified lines | ||
| 2086 | 2084 | const struct intel_crtc_state *crtc_state) |
| 2087 | 2085 | { |
| 2088 | 2086 | struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev); |
| 2089 | − enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port); | |
| 2090 | − enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port); | |
| 2087 | + enum tc_port tc_port = intel_encoder_to_tc(&dig_port->base); | |
| 2091 | 2088 | u32 ln0, ln1, pin_assignment; |
| 2092 | 2089 | u8 width; |
| 2093 | 2090 | |
| 2094 | − if (!intel_phy_is_tc(dev_priv, phy) || | |
| 2091 | + if (!intel_encoder_is_tc(&dig_port->base) || | |
| 2095 | 2092 | intel_tc_port_in_tbt_alt_mode(dig_port)) |
| 2096 | 2093 | return; |
| 2097 | 2094 | |
| @@ -2327,9 +2324,9 @@ static void intel_ddi_power_up_lanes(struct intel_encoder *encoder, · 229 unmodified lines | ||
| 2327 | 2324 | { |
| 2328 | 2325 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 2329 | 2326 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 2330 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 2331 | 2327 | |
| 2332 | − if (intel_phy_is_combo(i915, phy)) { | |
| 2328 | + if (intel_encoder_is_combo(encoder)) { | |
| 2329 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2333 | 2330 | bool lane_reversal = |
| 2334 | 2331 | dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL; |
| 2335 | 2332 | |
| @@ -2812,15 +2809,14 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, · 476 unmodified lines | ||
| 2812 | 2809 | const struct drm_connector_state *conn_state) |
| 2813 | 2810 | { |
| 2814 | 2811 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 2815 | − struct intel_dp *intel_dp = enc_to_intel_dp(encoder); | |
| 2816 | 2812 | |
| 2817 | − if (HAS_DP20(dev_priv)) { | |
| 2813 | + if (HAS_DP20(dev_priv)) | |
| 2818 | 2814 | intel_dp_128b132b_sdp_crc16(enc_to_intel_dp(encoder), |
| 2819 | 2815 | crtc_state); |
| 2820 | − if (crtc_state->has_panel_replay) | |
| 2821 | − drm_dp_dpcd_writeb(&intel_dp->aux, PANEL_REPLAY_CONFIG, | |
| 2822 | − DP_PANEL_REPLAY_ENABLE); | |
| 2823 | − } | |
| 2816 | + | |
| 2817 | + /* Panel replay has to be enabled in sink dpcd before link training. */ | |
| 2818 | + if (crtc_state->has_panel_replay) | |
| 2819 | + intel_psr_enable_sink(enc_to_intel_dp(encoder), crtc_state); | |
| 2824 | 2820 | |
| 2825 | 2821 | if (DISPLAY_VER(dev_priv) >= 14) |
| 2826 | 2822 | mtl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); |
| @@ -3095,39 +3091,48 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, · 268 unmodified lines | ||
| 3095 | 3091 | intel_dp_dual_mode_set_tmds_output(intel_hdmi, false); |
| 3096 | 3092 | } |
| 3097 | 3093 | |
| 3098 | −static void intel_ddi_post_disable(struct intel_atomic_state *state, | |
| 3099 | − struct intel_encoder *encoder, | |
| 3100 | − const struct intel_crtc_state *old_crtc_state, | |
| 3101 | − const struct drm_connector_state *old_conn_state) | |
| 3094 | +static void intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state *state, | |
| 3095 | + struct intel_encoder *encoder, | |
| 3096 | + const struct intel_crtc_state *old_crtc_state, | |
| 3097 | + const struct drm_connector_state *old_conn_state) | |
| 3102 | 3098 | { |
| 3103 | 3099 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 3104 | − struct intel_crtc *slave_crtc; | |
| 3100 | + struct intel_crtc *pipe_crtc; | |
| 3101 | + | |
| 3102 | + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, | |
| 3103 | + intel_crtc_joined_pipe_mask(old_crtc_state)) { | |
| 3104 | + const struct intel_crtc_state *old_pipe_crtc_state = | |
| 3105 | + intel_atomic_get_old_crtc_state(state, pipe_crtc); | |
| 3106 | + | |
| 3107 | + intel_crtc_vblank_off(old_pipe_crtc_state); | |
| 3108 | + } | |
| 3105 | 3109 | |
| 3106 | − if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) { | |
| 3107 | − intel_crtc_vblank_off(old_crtc_state); | |
| 3110 | + intel_disable_transcoder(old_crtc_state); | |
| 3108 | 3111 | |
| 3109 | − intel_disable_transcoder(old_crtc_state); | |
| 3112 | + intel_ddi_disable_transcoder_func(old_crtc_state); | |
| 3110 | 3113 | |
| 3111 | − intel_ddi_disable_transcoder_func(old_crtc_state); | |
| 3114 | + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, | |
| 3115 | + intel_crtc_joined_pipe_mask(old_crtc_state)) { | |
| 3116 | + const struct intel_crtc_state *old_pipe_crtc_state = | |
| 3117 | + intel_atomic_get_old_crtc_state(state, pipe_crtc); | |
| 3112 | 3118 | |
| 3113 | − intel_dsc_disable(old_crtc_state); | |
| 3119 | + intel_dsc_disable(old_pipe_crtc_state); | |
| 3114 | 3120 | |
| 3115 | 3121 | if (DISPLAY_VER(dev_priv) >= 9) |
| 3116 | − skl_scaler_disable(old_crtc_state); | |
| 3122 | + skl_scaler_disable(old_pipe_crtc_state); | |
| 3117 | 3123 | else |
| 3118 | − ilk_pfit_disable(old_crtc_state); | |
| 3124 | + ilk_pfit_disable(old_pipe_crtc_state); | |
| 3119 | 3125 | } |
| 3126 | +} | |
| 3120 | 3127 | |
| 3121 | − for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc, | |
| 3122 | − intel_crtc_bigjoiner_slave_pipes(old_crtc_state)) { | |
| 3123 | − const struct intel_crtc_state *old_slave_crtc_state = | |
| 3124 | − intel_atomic_get_old_crtc_state(state, slave_crtc); | |
| 3125 | − | |
| 3126 | − intel_crtc_vblank_off(old_slave_crtc_state); | |
| 3127 | − | |
| 3128 | − intel_dsc_disable(old_slave_crtc_state); | |
| 3129 | − skl_scaler_disable(old_slave_crtc_state); | |
| 3130 | − } | |
| 3128 | +static void intel_ddi_post_disable(struct intel_atomic_state *state, | |
| 3129 | + struct intel_encoder *encoder, | |
| 3130 | + const struct intel_crtc_state *old_crtc_state, | |
| 3131 | + const struct drm_connector_state *old_conn_state) | |
| 3132 | +{ | |
| 3133 | + if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) | |
| 3134 | + intel_ddi_post_disable_hdmi_or_sst(state, encoder, old_crtc_state, | |
| 3135 | + old_conn_state); | |
| 3131 | 3136 | |
| 3132 | 3137 | /* |
| 3133 | 3138 | * When called from DP MST code: |
| @@ -3155,14 +3160,11 @@ static void intel_ddi_post_pll_disable(struct intel_atomic_state *state, · 21 unmodified lines | ||
| 3155 | 3160 | const struct intel_crtc_state *old_crtc_state, |
| 3156 | 3161 | const struct drm_connector_state *old_conn_state) |
| 3157 | 3162 | { |
| 3158 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 3159 | 3163 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 3160 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 3161 | − bool is_tc_port = intel_phy_is_tc(i915, phy); | |
| 3162 | 3164 | |
| 3163 | 3165 | main_link_aux_power_domain_put(dig_port, old_crtc_state); |
| 3164 | 3166 | |
| 3165 | − if (is_tc_port) | |
| 3167 | + if (intel_encoder_is_tc(encoder)) | |
| 3166 | 3168 | intel_tc_port_put_link(dig_port); |
| 3167 | 3169 | } |
| 3168 | 3170 | |
| @@ -3263,7 +3265,6 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, · 94 unmodified lines | ||
| 3263 | 3265 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 3264 | 3266 | struct drm_connector *connector = conn_state->connector; |
| 3265 | 3267 | enum port port = encoder->port; |
| 3266 | − enum phy phy = intel_port_to_phy(dev_priv, port); | |
| 3267 | 3268 | u32 buf_ctl; |
| 3268 | 3269 | |
| 3269 | 3270 | if (!intel_hdmi_handle_sink_scrambling(encoder, connector, |
| @@ -3347,14 +3348,14 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, · 77 unmodified lines | ||
| 3347 | 3348 | |
| 3348 | 3349 | if (DISPLAY_VER(dev_priv) >= 20) |
| 3349 | 3350 | buf_ctl |= XE2LPD_DDI_BUF_D2D_LINK_ENABLE; |
| 3350 | − } else if (IS_ALDERLAKE_P(dev_priv) && intel_phy_is_tc(dev_priv, phy)) { | |
| 3351 | + } else if (IS_ALDERLAKE_P(dev_priv) && intel_encoder_is_tc(encoder)) { | |
| 3351 | 3352 | drm_WARN_ON(&dev_priv->drm, !intel_tc_port_in_legacy_mode(dig_port)); |
| 3352 | 3353 | buf_ctl |= DDI_BUF_CTL_TC_PHY_OWNERSHIP; |
| 3353 | 3354 | } |
| 3354 | 3355 | |
| 3355 | 3356 | intel_de_write(dev_priv, DDI_BUF_CTL(port), buf_ctl); |
| 3356 | 3357 | |
| 3357 | − intel_wait_ddi_buf_active(dev_priv, port); | |
| 3358 | + intel_wait_ddi_buf_active(encoder); | |
| 3358 | 3359 | } |
| 3359 | 3360 | |
| 3360 | 3361 | static void intel_enable_ddi(struct intel_atomic_state *state, |
| @@ -3362,10 +3363,10 @@ static void intel_enable_ddi(struct intel_atomic_state *state, · 1 unmodified line | ||
| 3362 | 3363 | const struct intel_crtc_state *crtc_state, |
| 3363 | 3364 | const struct drm_connector_state *conn_state) |
| 3364 | 3365 | { |
| 3365 | − drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder); | |
| 3366 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 3367 | + struct intel_crtc *pipe_crtc; | |
| 3366 | 3368 | |
| 3367 | − if (!intel_crtc_is_bigjoiner_slave(crtc_state)) | |
| 3368 | − intel_ddi_enable_transcoder_func(encoder, crtc_state); | |
| 3369 | + intel_ddi_enable_transcoder_func(encoder, crtc_state); | |
| 3369 | 3370 | |
| 3370 | 3371 | /* Enable/Disable DP2.0 SDP split config before transcoder */ |
| 3371 | 3372 | intel_audio_sdp_split_update(crtc_state); |
| @@ -3374,7 +3375,13 @@ static void intel_enable_ddi(struct intel_atomic_state *state, · 2 unmodified lines | ||
| 3374 | 3375 | |
| 3375 | 3376 | intel_ddi_wait_for_fec_status(encoder, crtc_state, true); |
| 3376 | 3377 | |
| 3377 | − intel_crtc_vblank_on(crtc_state); | |
| 3378 | + for_each_intel_crtc_in_pipe_mask_reverse(&i915->drm, pipe_crtc, | |
| 3379 | + intel_crtc_joined_pipe_mask(crtc_state)) { | |
| 3380 | + const struct intel_crtc_state *pipe_crtc_state = | |
| 3381 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 3382 | + | |
| 3383 | + intel_crtc_vblank_on(pipe_crtc_state); | |
| 3384 | + } | |
| 3378 | 3385 | |
| 3379 | 3386 | if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) |
| 3380 | 3387 | intel_enable_ddi_hdmi(state, encoder, crtc_state, conn_state); |
| @@ -3470,19 +3477,17 @@ void intel_ddi_update_active_dpll(struct intel_atomic_state *state, · 89 unmodified lines | ||
| 3470 | 3477 | struct intel_crtc *crtc) |
| 3471 | 3478 | { |
| 3472 | 3479 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 3473 | − struct intel_crtc_state *crtc_state = | |
| 3480 | + const struct intel_crtc_state *crtc_state = | |
| 3474 | 3481 | intel_atomic_get_new_crtc_state(state, crtc); |
| 3475 | − struct intel_crtc *slave_crtc; | |
| 3476 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 3482 | + struct intel_crtc *pipe_crtc; | |
| 3477 | 3483 | |
| 3478 | 3484 | /* FIXME: Add MTL pll_mgr */ |
| 3479 | − if (DISPLAY_VER(i915) >= 14 || !intel_phy_is_tc(i915, phy)) | |
| 3485 | + if (DISPLAY_VER(i915) >= 14 || !intel_encoder_is_tc(encoder)) | |
| 3480 | 3486 | return; |
| 3481 | 3487 | |
| 3482 | − intel_update_active_dpll(state, crtc, encoder); | |
| 3483 | − for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc, | |
| 3484 | − intel_crtc_bigjoiner_slave_pipes(crtc_state)) | |
| 3485 | − intel_update_active_dpll(state, slave_crtc, encoder); | |
| 3488 | + for_each_intel_crtc_in_pipe_mask(&i915->drm, pipe_crtc, | |
| 3489 | + intel_crtc_joined_pipe_mask(crtc_state)) | |
| 3490 | + intel_update_active_dpll(state, pipe_crtc, encoder); | |
| 3486 | 3491 | } |
| 3487 | 3492 | |
| 3488 | 3493 | static void |
| @@ -3493,8 +3498,7 @@ intel_ddi_pre_pll_enable(struct intel_atomic_state *state, · 4 unmodified lines | ||
| 3493 | 3498 | { |
| 3494 | 3499 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 3495 | 3500 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 3496 | − enum phy phy = intel_port_to_phy(dev_priv, encoder->port); | |
| 3497 | − bool is_tc_port = intel_phy_is_tc(dev_priv, phy); | |
| 3501 | + bool is_tc_port = intel_encoder_is_tc(encoder); | |
| 3498 | 3502 | |
| 3499 | 3503 | if (is_tc_port) { |
| 3500 | 3504 | struct intel_crtc *master_crtc = |
| @@ -3520,7 +3524,7 @@ intel_ddi_pre_pll_enable(struct intel_atomic_state *state, · 19 unmodified lines | ||
| 3520 | 3524 | static void adlp_tbt_to_dp_alt_switch_wa(struct intel_encoder *encoder) |
| 3521 | 3525 | { |
| 3522 | 3526 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 3523 | − enum tc_port tc_port = intel_port_to_tc(i915, encoder->port); | |
| 3527 | + enum tc_port tc_port = intel_encoder_to_tc(encoder); | |
| 3524 | 3528 | int ln; |
| 3525 | 3529 | |
| 3526 | 3530 | for (ln = 0; ln < 2; ln++) |
| @@ -3574,7 +3578,7 @@ static void mtl_ddi_prepare_link_retrain(struct intel_dp *intel_dp, · 47 unmodified lines | ||
| 3574 | 3578 | intel_de_posting_read(dev_priv, DDI_BUF_CTL(port)); |
| 3575 | 3579 | |
| 3576 | 3580 | /* 6.j Poll for PORT_BUF_CTL Idle Status == 0, timeout after 100 us */ |
| 3577 | − intel_wait_ddi_buf_active(dev_priv, port); | |
| 3581 | + intel_wait_ddi_buf_active(encoder); | |
| 3578 | 3582 | } |
| 3579 | 3583 | |
| 3580 | 3584 | static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp, |
| @@ -3624,7 +3628,7 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp, · 43 unmodified lines | ||
| 3624 | 3628 | intel_de_write(dev_priv, DDI_BUF_CTL(port), intel_dp->DP); |
| 3625 | 3629 | intel_de_posting_read(dev_priv, DDI_BUF_CTL(port)); |
| 3626 | 3630 | |
| 3627 | − intel_wait_ddi_buf_active(dev_priv, port); | |
| 3631 | + intel_wait_ddi_buf_active(encoder); | |
| 3628 | 3632 | } |
| 3629 | 3633 | |
| 3630 | 3634 | static void intel_ddi_set_link_train(struct intel_dp *intel_dp, |
| @@ -3681,7 +3685,7 @@ static void intel_ddi_set_idle_link_train(struct intel_dp *intel_dp, · 50 unmodified lines | ||
| 3681 | 3685 | |
| 3682 | 3686 | if (intel_de_wait_for_set(dev_priv, |
| 3683 | 3687 | dp_tp_status_reg(encoder, crtc_state), |
| 3684 | − DP_TP_STATUS_IDLE_DONE, 1)) | |
| 3688 | + DP_TP_STATUS_IDLE_DONE, 2)) | |
| 3685 | 3689 | drm_err(&dev_priv->drm, |
| 3686 | 3690 | "Timed out waiting for DP idle patterns\n"); |
| 3687 | 3691 | } |
| @@ -3972,6 +3976,7 @@ static void intel_ddi_get_config(struct intel_encoder *encoder, · 284 unmodified lines | ||
| 3972 | 3976 | |
| 3973 | 3977 | intel_read_dp_sdp(encoder, pipe_config, HDMI_PACKET_TYPE_GAMUT_METADATA); |
| 3974 | 3978 | intel_read_dp_sdp(encoder, pipe_config, DP_SDP_VSC); |
| 3979 | + intel_read_dp_sdp(encoder, pipe_config, DP_SDP_ADAPTIVE_SYNC); | |
| 3975 | 3980 | |
| 3976 | 3981 | intel_audio_codec_get_config(encoder, pipe_config); |
| 3977 | 3982 | } |
| @@ -4144,10 +4149,7 @@ void hsw_ddi_get_config(struct intel_encoder *encoder, · 166 unmodified lines | ||
| 4144 | 4149 | static void intel_ddi_sync_state(struct intel_encoder *encoder, |
| 4145 | 4150 | const struct intel_crtc_state *crtc_state) |
| 4146 | 4151 | { |
| 4147 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 4148 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 4149 | − | |
| 4150 | − if (intel_phy_is_tc(i915, phy)) | |
| 4152 | + if (intel_encoder_is_tc(encoder)) | |
| 4151 | 4153 | intel_tc_port_sanitize_mode(enc_to_dig_port(encoder), |
| 4152 | 4154 | crtc_state); |
| 4153 | 4155 | |
| @@ -4159,10 +4161,9 @@ static bool intel_ddi_initial_fastset_check(struct intel_encoder *encoder, · 5 unmodified lines | ||
| 4159 | 4161 | struct intel_crtc_state *crtc_state) |
| 4160 | 4162 | { |
| 4161 | 4163 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 4162 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 4163 | 4164 | bool fastset = true; |
| 4164 | 4165 | |
| 4165 | − if (intel_phy_is_tc(i915, phy)) { | |
| 4166 | + if (intel_encoder_is_tc(encoder)) { | |
| 4166 | 4167 | drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] Forcing full modeset to compute TC port DPLLs\n", |
| 4167 | 4168 | encoder->base.base.id, encoder->base.name); |
| 4168 | 4169 | crtc_state->uapi.mode_changed = true; |
| @@ -4256,7 +4257,12 @@ static bool m_n_equal(const struct intel_link_m_n *m_n_1, · 87 unmodified lines | ||
| 4256 | 4257 | static bool crtcs_port_sync_compatible(const struct intel_crtc_state *crtc_state1, |
| 4257 | 4258 | const struct intel_crtc_state *crtc_state2) |
| 4258 | 4259 | { |
| 4260 | + /* | |
| 4261 | + * FIXME the modeset sequence is currently wrong and | |
| 4262 | + * can't deal with bigjoiner + port sync at the same time. | |
| 4263 | + */ | |
| 4259 | 4264 | return crtc_state1->hw.active && crtc_state2->hw.active && |
| 4265 | + !crtc_state1->bigjoiner_pipes && !crtc_state2->bigjoiner_pipes && | |
| 4260 | 4266 | crtc_state1->output_types == crtc_state2->output_types && |
| 4261 | 4267 | crtc_state1->output_format == crtc_state2->output_format && |
| 4262 | 4268 | crtc_state1->lane_count == crtc_state2->lane_count && |
| @@ -4348,10 +4354,9 @@ static void intel_ddi_encoder_destroy(struct drm_encoder *encoder) · 85 unmodified lines | ||
| 4348 | 4354 | { |
| 4349 | 4355 | struct drm_i915_private *i915 = to_i915(encoder->dev); |
| 4350 | 4356 | struct intel_digital_port *dig_port = enc_to_dig_port(to_intel_encoder(encoder)); |
| 4351 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 4352 | 4357 | |
| 4353 | 4358 | intel_dp_encoder_flush_work(encoder); |
| 4354 | − if (intel_phy_is_tc(i915, phy)) | |
| 4359 | + if (intel_encoder_is_tc(&dig_port->base)) | |
| 4355 | 4360 | intel_tc_port_cleanup(dig_port); |
| 4356 | 4361 | intel_display_power_flush_work(i915); |
| 4357 | 4362 | |
| @@ -4362,16 +4367,14 @@ static void intel_ddi_encoder_destroy(struct drm_encoder *encoder) · 4 unmodified lines | ||
| 4362 | 4367 | |
| 4363 | 4368 | static void intel_ddi_encoder_reset(struct drm_encoder *encoder) |
| 4364 | 4369 | { |
| 4365 | − struct drm_i915_private *i915 = to_i915(encoder->dev); | |
| 4366 | 4370 | struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder)); |
| 4367 | 4371 | struct intel_digital_port *dig_port = enc_to_dig_port(to_intel_encoder(encoder)); |
| 4368 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 4369 | 4372 | |
| 4370 | 4373 | intel_dp->reset_link_params = true; |
| 4371 | 4374 | |
| 4372 | 4375 | intel_pps_encoder_reset(intel_dp); |
| 4373 | 4376 | |
| 4374 | − if (intel_phy_is_tc(i915, phy)) | |
| 4377 | + if (intel_encoder_is_tc(&dig_port->base)) | |
| 4375 | 4378 | intel_tc_port_init_mode(dig_port); |
| 4376 | 4379 | } |
| 4377 | 4380 | |
| @@ -4538,11 +4541,9 @@ static enum intel_hotplug_state · 160 unmodified lines | ||
| 4538 | 4541 | intel_ddi_hotplug(struct intel_encoder *encoder, |
| 4539 | 4542 | struct intel_connector *connector) |
| 4540 | 4543 | { |
| 4541 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 4542 | 4544 | struct intel_digital_port *dig_port = enc_to_dig_port(encoder); |
| 4543 | 4545 | struct intel_dp *intel_dp = &dig_port->dp; |
| 4544 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 4545 | − bool is_tc = intel_phy_is_tc(i915, phy); | |
| 4546 | + bool is_tc = intel_encoder_is_tc(encoder); | |
| 4546 | 4547 | struct drm_modeset_acquire_ctx ctx; |
| 4547 | 4548 | enum intel_hotplug_state state; |
| 4548 | 4549 | int ret; |
| @@ -4824,10 +4825,7 @@ static bool port_strap_detected(struct drm_i915_private *i915, enum port port) · 275 unmodified lines | ||
| 4824 | 4825 | |
| 4825 | 4826 | static bool need_aux_ch(struct intel_encoder *encoder, bool init_dp) |
| 4826 | 4827 | { |
| 4827 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 4828 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 4829 | − | |
| 4830 | − return init_dp || intel_phy_is_tc(i915, phy); | |
| 4828 | + return init_dp || intel_encoder_is_tc(encoder); | |
| 4831 | 4829 | } |
| 4832 | 4830 | |
| 4833 | 4831 | static bool assert_has_icl_dsi(struct drm_i915_private *i915) |
| @@ -5071,12 +5069,12 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, · 237 unmodified lines | ||
| 5071 | 5069 | } else if (IS_DG2(dev_priv)) { |
| 5072 | 5070 | encoder->set_signal_levels = intel_snps_phy_set_signal_levels; |
| 5073 | 5071 | } else if (DISPLAY_VER(dev_priv) >= 12) { |
| 5074 | − if (intel_phy_is_combo(dev_priv, phy)) | |
| 5072 | + if (intel_encoder_is_combo(encoder)) | |
| 5075 | 5073 | encoder->set_signal_levels = icl_combo_phy_set_signal_levels; |
| 5076 | 5074 | else |
| 5077 | 5075 | encoder->set_signal_levels = tgl_dkl_phy_set_signal_levels; |
| 5078 | 5076 | } else if (DISPLAY_VER(dev_priv) >= 11) { |
| 5079 | − if (intel_phy_is_combo(dev_priv, phy)) | |
| 5077 | + if (intel_encoder_is_combo(encoder)) | |
| 5080 | 5078 | encoder->set_signal_levels = icl_combo_phy_set_signal_levels; |
| 5081 | 5079 | else |
| 5082 | 5080 | encoder->set_signal_levels = icl_mg_phy_set_signal_levels; |
| @@ -5126,7 +5124,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, · 43 unmodified lines | ||
| 5126 | 5124 | goto err; |
| 5127 | 5125 | } |
| 5128 | 5126 | |
| 5129 | − if (intel_phy_is_tc(dev_priv, phy)) { | |
| 5127 | + if (intel_encoder_is_tc(encoder)) { | |
| 5130 | 5128 | bool is_legacy = |
| 5131 | 5129 | !intel_bios_encoder_supports_typec_usb(devdata) && |
| 5132 | 5130 | !intel_bios_encoder_supports_tbt(devdata); |
| @@ -5155,7 +5153,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, · 22 unmodified lines | ||
| 5155 | 5153 | dig_port->ddi_io_power_domain = intel_display_power_ddi_io_domain(dev_priv, port); |
| 5156 | 5154 | |
| 5157 | 5155 | if (DISPLAY_VER(dev_priv) >= 11) { |
| 5158 | − if (intel_phy_is_tc(dev_priv, phy)) | |
| 5156 | + if (intel_encoder_is_tc(encoder)) | |
| 5159 | 5157 | dig_port->connected = intel_tc_port_connected; |
| 5160 | 5158 | else |
| 5161 | 5159 | dig_port->connected = lpt_digital_port_connected; |
| @@ -1691,14 +1691,11 @@ mtl_get_cx0_buf_trans(struct intel_encoder *encoder, · 1690 unmodified lines | ||
| 1691 | 1691 | const struct intel_crtc_state *crtc_state, |
| 1692 | 1692 | int *n_entries) |
| 1693 | 1693 | { |
| 1694 | − struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 1695 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1696 | − | |
| 1697 | 1694 | if (intel_crtc_has_dp_encoder(crtc_state) && crtc_state->port_clock >= 1000000) |
| 1698 | 1695 | return intel_get_buf_trans(&mtl_c20_trans_uhbr, n_entries); |
| 1699 | − else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) && !(intel_is_c10phy(i915, phy))) | |
| 1696 | + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) && !(intel_encoder_is_c10phy(encoder))) | |
| 1700 | 1697 | return intel_get_buf_trans(&mtl_c20_trans_hdmi, n_entries); |
| 1701 | − else if (!intel_is_c10phy(i915, phy)) | |
| 1698 | + else if (!intel_encoder_is_c10phy(encoder)) | |
| 1702 | 1699 | return intel_get_buf_trans(&mtl_c20_trans_dp14, n_entries); |
| 1703 | 1700 | else |
| 1704 | 1701 | return intel_get_buf_trans(&mtl_c10_trans_dp14, n_entries); |
| @@ -1707,14 +1704,13 @@ mtl_get_cx0_buf_trans(struct intel_encoder *encoder, · 2 unmodified lines | ||
| 1707 | 1704 | void intel_ddi_buf_trans_init(struct intel_encoder *encoder) |
| 1708 | 1705 | { |
| 1709 | 1706 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1710 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1711 | 1707 | |
| 1712 | 1708 | if (DISPLAY_VER(i915) >= 14) { |
| 1713 | 1709 | encoder->get_buf_trans = mtl_get_cx0_buf_trans; |
| 1714 | 1710 | } else if (IS_DG2(i915)) { |
| 1715 | 1711 | encoder->get_buf_trans = dg2_get_snps_buf_trans; |
| 1716 | 1712 | } else if (IS_ALDERLAKE_P(i915)) { |
| 1717 | − if (intel_phy_is_combo(i915, phy)) | |
| 1713 | + if (intel_encoder_is_combo(encoder)) | |
| 1718 | 1714 | encoder->get_buf_trans = adlp_get_combo_buf_trans; |
| 1719 | 1715 | else |
| 1720 | 1716 | encoder->get_buf_trans = adlp_get_dkl_buf_trans; |
| @@ -1725,16 +1721,16 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) · 4 unmodified lines | ||
| 1725 | 1721 | } else if (IS_DG1(i915)) { |
| 1726 | 1722 | encoder->get_buf_trans = dg1_get_combo_buf_trans; |
| 1727 | 1723 | } else if (DISPLAY_VER(i915) >= 12) { |
| 1728 | − if (intel_phy_is_combo(i915, phy)) | |
| 1724 | + if (intel_encoder_is_combo(encoder)) | |
| 1729 | 1725 | encoder->get_buf_trans = tgl_get_combo_buf_trans; |
| 1730 | 1726 | else |
| 1731 | 1727 | encoder->get_buf_trans = tgl_get_dkl_buf_trans; |
| 1732 | 1728 | } else if (DISPLAY_VER(i915) == 11) { |
| 1733 | − if (IS_PLATFORM(i915, INTEL_JASPERLAKE)) | |
| 1729 | + if (IS_JASPERLAKE(i915)) | |
| 1734 | 1730 | encoder->get_buf_trans = jsl_get_combo_buf_trans; |
| 1735 | − else if (IS_PLATFORM(i915, INTEL_ELKHARTLAKE)) | |
| 1731 | + else if (IS_ELKHARTLAKE(i915)) | |
| 1736 | 1732 | encoder->get_buf_trans = ehl_get_combo_buf_trans; |
| 1737 | − else if (intel_phy_is_combo(i915, phy)) | |
| 1733 | + else if (intel_encoder_is_combo(encoder)) | |
| 1738 | 1734 | encoder->get_buf_trans = icl_get_combo_buf_trans; |
| 1739 | 1735 | else |
| 1740 | 1736 | encoder->get_buf_trans = icl_get_mg_buf_trans; |
| @@ -13,76 +13,157 @@ · 12 unmodified lines | ||
| 13 | 13 | static inline u32 |
| 14 | 14 | intel_de_read(struct drm_i915_private *i915, i915_reg_t reg) |
| 15 | 15 | { |
| 16 | − return intel_uncore_read(&i915->uncore, reg); | |
| 16 | + u32 val; | |
| 17 | + | |
| 18 | + intel_dmc_wl_get(i915, reg); | |
| 19 | + | |
| 20 | + val = intel_uncore_read(&i915->uncore, reg); | |
| 21 | + | |
| 22 | + intel_dmc_wl_put(i915, reg); | |
| 23 | + | |
| 24 | + return val; | |
| 17 | 25 | } |
| 18 | 26 | |
| 19 | 27 | static inline u8 |
| 20 | 28 | intel_de_read8(struct drm_i915_private *i915, i915_reg_t reg) |
| 21 | 29 | { |
| 22 | − return intel_uncore_read8(&i915->uncore, reg); | |
| 30 | + u8 val; | |
| 31 | + | |
| 32 | + intel_dmc_wl_get(i915, reg); | |
| 33 | + | |
| 34 | + val = intel_uncore_read8(&i915->uncore, reg); | |
| 35 | + | |
| 36 | + intel_dmc_wl_put(i915, reg); | |
| 37 | + | |
| 38 | + return val; | |
| 23 | 39 | } |
| 24 | 40 | |
| 25 | 41 | static inline u64 |
| 26 | 42 | intel_de_read64_2x32(struct drm_i915_private *i915, |
| 27 | 43 | i915_reg_t lower_reg, i915_reg_t upper_reg) |
| 28 | 44 | { |
| 29 | − return intel_uncore_read64_2x32(&i915->uncore, lower_reg, upper_reg); | |
| 45 | + u64 val; | |
| 46 | + | |
| 47 | + intel_dmc_wl_get(i915, lower_reg); | |
| 48 | + intel_dmc_wl_get(i915, upper_reg); | |
| 49 | + | |
| 50 | + val = intel_uncore_read64_2x32(&i915->uncore, lower_reg, upper_reg); | |
| 51 | + | |
| 52 | + intel_dmc_wl_put(i915, upper_reg); | |
| 53 | + intel_dmc_wl_put(i915, lower_reg); | |
| 54 | + | |
| 55 | + return val; | |
| 30 | 56 | } |
| 31 | 57 | |
| 32 | 58 | static inline void |
| 33 | 59 | intel_de_posting_read(struct drm_i915_private *i915, i915_reg_t reg) |
| 34 | 60 | { |
| 61 | + intel_dmc_wl_get(i915, reg); | |
| 62 | + | |
| 35 | 63 | intel_uncore_posting_read(&i915->uncore, reg); |
| 64 | + | |
| 65 | + intel_dmc_wl_put(i915, reg); | |
| 36 | 66 | } |
| 37 | 67 | |
| 38 | 68 | static inline void |
| 39 | 69 | intel_de_write(struct drm_i915_private *i915, i915_reg_t reg, u32 val) |
| 40 | 70 | { |
| 71 | + intel_dmc_wl_get(i915, reg); | |
| 72 | + | |
| 41 | 73 | intel_uncore_write(&i915->uncore, reg, val); |
| 74 | + | |
| 75 | + intel_dmc_wl_put(i915, reg); | |
| 42 | 76 | } |
| 43 | 77 | |
| 44 | 78 | static inline u32 |
| 45 | −intel_de_rmw(struct drm_i915_private *i915, i915_reg_t reg, u32 clear, u32 set) | |
| 79 | +__intel_de_rmw_nowl(struct drm_i915_private *i915, i915_reg_t reg, | |
| 80 | + u32 clear, u32 set) | |
| 46 | 81 | { |
| 47 | 82 | return intel_uncore_rmw(&i915->uncore, reg, clear, set); |
| 48 | 83 | } |
| 49 | 84 | |
| 85 | +static inline u32 | |
| 86 | +intel_de_rmw(struct drm_i915_private *i915, i915_reg_t reg, u32 clear, u32 set) | |
| 87 | +{ | |
| 88 | + u32 val; | |
| 89 | + | |
| 90 | + intel_dmc_wl_get(i915, reg); | |
| 91 | + | |
| 92 | + val = __intel_de_rmw_nowl(i915, reg, clear, set); | |
| 93 | + | |
| 94 | + intel_dmc_wl_put(i915, reg); | |
| 95 | + | |
| 96 | + return val; | |
| 97 | +} | |
| 98 | + | |
| 99 | +static inline int | |
| 100 | +__intel_wait_for_register_nowl(struct drm_i915_private *i915, i915_reg_t reg, | |
| 101 | + u32 mask, u32 value, unsigned int timeout) | |
| 102 | +{ | |
| 103 | + return intel_wait_for_register(&i915->uncore, reg, mask, | |
| 104 | + value, timeout); | |
| 105 | +} | |
| 106 | + | |
| 50 | 107 | static inline int |
| 51 | −intel_de_wait_for_register(struct drm_i915_private *i915, i915_reg_t reg, | |
| 52 | − u32 mask, u32 value, unsigned int timeout) | |
| 108 | +intel_de_wait(struct drm_i915_private *i915, i915_reg_t reg, | |
| 109 | + u32 mask, u32 value, unsigned int timeout) | |
| 53 | 110 | { |
| 54 | − return intel_wait_for_register(&i915->uncore, reg, mask, value, timeout); | |
| 111 | + int ret; | |
| 112 | + | |
| 113 | + intel_dmc_wl_get(i915, reg); | |
| 114 | + | |
| 115 | + ret = __intel_wait_for_register_nowl(i915, reg, mask, value, timeout); | |
| 116 | + | |
| 117 | + intel_dmc_wl_put(i915, reg); | |
| 118 | + | |
| 119 | + return ret; | |
| 55 | 120 | } |
| 56 | 121 | |
| 57 | 122 | static inline int |
| 58 | −intel_de_wait_for_register_fw(struct drm_i915_private *i915, i915_reg_t reg, | |
| 59 | − u32 mask, u32 value, unsigned int timeout) | |
| 123 | +intel_de_wait_fw(struct drm_i915_private *i915, i915_reg_t reg, | |
| 124 | + u32 mask, u32 value, unsigned int timeout) | |
| 60 | 125 | { |
| 61 | − return intel_wait_for_register_fw(&i915->uncore, reg, mask, value, timeout); | |
| 126 | + int ret; | |
| 127 | + | |
| 128 | + intel_dmc_wl_get(i915, reg); | |
| 129 | + | |
| 130 | + ret = intel_wait_for_register_fw(&i915->uncore, reg, mask, value, timeout); | |
| 131 | + | |
| 132 | + intel_dmc_wl_put(i915, reg); | |
| 133 | + | |
| 134 | + return ret; | |
| 62 | 135 | } |
| 63 | 136 | |
| 64 | 137 | static inline int |
| 65 | −__intel_de_wait_for_register(struct drm_i915_private *i915, i915_reg_t reg, | |
| 66 | − u32 mask, u32 value, | |
| 67 | − unsigned int fast_timeout_us, | |
| 68 | − unsigned int slow_timeout_ms, u32 *out_value) | |
| 138 | +intel_de_wait_custom(struct drm_i915_private *i915, i915_reg_t reg, | |
| 139 | + u32 mask, u32 value, | |
| 140 | + unsigned int fast_timeout_us, | |
| 141 | + unsigned int slow_timeout_ms, u32 *out_value) | |
| 69 | 142 | { |
| 70 | − return __intel_wait_for_register(&i915->uncore, reg, mask, value, | |
| 71 | − fast_timeout_us, slow_timeout_ms, out_value); | |
| 143 | + int ret; | |
| 144 | + | |
| 145 | + intel_dmc_wl_get(i915, reg); | |
| 146 | + | |
| 147 | + ret = __intel_wait_for_register(&i915->uncore, reg, mask, value, | |
| 148 | + fast_timeout_us, slow_timeout_ms, out_value); | |
| 149 | + | |
| 150 | + intel_dmc_wl_put(i915, reg); | |
| 151 | + | |
| 152 | + return ret; | |
| 72 | 153 | } |
| 73 | 154 | |
| 74 | 155 | static inline int |
| 75 | 156 | intel_de_wait_for_set(struct drm_i915_private *i915, i915_reg_t reg, |
| 76 | 157 | u32 mask, unsigned int timeout) |
| 77 | 158 | { |
| 78 | − return intel_de_wait_for_register(i915, reg, mask, mask, timeout); | |
| 159 | + return intel_de_wait(i915, reg, mask, mask, timeout); | |
| 79 | 160 | } |
| 80 | 161 | |
| 81 | 162 | static inline int |
| 82 | 163 | intel_de_wait_for_clear(struct drm_i915_private *i915, i915_reg_t reg, |
| 83 | 164 | u32 mask, unsigned int timeout) |
| 84 | 165 | { |
| 85 | − return intel_de_wait_for_register(i915, reg, mask, 0, timeout); | |
| 166 | + return intel_de_wait(i915, reg, mask, 0, timeout); | |
| 86 | 167 | } |
| 87 | 168 | |
| 88 | 169 | /* |
| @@ -275,6 +275,13 @@ static int intel_bigjoiner_num_pipes(const struct intel_crtc_state *crtc_state) · 274 unmodified lines | ||
| 275 | 275 | return hweight8(crtc_state->bigjoiner_pipes); |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | +u8 intel_crtc_joined_pipe_mask(const struct intel_crtc_state *crtc_state) | |
| 279 | +{ | |
| 280 | + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); | |
| 281 | + | |
| 282 | + return BIT(crtc->pipe) | crtc_state->bigjoiner_pipes; | |
| 283 | +} | |
| 284 | + | |
| 278 | 285 | struct intel_crtc *intel_master_crtc(const struct intel_crtc_state *crtc_state) |
| 279 | 286 | { |
| 280 | 287 | struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); |
| @@ -383,8 +390,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, · 102 unmodified lines | ||
| 383 | 390 | break; |
| 384 | 391 | } |
| 385 | 392 | |
| 386 | − if (intel_de_wait_for_register(dev_priv, dpll_reg, | |
| 387 | − port_mask, expected_mask, 1000)) | |
| 393 | + if (intel_de_wait(dev_priv, dpll_reg, port_mask, expected_mask, 1000)) | |
| 388 | 394 | drm_WARN(&dev_priv->drm, 1, |
| 389 | 395 | "timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n", |
| 390 | 396 | dig_port->base.base.base.id, dig_port->base.base.name, |
| @@ -430,6 +436,18 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state) · 39 unmodified lines | ||
| 430 | 436 | intel_de_rmw(dev_priv, PIPE_ARB_CTL(pipe), |
| 431 | 437 | 0, PIPE_ARB_USE_PROG_SLOTS); |
| 432 | 438 | |
| 439 | + if (DISPLAY_VER(dev_priv) >= 14) { | |
| 440 | + u32 clear = DP_DSC_INSERT_SF_AT_EOL_WA; | |
| 441 | + u32 set = 0; | |
| 442 | + | |
| 443 | + if (DISPLAY_VER(dev_priv) == 14) | |
| 444 | + set |= DP_FEC_BS_JITTER_WA; | |
| 445 | + | |
| 446 | + intel_de_rmw(dev_priv, | |
| 447 | + hsw_chicken_trans_reg(dev_priv, cpu_transcoder), | |
| 448 | + clear, set); | |
| 449 | + } | |
| 450 | + | |
| 433 | 451 | val = intel_de_read(dev_priv, TRANSCONF(cpu_transcoder)); |
| 434 | 452 | if (val & TRANSCONF_ENABLE) { |
| 435 | 453 | /* we keep both pipes enabled on 830 */ |
| @@ -437,6 +455,14 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state) · 1 unmodified line | ||
| 437 | 455 | return; |
| 438 | 456 | } |
| 439 | 457 | |
| 458 | + /* Wa_1409098942:adlp+ */ | |
| 459 | + if (DISPLAY_VER(dev_priv) >= 13 && | |
| 460 | + new_crtc_state->dsc.compression_enable) { | |
| 461 | + val &= ~TRANSCONF_PIXEL_COUNT_SCALING_MASK; | |
| 462 | + val |= REG_FIELD_PREP(TRANSCONF_PIXEL_COUNT_SCALING_MASK, | |
| 463 | + TRANSCONF_PIXEL_COUNT_SCALING_X4); | |
| 464 | + } | |
| 465 | + | |
| 440 | 466 | intel_de_write(dev_priv, TRANSCONF(cpu_transcoder), |
| 441 | 467 | val | TRANSCONF_ENABLE); |
| 442 | 468 | intel_de_posting_read(dev_priv, TRANSCONF(cpu_transcoder)); |
| @@ -483,6 +509,11 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state) · 40 unmodified lines | ||
| 483 | 509 | if (!IS_I830(dev_priv)) |
| 484 | 510 | val &= ~TRANSCONF_ENABLE; |
| 485 | 511 | |
| 512 | + /* Wa_1409098942:adlp+ */ | |
| 513 | + if (DISPLAY_VER(dev_priv) >= 13 && | |
| 514 | + old_crtc_state->dsc.compression_enable) | |
| 515 | + val &= ~TRANSCONF_PIXEL_COUNT_SCALING_MASK; | |
| 516 | + | |
| 486 | 517 | intel_de_write(dev_priv, TRANSCONF(cpu_transcoder), val); |
| 487 | 518 | |
| 488 | 519 | if (DISPLAY_VER(dev_priv) >= 12) |
| @@ -535,7 +566,7 @@ bool intel_plane_uses_fence(const struct intel_plane_state *plane_state) · 46 unmodified lines | ||
| 535 | 566 | struct drm_i915_private *dev_priv = to_i915(plane->base.dev); |
| 536 | 567 | |
| 537 | 568 | return DISPLAY_VER(dev_priv) < 4 || |
| 538 | − (plane->fbc && | |
| 569 | + (plane->fbc && !plane_state->no_fbc_reason && | |
| 539 | 570 | plane_state->view.gtt.type == I915_GTT_VIEW_NORMAL); |
| 540 | 571 | } |
| 541 | 572 | |
| @@ -1552,18 +1583,21 @@ static void ilk_crtc_enable(struct intel_atomic_state *state, · 1010 unmodified lines | ||
| 1552 | 1583 | intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, true); |
| 1553 | 1584 | } |
| 1554 | 1585 | |
| 1555 | −static void glk_pipe_scaler_clock_gating_wa(struct drm_i915_private *dev_priv, | |
| 1556 | − enum pipe pipe, bool apply) | |
| 1586 | +/* Display WA #1180: WaDisableScalarClockGating: glk */ | |
| 1587 | +static bool glk_need_scaler_clock_gating_wa(const struct intel_crtc_state *crtc_state) | |
| 1557 | 1588 | { |
| 1558 | − u32 val = intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)); | |
| 1559 | − u32 mask = DPF_GATING_DIS | DPF_RAM_GATING_DIS | DPFR_GATING_DIS; | |
| 1589 | + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); | |
| 1560 | 1590 | |
| 1561 | − if (apply) | |
| 1562 | − val |= mask; | |
| 1563 | − else | |
| 1564 | − val &= ~mask; | |
| 1591 | + return DISPLAY_VER(i915) == 10 && crtc_state->pch_pfit.enabled; | |
| 1592 | +} | |
| 1565 | 1593 | |
| 1566 | − intel_de_write(dev_priv, CLKGATE_DIS_PSL(pipe), val); | |
| 1594 | +static void glk_pipe_scaler_clock_gating_wa(struct intel_crtc *crtc, bool enable) | |
| 1595 | +{ | |
| 1596 | + struct drm_i915_private *i915 = to_i915(crtc->base.dev); | |
| 1597 | + u32 mask = DPF_GATING_DIS | DPF_RAM_GATING_DIS | DPFR_GATING_DIS; | |
| 1598 | + | |
| 1599 | + intel_de_rmw(i915, CLKGATE_DIS_PSL(crtc->pipe), | |
| 1600 | + mask, enable ? mask : 0); | |
| 1567 | 1601 | } |
| 1568 | 1602 | |
| 1569 | 1603 | static void hsw_set_linetime_wm(const struct intel_crtc_state *crtc_state) |
| @@ -1586,24 +1620,6 @@ static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state) · 16 unmodified lines | ||
| 1586 | 1620 | HSW_FRAME_START_DELAY(crtc_state->framestart_delay - 1)); |
| 1587 | 1621 | } |
| 1588 | 1622 | |
| 1589 | −static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state, | |
| 1590 | − const struct intel_crtc_state *crtc_state) | |
| 1591 | −{ | |
| 1592 | − struct intel_crtc *master_crtc = intel_master_crtc(crtc_state); | |
| 1593 | − | |
| 1594 | − /* | |
| 1595 | − * Enable sequence steps 1-7 on bigjoiner master | |
| 1596 | − */ | |
| 1597 | − if (intel_crtc_is_bigjoiner_slave(crtc_state)) | |
| 1598 | − intel_encoders_pre_pll_enable(state, master_crtc); | |
| 1599 | − | |
| 1600 | − if (crtc_state->shared_dpll) | |
| 1601 | − intel_enable_shared_dpll(crtc_state); | |
| 1602 | − | |
| 1603 | − if (intel_crtc_is_bigjoiner_slave(crtc_state)) | |
| 1604 | − intel_encoders_pre_enable(state, master_crtc); | |
| 1605 | −} | |
| 1606 | − | |
| 1607 | 1623 | static void hsw_configure_cpu_transcoder(const struct intel_crtc_state *crtc_state) |
| 1608 | 1624 | { |
| 1609 | 1625 | struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); |
| @@ -1639,90 +1655,107 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, · 29 unmodified lines | ||
| 1639 | 1655 | const struct intel_crtc_state *new_crtc_state = |
| 1640 | 1656 | intel_atomic_get_new_crtc_state(state, crtc); |
| 1641 | 1657 | struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); |
| 1642 | − enum pipe pipe = crtc->pipe, hsw_workaround_pipe; | |
| 1643 | 1658 | enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder; |
| 1644 | − bool psl_clkgate_wa; | |
| 1659 | + struct intel_crtc *pipe_crtc; | |
| 1645 | 1660 | |
| 1646 | 1661 | if (drm_WARN_ON(&dev_priv->drm, crtc->active)) |
| 1647 | 1662 | return; |
| 1648 | 1663 | |
| 1649 | − intel_dmc_enable_pipe(dev_priv, crtc->pipe); | |
| 1664 | + for_each_intel_crtc_in_pipe_mask_reverse(&dev_priv->drm, pipe_crtc, | |
| 1665 | + intel_crtc_joined_pipe_mask(new_crtc_state)) | |
| 1666 | + intel_dmc_enable_pipe(dev_priv, pipe_crtc->pipe); | |
| 1650 | 1667 | |
| 1651 | − if (!new_crtc_state->bigjoiner_pipes) { | |
| 1652 | − intel_encoders_pre_pll_enable(state, crtc); | |
| 1668 | + intel_encoders_pre_pll_enable(state, crtc); | |
| 1653 | 1669 | |
| 1654 | − if (new_crtc_state->shared_dpll) | |
| 1655 | − intel_enable_shared_dpll(new_crtc_state); | |
| 1670 | + for_each_intel_crtc_in_pipe_mask_reverse(&dev_priv->drm, pipe_crtc, | |
| 1671 | + intel_crtc_joined_pipe_mask(new_crtc_state)) { | |
| 1672 | + const struct intel_crtc_state *pipe_crtc_state = | |
| 1673 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 1656 | 1674 | |
| 1657 | − intel_encoders_pre_enable(state, crtc); | |
| 1658 | − } else { | |
| 1659 | − icl_ddi_bigjoiner_pre_enable(state, new_crtc_state); | |
| 1675 | + if (pipe_crtc_state->shared_dpll) | |
| 1676 | + intel_enable_shared_dpll(pipe_crtc_state); | |
| 1660 | 1677 | } |
| 1661 | 1678 | |
| 1662 | − intel_dsc_enable(new_crtc_state); | |
| 1679 | + intel_encoders_pre_enable(state, crtc); | |
| 1663 | 1680 | |
| 1664 | − if (DISPLAY_VER(dev_priv) >= 13) | |
| 1665 | − intel_uncompressed_joiner_enable(new_crtc_state); | |
| 1681 | + for_each_intel_crtc_in_pipe_mask_reverse(&dev_priv->drm, pipe_crtc, | |
| 1682 | + intel_crtc_joined_pipe_mask(new_crtc_state)) { | |
| 1683 | + const struct intel_crtc_state *pipe_crtc_state = | |
| 1684 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 1666 | 1685 | |
| 1667 | − intel_set_pipe_src_size(new_crtc_state); | |
| 1668 | − if (DISPLAY_VER(dev_priv) >= 9 || IS_BROADWELL(dev_priv)) | |
| 1669 | − bdw_set_pipe_misc(new_crtc_state); | |
| 1686 | + intel_dsc_enable(pipe_crtc_state); | |
| 1687 | + | |
| 1688 | + if (DISPLAY_VER(dev_priv) >= 13) | |
| 1689 | + intel_uncompressed_joiner_enable(pipe_crtc_state); | |
| 1690 | + | |
| 1691 | + intel_set_pipe_src_size(pipe_crtc_state); | |
| 1670 | 1692 | |
| 1671 | − if (!intel_crtc_is_bigjoiner_slave(new_crtc_state) && | |
| 1672 | − !transcoder_is_dsi(cpu_transcoder)) | |
| 1693 | + if (DISPLAY_VER(dev_priv) >= 9 || IS_BROADWELL(dev_priv)) | |
| 1694 | + bdw_set_pipe_misc(pipe_crtc_state); | |
| 1695 | + } | |
| 1696 | + | |
| 1697 | + if (!transcoder_is_dsi(cpu_transcoder)) | |
| 1673 | 1698 | hsw_configure_cpu_transcoder(new_crtc_state); |
| 1674 | 1699 | |
| 1675 | − crtc->active = true; | |
| 1700 | + for_each_intel_crtc_in_pipe_mask_reverse(&dev_priv->drm, pipe_crtc, | |
| 1701 | + intel_crtc_joined_pipe_mask(new_crtc_state)) { | |
| 1702 | + const struct intel_crtc_state *pipe_crtc_state = | |
| 1703 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 1676 | 1704 | |
| 1677 | − /* Display WA #1180: WaDisableScalarClockGating: glk */ | |
| 1678 | − psl_clkgate_wa = DISPLAY_VER(dev_priv) == 10 && | |
| 1679 | − new_crtc_state->pch_pfit.enabled; | |
| 1680 | − if (psl_clkgate_wa) | |
| 1681 | − glk_pipe_scaler_clock_gating_wa(dev_priv, pipe, true); | |
| 1705 | + pipe_crtc->active = true; | |
| 1682 | 1706 | |
| 1683 | − if (DISPLAY_VER(dev_priv) >= 9) | |
| 1684 | − skl_pfit_enable(new_crtc_state); | |
| 1685 | − else | |
| 1686 | − ilk_pfit_enable(new_crtc_state); | |
| 1707 | + if (glk_need_scaler_clock_gating_wa(pipe_crtc_state)) | |
| 1708 | + glk_pipe_scaler_clock_gating_wa(pipe_crtc, true); | |
| 1687 | 1709 | |
| 1688 | − /* | |
| 1689 | − * On ILK+ LUT must be loaded before the pipe is running but with | |
| 1690 | − * clocks enabled | |
| 1691 | − */ | |
| 1692 | − intel_color_load_luts(new_crtc_state); | |
| 1693 | − intel_color_commit_noarm(new_crtc_state); | |
| 1694 | − intel_color_commit_arm(new_crtc_state); | |
| 1695 | − /* update DSPCNTR to configure gamma/csc for pipe bottom color */ | |
| 1696 | − if (DISPLAY_VER(dev_priv) < 9) | |
| 1697 | − intel_disable_primary_plane(new_crtc_state); | |
| 1710 | + if (DISPLAY_VER(dev_priv) >= 9) | |
| 1711 | + skl_pfit_enable(pipe_crtc_state); | |
| 1712 | + else | |
| 1713 | + ilk_pfit_enable(pipe_crtc_state); | |
| 1698 | 1714 | |
| 1699 | − hsw_set_linetime_wm(new_crtc_state); | |
| 1715 | + /* | |
| 1716 | + * On ILK+ LUT must be loaded before the pipe is running but with | |
| 1717 | + * clocks enabled | |
| 1718 | + */ | |
| 1719 | + intel_color_load_luts(pipe_crtc_state); | |
| 1720 | + intel_color_commit_noarm(pipe_crtc_state); | |
| 1721 | + intel_color_commit_arm(pipe_crtc_state); | |
| 1722 | + /* update DSPCNTR to configure gamma/csc for pipe bottom color */ | |
| 1723 | + if (DISPLAY_VER(dev_priv) < 9) | |
| 1724 | + intel_disable_primary_plane(pipe_crtc_state); | |
| 1700 | 1725 | |
| 1701 | − if (DISPLAY_VER(dev_priv) >= 11) | |
| 1702 | − icl_set_pipe_chicken(new_crtc_state); | |
| 1726 | + hsw_set_linetime_wm(pipe_crtc_state); | |
| 1703 | 1727 | |
| 1704 | − intel_initial_watermarks(state, crtc); | |
| 1728 | + if (DISPLAY_VER(dev_priv) >= 11) | |
| 1729 | + icl_set_pipe_chicken(pipe_crtc_state); | |
| 1705 | 1730 | |
| 1706 | − if (intel_crtc_is_bigjoiner_slave(new_crtc_state)) | |
| 1707 | − intel_crtc_vblank_on(new_crtc_state); | |
| 1731 | + intel_initial_watermarks(state, pipe_crtc); | |
| 1732 | + } | |
| 1708 | 1733 | |
| 1709 | 1734 | intel_encoders_enable(state, crtc); |
| 1710 | 1735 | |
| 1711 | − if (psl_clkgate_wa) { | |
| 1712 | − intel_crtc_wait_for_next_vblank(crtc); | |
| 1713 | − glk_pipe_scaler_clock_gating_wa(dev_priv, pipe, false); | |
| 1714 | − } | |
| 1736 | + for_each_intel_crtc_in_pipe_mask_reverse(&dev_priv->drm, pipe_crtc, | |
| 1737 | + intel_crtc_joined_pipe_mask(new_crtc_state)) { | |
| 1738 | + const struct intel_crtc_state *pipe_crtc_state = | |
| 1739 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 1740 | + enum pipe hsw_workaround_pipe; | |
| 1715 | 1741 | |
| 1716 | − /* If we change the relative order between pipe/planes enabling, we need | |
| 1717 | − * to change the workaround. */ | |
| 1718 | − hsw_workaround_pipe = new_crtc_state->hsw_workaround_pipe; | |
| 1719 | − if (IS_HASWELL(dev_priv) && hsw_workaround_pipe != INVALID_PIPE) { | |
| 1720 | − struct intel_crtc *wa_crtc; | |
| 1742 | + if (glk_need_scaler_clock_gating_wa(pipe_crtc_state)) { | |
| 1743 | + intel_crtc_wait_for_next_vblank(pipe_crtc); | |
| 1744 | + glk_pipe_scaler_clock_gating_wa(pipe_crtc, false); | |
| 1745 | + } | |
| 1721 | 1746 | |
| 1722 | − wa_crtc = intel_crtc_for_pipe(dev_priv, hsw_workaround_pipe); | |
| 1747 | + /* | |
| 1748 | + * If we change the relative order between pipe/planes | |
| 1749 | + * enabling, we need to change the workaround. | |
| 1750 | + */ | |
| 1751 | + hsw_workaround_pipe = pipe_crtc_state->hsw_workaround_pipe; | |
| 1752 | + if (IS_HASWELL(dev_priv) && hsw_workaround_pipe != INVALID_PIPE) { | |
| 1753 | + struct intel_crtc *wa_crtc = | |
| 1754 | + intel_crtc_for_pipe(dev_priv, hsw_workaround_pipe); | |
| 1723 | 1755 | |
| 1724 | − intel_crtc_wait_for_next_vblank(wa_crtc); | |
| 1725 | − intel_crtc_wait_for_next_vblank(wa_crtc); | |
| 1756 | + intel_crtc_wait_for_next_vblank(wa_crtc); | |
| 1757 | + intel_crtc_wait_for_next_vblank(wa_crtc); | |
| 1758 | + } | |
| 1726 | 1759 | } |
| 1727 | 1760 | } |
| 1728 | 1761 | |
| @@ -1786,29 +1819,28 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, · 57 unmodified lines | ||
| 1786 | 1819 | const struct intel_crtc_state *old_crtc_state = |
| 1787 | 1820 | intel_atomic_get_old_crtc_state(state, crtc); |
| 1788 | 1821 | struct drm_i915_private *i915 = to_i915(crtc->base.dev); |
| 1822 | + struct intel_crtc *pipe_crtc; | |
| 1789 | 1823 | |
| 1790 | 1824 | /* |
| 1791 | 1825 | * FIXME collapse everything to one hook. |
| 1792 | 1826 | * Need care with mst->ddi interactions. |
| 1793 | 1827 | */ |
| 1794 | − if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { | |
| 1795 | − intel_encoders_disable(state, crtc); | |
| 1796 | − intel_encoders_post_disable(state, crtc); | |
| 1797 | − } | |
| 1798 | − | |
| 1799 | − intel_disable_shared_dpll(old_crtc_state); | |
| 1828 | + intel_encoders_disable(state, crtc); | |
| 1829 | + intel_encoders_post_disable(state, crtc); | |
| 1800 | 1830 | |
| 1801 | − if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { | |
| 1802 | − struct intel_crtc *slave_crtc; | |
| 1831 | + for_each_intel_crtc_in_pipe_mask(&i915->drm, pipe_crtc, | |
| 1832 | + intel_crtc_joined_pipe_mask(old_crtc_state)) { | |
| 1833 | + const struct intel_crtc_state *old_pipe_crtc_state = | |
| 1834 | + intel_atomic_get_old_crtc_state(state, pipe_crtc); | |
| 1803 | 1835 | |
| 1804 | − intel_encoders_post_pll_disable(state, crtc); | |
| 1836 | + intel_disable_shared_dpll(old_pipe_crtc_state); | |
| 1837 | + } | |
| 1805 | 1838 | |
| 1806 | − intel_dmc_disable_pipe(i915, crtc->pipe); | |
| 1839 | + intel_encoders_post_pll_disable(state, crtc); | |
| 1807 | 1840 | |
| 1808 | − for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc, | |
| 1809 | − intel_crtc_bigjoiner_slave_pipes(old_crtc_state)) | |
| 1810 | − intel_dmc_disable_pipe(i915, slave_crtc->pipe); | |
| 1811 | − } | |
| 1841 | + for_each_intel_crtc_in_pipe_mask(&i915->drm, pipe_crtc, | |
| 1842 | + intel_crtc_joined_pipe_mask(old_crtc_state)) | |
| 1843 | + intel_dmc_disable_pipe(i915, pipe_crtc->pipe); | |
| 1812 | 1844 | } |
| 1813 | 1845 | |
| 1814 | 1846 | static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) |
| @@ -1836,6 +1868,7 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) · 21 unmodified lines | ||
| 1836 | 1868 | intel_de_write(dev_priv, BCLRPAT(crtc->pipe), 0); |
| 1837 | 1869 | } |
| 1838 | 1870 | |
| 1871 | +/* Prefer intel_encoder_is_combo() */ | |
| 1839 | 1872 | bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy) |
| 1840 | 1873 | { |
| 1841 | 1874 | if (phy == PHY_NONE) |
| @@ -1857,6 +1890,7 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy) · 15 unmodified lines | ||
| 1857 | 1890 | return false; |
| 1858 | 1891 | } |
| 1859 | 1892 | |
| 1893 | +/* Prefer intel_encoder_is_tc() */ | |
| 1860 | 1894 | bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy) |
| 1861 | 1895 | { |
| 1862 | 1896 | /* |
| @@ -1877,6 +1911,7 @@ bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy) · 14 unmodified lines | ||
| 1877 | 1911 | return false; |
| 1878 | 1912 | } |
| 1879 | 1913 | |
| 1914 | +/* Prefer intel_encoder_is_snps() */ | |
| 1880 | 1915 | bool intel_phy_is_snps(struct drm_i915_private *dev_priv, enum phy phy) |
| 1881 | 1916 | { |
| 1882 | 1917 | /* |
| @@ -1886,6 +1921,7 @@ bool intel_phy_is_snps(struct drm_i915_private *dev_priv, enum phy phy) · 3 unmodified lines | ||
| 1886 | 1921 | return IS_DG2(dev_priv) && phy > PHY_NONE && phy <= PHY_E; |
| 1887 | 1922 | } |
| 1888 | 1923 | |
| 1924 | +/* Prefer intel_encoder_to_phy() */ | |
| 1889 | 1925 | enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port) |
| 1890 | 1926 | { |
| 1891 | 1927 | if (DISPLAY_VER(i915) >= 13 && port >= PORT_D_XELPD) |
| @@ -1903,6 +1939,7 @@ enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port) · 11 unmodified lines | ||
| 1903 | 1939 | return PHY_A + port - PORT_A; |
| 1904 | 1940 | } |
| 1905 | 1941 | |
| 1942 | +/* Prefer intel_encoder_to_tc() */ | |
| 1906 | 1943 | enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv, enum port port) |
| 1907 | 1944 | { |
| 1908 | 1945 | if (!intel_phy_is_tc(dev_priv, intel_port_to_phy(dev_priv, port))) |
| @@ -1914,6 +1951,41 @@ enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv, enum port port) · 5 unmodified lines | ||
| 1914 | 1951 | return TC_PORT_1 + port - PORT_C; |
| 1915 | 1952 | } |
| 1916 | 1953 | |
| 1954 | +enum phy intel_encoder_to_phy(struct intel_encoder *encoder) | |
| 1955 | +{ | |
| 1956 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 1957 | + | |
| 1958 | + return intel_port_to_phy(i915, encoder->port); | |
| 1959 | +} | |
| 1960 | + | |
| 1961 | +bool intel_encoder_is_combo(struct intel_encoder *encoder) | |
| 1962 | +{ | |
| 1963 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 1964 | + | |
| 1965 | + return intel_phy_is_combo(i915, intel_encoder_to_phy(encoder)); | |
| 1966 | +} | |
| 1967 | + | |
| 1968 | +bool intel_encoder_is_snps(struct intel_encoder *encoder) | |
| 1969 | +{ | |
| 1970 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 1971 | + | |
| 1972 | + return intel_phy_is_snps(i915, intel_encoder_to_phy(encoder)); | |
| 1973 | +} | |
| 1974 | + | |
| 1975 | +bool intel_encoder_is_tc(struct intel_encoder *encoder) | |
| 1976 | +{ | |
| 1977 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 1978 | + | |
| 1979 | + return intel_phy_is_tc(i915, intel_encoder_to_phy(encoder)); | |
| 1980 | +} | |
| 1981 | + | |
| 1982 | +enum tc_port intel_encoder_to_tc(struct intel_encoder *encoder) | |
| 1983 | +{ | |
| 1984 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 1985 | + | |
| 1986 | + return intel_port_to_tc(i915, encoder->port); | |
| 1987 | +} | |
| 1988 | + | |
| 1917 | 1989 | enum intel_display_power_domain |
| 1918 | 1990 | intel_aux_power_domain(struct intel_digital_port *dig_port) |
| 1919 | 1991 | { |
| @@ -2381,7 +2453,7 @@ static int intel_crtc_compute_pipe_mode(struct intel_crtc_state *crtc_state) · 461 unmodified lines | ||
| 2381 | 2453 | struct drm_i915_private *i915 = to_i915(crtc->base.dev); |
| 2382 | 2454 | struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; |
| 2383 | 2455 | struct drm_display_mode *pipe_mode = &crtc_state->hw.pipe_mode; |
| 2384 | − int clock_limit = i915->max_dotclk_freq; | |
| 2456 | + int clock_limit = i915->display.cdclk.max_dotclk_freq; | |
| 2385 | 2457 | |
| 2386 | 2458 | /* |
| 2387 | 2459 | * Start with the adjusted_mode crtc timings, which |
| @@ -2405,7 +2477,7 @@ static int intel_crtc_compute_pipe_mode(struct intel_crtc_state *crtc_state) · 17 unmodified lines | ||
| 2405 | 2477 | */ |
| 2406 | 2478 | if (intel_crtc_supports_double_wide(crtc) && |
| 2407 | 2479 | pipe_mode->crtc_clock > clock_limit) { |
| 2408 | − clock_limit = i915->max_dotclk_freq; | |
| 2480 | + clock_limit = i915->display.cdclk.max_dotclk_freq; | |
| 2409 | 2481 | crtc_state->double_wide = true; |
| 2410 | 2482 | } |
| 2411 | 2483 | } |
| @@ -2709,15 +2781,6 @@ static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state) · 297 unmodified lines | ||
| 2709 | 2781 | */ |
| 2710 | 2782 | intel_de_write(dev_priv, PIPESRC(pipe), |
| 2711 | 2783 | PIPESRC_WIDTH(width - 1) | PIPESRC_HEIGHT(height - 1)); |
| 2712 | − | |
| 2713 | − if (!crtc_state->enable_psr2_su_region_et) | |
| 2714 | − return; | |
| 2715 | − | |
| 2716 | − width = drm_rect_width(&crtc_state->psr2_su_area); | |
| 2717 | − height = drm_rect_height(&crtc_state->psr2_su_area); | |
| 2718 | − | |
| 2719 | − intel_de_write(dev_priv, PIPE_SRCSZ_ERLY_TPT(pipe), | |
| 2720 | − PIPESRC_WIDTH(width - 1) | PIPESRC_HEIGHT(height - 1)); | |
| 2721 | 2784 | } |
| 2722 | 2785 | |
| 2723 | 2786 | static bool intel_pipe_is_interlaced(const struct intel_crtc_state *crtc_state) |
| @@ -4723,8 +4786,6 @@ intel_modeset_pipe_config_late(struct intel_atomic_state *state, · 1999 unmodified lines | ||
| 4723 | 4786 | struct drm_connector *connector; |
| 4724 | 4787 | int i; |
| 4725 | 4788 | |
| 4726 | − intel_bigjoiner_adjust_pipe_src(crtc_state); | |
| 4727 | − | |
| 4728 | 4789 | for_each_new_connector_in_state(&state->base, connector, |
| 4729 | 4790 | conn_state, i) { |
| 4730 | 4791 | struct intel_encoder *encoder = |
| @@ -4791,42 +4852,92 @@ intel_compare_dp_vsc_sdp(const struct drm_dp_vsc_sdp *a, · 60 unmodified lines | ||
| 4791 | 4852 | a->content_type == b->content_type; |
| 4792 | 4853 | } |
| 4793 | 4854 | |
| 4855 | +static bool | |
| 4856 | +intel_compare_dp_as_sdp(const struct drm_dp_as_sdp *a, | |
| 4857 | + const struct drm_dp_as_sdp *b) | |
| 4858 | +{ | |
| 4859 | + return a->vtotal == b->vtotal && | |
| 4860 | + a->target_rr == b->target_rr && | |
| 4861 | + a->duration_incr_ms == b->duration_incr_ms && | |
| 4862 | + a->duration_decr_ms == b->duration_decr_ms && | |
| 4863 | + a->mode == b->mode; | |
| 4864 | +} | |
| 4865 | + | |
| 4794 | 4866 | static bool |
| 4795 | 4867 | intel_compare_buffer(const u8 *a, const u8 *b, size_t len) |
| 4796 | 4868 | { |
| 4797 | 4869 | return memcmp(a, b, len) == 0; |
| 4798 | 4870 | } |
| 4799 | 4871 | |
| 4872 | +static void __printf(5, 6) | |
| 4873 | +pipe_config_mismatch(struct drm_printer *p, bool fastset, | |
| 4874 | + const struct intel_crtc *crtc, | |
| 4875 | + const char *name, const char *format, ...) | |
| 4876 | +{ | |
| 4877 | + struct va_format vaf; | |
| 4878 | + va_list args; | |
| 4879 | + | |
| 4880 | + va_start(args, format); | |
| 4881 | + vaf.fmt = format; | |
| 4882 | + vaf.va = &args; | |
| 4883 | + | |
| 4884 | + if (fastset) | |
| 4885 | + drm_printf(p, "[CRTC:%d:%s] fastset requirement not met in %s %pV\n", | |
| 4886 | + crtc->base.base.id, crtc->base.name, name, &vaf); | |
| 4887 | + else | |
| 4888 | + drm_printf(p, "[CRTC:%d:%s] mismatch in %s %pV\n", | |
| 4889 | + crtc->base.base.id, crtc->base.name, name, &vaf); | |
| 4890 | + | |
| 4891 | + va_end(args); | |
| 4892 | +} | |
| 4893 | + | |
| 4800 | 4894 | static void |
| 4801 | −pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv, | |
| 4802 | − bool fastset, const char *name, | |
| 4895 | +pipe_config_infoframe_mismatch(struct drm_printer *p, bool fastset, | |
| 4896 | + const struct intel_crtc *crtc, | |
| 4897 | + const char *name, | |
| 4803 | 4898 | const union hdmi_infoframe *a, |
| 4804 | 4899 | const union hdmi_infoframe *b) |
| 4805 | 4900 | { |
| 4901 | + struct drm_i915_private *i915 = to_i915(crtc->base.dev); | |
| 4902 | + const char *loglevel; | |
| 4903 | + | |
| 4806 | 4904 | if (fastset) { |
| 4807 | 4905 | if (!drm_debug_enabled(DRM_UT_KMS)) |
| 4808 | 4906 | return; |
| 4809 | 4907 | |
| 4810 | − drm_dbg_kms(&dev_priv->drm, | |
| 4811 | − "fastset requirement not met in %s infoframe\n", name); | |
| 4812 | − drm_dbg_kms(&dev_priv->drm, "expected:\n"); | |
| 4813 | − hdmi_infoframe_log(KERN_DEBUG, dev_priv->drm.dev, a); | |
| 4814 | − drm_dbg_kms(&dev_priv->drm, "found:\n"); | |
| 4815 | − hdmi_infoframe_log(KERN_DEBUG, dev_priv->drm.dev, b); | |
| 4908 | + loglevel = KERN_DEBUG; | |
| 4816 | 4909 | } else { |
| 4817 | − drm_err(&dev_priv->drm, "mismatch in %s infoframe\n", name); | |
| 4818 | − drm_err(&dev_priv->drm, "expected:\n"); | |
| 4819 | − hdmi_infoframe_log(KERN_ERR, dev_priv->drm.dev, a); | |
| 4820 | − drm_err(&dev_priv->drm, "found:\n"); | |
| 4821 | − hdmi_infoframe_log(KERN_ERR, dev_priv->drm.dev, b); | |
| 4910 | + loglevel = KERN_ERR; | |
| 4822 | 4911 | } |
| 4912 | + | |
| 4913 | + pipe_config_mismatch(p, fastset, crtc, name, "infoframe"); | |
| 4914 | + | |
| 4915 | + drm_printf(p, "expected:\n"); | |
| 4916 | + hdmi_infoframe_log(loglevel, i915->drm.dev, a); | |
| 4917 | + drm_printf(p, "found:\n"); | |
| 4918 | + hdmi_infoframe_log(loglevel, i915->drm.dev, b); | |
| 4823 | 4919 | } |
| 4824 | 4920 | |
| 4825 | 4921 | static void |
| 4826 | −pipe_config_dp_vsc_sdp_mismatch(struct drm_i915_private *i915, | |
| 4827 | − bool fastset, const char *name, | |
| 4922 | +pipe_config_dp_vsc_sdp_mismatch(struct drm_printer *p, bool fastset, | |
| 4923 | + const struct intel_crtc *crtc, | |
| 4924 | + const char *name, | |
| 4828 | 4925 | const struct drm_dp_vsc_sdp *a, |
| 4829 | 4926 | const struct drm_dp_vsc_sdp *b) |
| 4927 | +{ | |
| 4928 | + pipe_config_mismatch(p, fastset, crtc, name, "dp sdp"); | |
| 4929 | + | |
| 4930 | + drm_printf(p, "expected:\n"); | |
| 4931 | + drm_dp_vsc_sdp_log(p, a); | |
| 4932 | + drm_printf(p, "found:\n"); | |
| 4933 | + drm_dp_vsc_sdp_log(p, b); | |
| 4934 | +} | |
| 4935 | + | |
| 4936 | +static void | |
| 4937 | +pipe_config_dp_as_sdp_mismatch(struct drm_i915_private *i915, | |
| 4938 | + bool fastset, const char *name, | |
| 4939 | + const struct drm_dp_as_sdp *a, | |
| 4940 | + const struct drm_dp_as_sdp *b) | |
| 4830 | 4941 | { |
| 4831 | 4942 | struct drm_printer p; |
| 4832 | 4943 | |
| @@ -4841,9 +4952,9 @@ pipe_config_dp_vsc_sdp_mismatch(struct drm_i915_private *i915, · 8 unmodified lines | ||
| 4841 | 4952 | } |
| 4842 | 4953 | |
| 4843 | 4954 | drm_printf(&p, "expected:\n"); |
| 4844 | − drm_dp_vsc_sdp_log(&p, a); | |
| 4955 | + drm_dp_as_sdp_log(&p, a); | |
| 4845 | 4956 | drm_printf(&p, "found:\n"); |
| 4846 | − drm_dp_vsc_sdp_log(&p, b); | |
| 4957 | + drm_dp_as_sdp_log(&p, b); | |
| 4847 | 4958 | } |
| 4848 | 4959 | |
| 4849 | 4960 | /* Returns the length up to and including the last differing byte */ |
| @@ -4861,64 +4972,35 @@ memcmp_diff_len(const u8 *a, const u8 *b, size_t len) · 11 unmodified lines | ||
| 4861 | 4972 | } |
| 4862 | 4973 | |
| 4863 | 4974 | static void |
| 4864 | −pipe_config_buffer_mismatch(bool fastset, const struct intel_crtc *crtc, | |
| 4975 | +pipe_config_buffer_mismatch(struct drm_printer *p, bool fastset, | |
| 4976 | + const struct intel_crtc *crtc, | |
| 4865 | 4977 | const char *name, |
| 4866 | 4978 | const u8 *a, const u8 *b, size_t len) |
| 4867 | 4979 | { |
| 4868 | − struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); | |
| 4980 | + const char *loglevel; | |
| 4869 | 4981 | |
| 4870 | 4982 | if (fastset) { |
| 4871 | 4983 | if (!drm_debug_enabled(DRM_UT_KMS)) |
| 4872 | 4984 | return; |
| 4873 | 4985 | |
| 4874 | − /* only dump up to the last difference */ | |
| 4875 | − len = memcmp_diff_len(a, b, len); | |
| 4876 | − | |
| 4877 | − drm_dbg_kms(&dev_priv->drm, | |
| 4878 | − "[CRTC:%d:%s] fastset requirement not met in %s buffer\n", | |
| 4879 | − crtc->base.base.id, crtc->base.name, name); | |
| 4880 | − print_hex_dump(KERN_DEBUG, "expected: ", DUMP_PREFIX_NONE, | |
| 4881 | − 16, 0, a, len, false); | |
| 4882 | − print_hex_dump(KERN_DEBUG, "found: ", DUMP_PREFIX_NONE, | |
| 4883 | − 16, 0, b, len, false); | |
| 4986 | + loglevel = KERN_DEBUG; | |
| 4884 | 4987 | } else { |
| 4885 | − /* only dump up to the last difference */ | |
| 4886 | − len = memcmp_diff_len(a, b, len); | |
| 4887 | − | |
| 4888 | − drm_err(&dev_priv->drm, "[CRTC:%d:%s] mismatch in %s buffer\n", | |
| 4889 | − crtc->base.base.id, crtc->base.name, name); | |
| 4890 | − print_hex_dump(KERN_ERR, "expected: ", DUMP_PREFIX_NONE, | |
| 4891 | − 16, 0, a, len, false); | |
| 4892 | − print_hex_dump(KERN_ERR, "found: ", DUMP_PREFIX_NONE, | |
| 4893 | − 16, 0, b, len, false); | |
| 4988 | + loglevel = KERN_ERR; | |
| 4894 | 4989 | } |
| 4895 | −} | |
| 4896 | 4990 | |
| 4897 | −static void __printf(4, 5) | |
| 4898 | −pipe_config_mismatch(bool fastset, const struct intel_crtc *crtc, | |
| 4899 | − const char *name, const char *format, ...) | |
| 4900 | −{ | |
| 4901 | − struct drm_i915_private *i915 = to_i915(crtc->base.dev); | |
| 4902 | − struct va_format vaf; | |
| 4903 | − va_list args; | |
| 4904 | − | |
| 4905 | − va_start(args, format); | |
| 4906 | − vaf.fmt = format; | |
| 4907 | − vaf.va = &args; | |
| 4991 | + pipe_config_mismatch(p, fastset, crtc, name, "buffer"); | |
| 4908 | 4992 | |
| 4909 | − if (fastset) | |
| 4910 | − drm_dbg_kms(&i915->drm, | |
| 4911 | − "[CRTC:%d:%s] fastset requirement not met in %s %pV\n", | |
| 4912 | − crtc->base.base.id, crtc->base.name, name, &vaf); | |
| 4913 | − else | |
| 4914 | − drm_err(&i915->drm, "[CRTC:%d:%s] mismatch in %s %pV\n", | |
| 4915 | − crtc->base.base.id, crtc->base.name, name, &vaf); | |
| 4993 | + /* only dump up to the last difference */ | |
| 4994 | + len = memcmp_diff_len(a, b, len); | |
| 4916 | 4995 | |
| 4917 | − va_end(args); | |
| 4996 | + print_hex_dump(loglevel, "expected: ", DUMP_PREFIX_NONE, | |
| 4997 | + 16, 0, a, len, false); | |
| 4998 | + print_hex_dump(loglevel, "found: ", DUMP_PREFIX_NONE, | |
| 4999 | + 16, 0, b, len, false); | |
| 4918 | 5000 | } |
| 4919 | 5001 | |
| 4920 | 5002 | static void |
| 4921 | −pipe_config_pll_mismatch(bool fastset, | |
| 5003 | +pipe_config_pll_mismatch(struct drm_printer *p, bool fastset, | |
| 4922 | 5004 | const struct intel_crtc *crtc, |
| 4923 | 5005 | const char *name, |
| 4924 | 5006 | const struct intel_dpll_hw_state *a, |
| @@ -4926,25 +5008,12 @@ pipe_config_pll_mismatch(bool fastset, · 1 unmodified line | ||
| 4926 | 5008 | { |
| 4927 | 5009 | struct drm_i915_private *i915 = to_i915(crtc->base.dev); |
| 4928 | 5010 | |
| 4929 | − if (fastset) { | |
| 4930 | − if (!drm_debug_enabled(DRM_UT_KMS)) | |
| 4931 | − return; | |
| 5011 | + pipe_config_mismatch(p, fastset, crtc, name, " "); /* stupid -Werror=format-zero-length */ | |
| 4932 | 5012 | |
| 4933 | − drm_dbg_kms(&i915->drm, | |
| 4934 | − "[CRTC:%d:%s] fastset requirement not met in %s\n", | |
| 4935 | − crtc->base.base.id, crtc->base.name, name); | |
| 4936 | − drm_dbg_kms(&i915->drm, "expected:\n"); | |
| 4937 | − intel_dpll_dump_hw_state(i915, a); | |
| 4938 | − drm_dbg_kms(&i915->drm, "found:\n"); | |
| 4939 | − intel_dpll_dump_hw_state(i915, b); | |
| 4940 | − } else { | |
| 4941 | − drm_err(&i915->drm, "[CRTC:%d:%s] mismatch in %s buffer\n", | |
| 4942 | − crtc->base.base.id, crtc->base.name, name); | |
| 4943 | − drm_err(&i915->drm, "expected:\n"); | |
| 4944 | − intel_dpll_dump_hw_state(i915, a); | |
| 4945 | − drm_err(&i915->drm, "found:\n"); | |
| 4946 | − intel_dpll_dump_hw_state(i915, b); | |
| 4947 | − } | |
| 5013 | + drm_printf(p, "expected:\n"); | |
| 5014 | + intel_dpll_dump_hw_state(i915, p, a); | |
| 5015 | + drm_printf(p, "found:\n"); | |
| 5016 | + intel_dpll_dump_hw_state(i915, p, b); | |
| 4948 | 5017 | } |
| 4949 | 5018 | |
| 4950 | 5019 | bool |
| @@ -4954,13 +5023,19 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 3 unmodified lines | ||
| 4954 | 5023 | { |
| 4955 | 5024 | struct drm_i915_private *dev_priv = to_i915(current_config->uapi.crtc->dev); |
| 4956 | 5025 | struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); |
| 5026 | + struct drm_printer p; | |
| 4957 | 5027 | bool ret = true; |
| 4958 | 5028 | |
| 5029 | + if (fastset) | |
| 5030 | + p = drm_dbg_printer(&dev_priv->drm, DRM_UT_KMS, NULL); | |
| 5031 | + else | |
| 5032 | + p = drm_err_printer(&dev_priv->drm, NULL); | |
| 5033 | + | |
| 4959 | 5034 | #define PIPE_CONF_CHECK_X(name) do { \ |
| 4960 | 5035 | if (current_config->name != pipe_config->name) { \ |
| 4961 | 5036 | BUILD_BUG_ON_MSG(__same_type(current_config->name, bool), \ |
| 4962 | 5037 | __stringify(name) " is bool"); \ |
| 4963 | − pipe_config_mismatch(fastset, crtc, __stringify(name), \ | |
| 5038 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 4964 | 5039 | "(expected 0x%08x, found 0x%08x)", \ |
| 4965 | 5040 | current_config->name, \ |
| 4966 | 5041 | pipe_config->name); \ |
| @@ -4972,7 +5047,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 5 unmodified lines | ||
| 4972 | 5047 | if ((current_config->name & (mask)) != (pipe_config->name & (mask))) { \ |
| 4973 | 5048 | BUILD_BUG_ON_MSG(__same_type(current_config->name, bool), \ |
| 4974 | 5049 | __stringify(name) " is bool"); \ |
| 4975 | − pipe_config_mismatch(fastset, crtc, __stringify(name), \ | |
| 5050 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 4976 | 5051 | "(expected 0x%08x, found 0x%08x)", \ |
| 4977 | 5052 | current_config->name & (mask), \ |
| 4978 | 5053 | pipe_config->name & (mask)); \ |
| @@ -4984,7 +5059,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 5 unmodified lines | ||
| 4984 | 5059 | if (current_config->name != pipe_config->name) { \ |
| 4985 | 5060 | BUILD_BUG_ON_MSG(__same_type(current_config->name, bool), \ |
| 4986 | 5061 | __stringify(name) " is bool"); \ |
| 4987 | − pipe_config_mismatch(fastset, crtc, __stringify(name), \ | |
| 5062 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 4988 | 5063 | "(expected %i, found %i)", \ |
| 4989 | 5064 | current_config->name, \ |
| 4990 | 5065 | pipe_config->name); \ |
| @@ -4996,7 +5071,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 5 unmodified lines | ||
| 4996 | 5071 | if (current_config->name != pipe_config->name) { \ |
| 4997 | 5072 | BUILD_BUG_ON_MSG(!__same_type(current_config->name, bool), \ |
| 4998 | 5073 | __stringify(name) " is not bool"); \ |
| 4999 | − pipe_config_mismatch(fastset, crtc, __stringify(name), \ | |
| 5074 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5000 | 5075 | "(expected %s, found %s)", \ |
| 5001 | 5076 | str_yes_no(current_config->name), \ |
| 5002 | 5077 | str_yes_no(pipe_config->name)); \ |
| @@ -5006,7 +5081,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 3 unmodified lines | ||
| 5006 | 5081 | |
| 5007 | 5082 | #define PIPE_CONF_CHECK_P(name) do { \ |
| 5008 | 5083 | if (current_config->name != pipe_config->name) { \ |
| 5009 | − pipe_config_mismatch(fastset, crtc, __stringify(name), \ | |
| 5084 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5010 | 5085 | "(expected %p, found %p)", \ |
| 5011 | 5086 | current_config->name, \ |
| 5012 | 5087 | pipe_config->name); \ |
| @@ -5017,7 +5092,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 4 unmodified lines | ||
| 5017 | 5092 | #define PIPE_CONF_CHECK_M_N(name) do { \ |
| 5018 | 5093 | if (!intel_compare_link_m_n(¤t_config->name, \ |
| 5019 | 5094 | &pipe_config->name)) { \ |
| 5020 | − pipe_config_mismatch(fastset, crtc, __stringify(name), \ | |
| 5095 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5021 | 5096 | "(expected tu %i data %i/%i link %i/%i, " \ |
| 5022 | 5097 | "found tu %i, data %i/%i link %i/%i)", \ |
| 5023 | 5098 | current_config->name.tu, \ |
| @@ -5037,7 +5112,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 13 unmodified lines | ||
| 5037 | 5112 | #define PIPE_CONF_CHECK_PLL(name) do { \ |
| 5038 | 5113 | if (!intel_dpll_compare_hw_state(dev_priv, ¤t_config->name, \ |
| 5039 | 5114 | &pipe_config->name)) { \ |
| 5040 | − pipe_config_pll_mismatch(fastset, crtc, __stringify(name), \ | |
| 5115 | + pipe_config_pll_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5041 | 5116 | ¤t_config->name, \ |
| 5042 | 5117 | &pipe_config->name); \ |
| 5043 | 5118 | ret = false; \ |
| @@ -5070,7 +5145,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 26 unmodified lines | ||
| 5070 | 5145 | |
| 5071 | 5146 | #define PIPE_CONF_CHECK_FLAGS(name, mask) do { \ |
| 5072 | 5147 | if ((current_config->name ^ pipe_config->name) & (mask)) { \ |
| 5073 | − pipe_config_mismatch(fastset, crtc, __stringify(name), \ | |
| 5148 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5074 | 5149 | "(%x) (expected %i, found %i)", \ |
| 5075 | 5150 | (mask), \ |
| 5076 | 5151 | current_config->name & (mask), \ |
| @@ -5082,7 +5157,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 5 unmodified lines | ||
| 5082 | 5157 | #define PIPE_CONF_CHECK_INFOFRAME(name) do { \ |
| 5083 | 5158 | if (!intel_compare_infoframe(¤t_config->infoframes.name, \ |
| 5084 | 5159 | &pipe_config->infoframes.name)) { \ |
| 5085 | − pipe_config_infoframe_mismatch(dev_priv, fastset, __stringify(name), \ | |
| 5160 | + pipe_config_infoframe_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5086 | 5161 | ¤t_config->infoframes.name, \ |
| 5087 | 5162 | &pipe_config->infoframes.name); \ |
| 5088 | 5163 | ret = false; \ |
| @@ -5092,7 +5167,17 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 3 unmodified lines | ||
| 5092 | 5167 | #define PIPE_CONF_CHECK_DP_VSC_SDP(name) do { \ |
| 5093 | 5168 | if (!intel_compare_dp_vsc_sdp(¤t_config->infoframes.name, \ |
| 5094 | 5169 | &pipe_config->infoframes.name)) { \ |
| 5095 | − pipe_config_dp_vsc_sdp_mismatch(dev_priv, fastset, __stringify(name), \ | |
| 5170 | + pipe_config_dp_vsc_sdp_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5171 | + ¤t_config->infoframes.name, \ | |
| 5172 | + &pipe_config->infoframes.name); \ | |
| 5173 | + ret = false; \ | |
| 5174 | + } \ | |
| 5175 | +} while (0) | |
| 5176 | + | |
| 5177 | +#define PIPE_CONF_CHECK_DP_AS_SDP(name) do { \ | |
| 5178 | + if (!intel_compare_dp_as_sdp(¤t_config->infoframes.name, \ | |
| 5179 | + &pipe_config->infoframes.name)) { \ | |
| 5180 | + pipe_config_dp_as_sdp_mismatch(dev_priv, fastset, __stringify(name), \ | |
| 5096 | 5181 | ¤t_config->infoframes.name, \ |
| 5097 | 5182 | &pipe_config->infoframes.name); \ |
| 5098 | 5183 | ret = false; \ |
| @@ -5103,7 +5188,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 4 unmodified lines | ||
| 5103 | 5188 | BUILD_BUG_ON(sizeof(current_config->name) != (len)); \ |
| 5104 | 5189 | BUILD_BUG_ON(sizeof(pipe_config->name) != (len)); \ |
| 5105 | 5190 | if (!intel_compare_buffer(current_config->name, pipe_config->name, (len))) { \ |
| 5106 | − pipe_config_buffer_mismatch(fastset, crtc, __stringify(name), \ | |
| 5191 | + pipe_config_buffer_mismatch(&p, fastset, crtc, __stringify(name), \ | |
| 5107 | 5192 | current_config->name, \ |
| 5108 | 5193 | pipe_config->name, \ |
| 5109 | 5194 | (len)); \ |
| @@ -5116,7 +5201,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 6 unmodified lines | ||
| 5116 | 5201 | !intel_color_lut_equal(current_config, \ |
| 5117 | 5202 | current_config->lut, pipe_config->lut, \ |
| 5118 | 5203 | is_pre_csc_lut)) { \ |
| 5119 | − pipe_config_mismatch(fastset, crtc, __stringify(lut), \ | |
| 5204 | + pipe_config_mismatch(&p, fastset, crtc, __stringify(lut), \ | |
| 5120 | 5205 | "hw_state doesn't match sw_state"); \ |
| 5121 | 5206 | ret = false; \ |
| 5122 | 5207 | } \ |
| @@ -5245,6 +5330,18 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 122 unmodified lines | ||
| 5245 | 5330 | PIPE_CONF_CHECK_CSC(output_csc); |
| 5246 | 5331 | } |
| 5247 | 5332 | |
| 5333 | + /* | |
| 5334 | + * Panel replay has to be enabled before link training. PSR doesn't have | |
| 5335 | + * this requirement -> check these only if using panel replay | |
| 5336 | + */ | |
| 5337 | + if (current_config->has_panel_replay || pipe_config->has_panel_replay) { | |
| 5338 | + PIPE_CONF_CHECK_BOOL(has_psr); | |
| 5339 | + PIPE_CONF_CHECK_BOOL(has_psr2); | |
| 5340 | + PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch); | |
| 5341 | + PIPE_CONF_CHECK_BOOL(enable_psr2_su_region_et); | |
| 5342 | + PIPE_CONF_CHECK_BOOL(has_panel_replay); | |
| 5343 | + } | |
| 5344 | + | |
| 5248 | 5345 | PIPE_CONF_CHECK_BOOL(double_wide); |
| 5249 | 5346 | |
| 5250 | 5347 | if (dev_priv->display.dpll.mgr) |
| @@ -5280,6 +5377,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 29 unmodified lines | ||
| 5280 | 5377 | PIPE_CONF_CHECK_INFOFRAME(hdmi); |
| 5281 | 5378 | PIPE_CONF_CHECK_INFOFRAME(drm); |
| 5282 | 5379 | PIPE_CONF_CHECK_DP_VSC_SDP(vsc); |
| 5380 | + PIPE_CONF_CHECK_DP_AS_SDP(as_sdp); | |
| 5283 | 5381 | |
| 5284 | 5382 | PIPE_CONF_CHECK_X(sync_mode_slaves_mask); |
| 5285 | 5383 | PIPE_CONF_CHECK_I(master_transcoder); |
| @@ -5331,6 +5429,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, · 45 unmodified lines | ||
| 5331 | 5429 | PIPE_CONF_CHECK_I(vrr.flipline); |
| 5332 | 5430 | PIPE_CONF_CHECK_I(vrr.pipeline_full); |
| 5333 | 5431 | PIPE_CONF_CHECK_I(vrr.guardband); |
| 5432 | + PIPE_CONF_CHECK_I(vrr.vsync_start); | |
| 5433 | + PIPE_CONF_CHECK_I(vrr.vsync_end); | |
| 5334 | 5434 | } |
| 5335 | 5435 | |
| 5336 | 5436 | #undef PIPE_CONF_CHECK_X |
| @@ -5576,14 +5676,16 @@ static int intel_modeset_checks(struct intel_atomic_state *state) · 239 unmodified lines | ||
| 5576 | 5676 | static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_state, |
| 5577 | 5677 | struct intel_crtc_state *new_crtc_state) |
| 5578 | 5678 | { |
| 5579 | − struct drm_i915_private *i915 = to_i915(old_crtc_state->uapi.crtc->dev); | |
| 5679 | + struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc); | |
| 5680 | + struct drm_i915_private *i915 = to_i915(crtc->base.dev); | |
| 5580 | 5681 | |
| 5581 | 5682 | /* only allow LRR when the timings stay within the VRR range */ |
| 5582 | 5683 | if (old_crtc_state->vrr.in_range != new_crtc_state->vrr.in_range) |
| 5583 | 5684 | new_crtc_state->update_lrr = false; |
| 5584 | 5685 | |
| 5585 | 5686 | if (!intel_pipe_config_compare(old_crtc_state, new_crtc_state, true)) |
| 5586 | − drm_dbg_kms(&i915->drm, "fastset requirement not met, forcing full modeset\n"); | |
| 5687 | + drm_dbg_kms(&i915->drm, "[CRTC:%d:%s] fastset requirement not met, forcing full modeset\n", | |
| 5688 | + crtc->base.base.id, crtc->base.name); | |
| 5587 | 5689 | else |
| 5588 | 5690 | new_crtc_state->uapi.mode_changed = false; |
| 5589 | 5691 | |
| @@ -6237,27 +6339,37 @@ static int intel_atomic_check_config(struct intel_atomic_state *state, · 647 unmodified lines | ||
| 6237 | 6339 | continue; |
| 6238 | 6340 | } |
| 6239 | 6341 | |
| 6240 | − if (intel_crtc_is_bigjoiner_slave(new_crtc_state)) { | |
| 6241 | − drm_WARN_ON(&i915->drm, new_crtc_state->uapi.enable); | |
| 6342 | + if (drm_WARN_ON(&i915->drm, intel_crtc_is_bigjoiner_slave(new_crtc_state))) | |
| 6242 | 6343 | continue; |
| 6243 | − } | |
| 6244 | 6344 | |
| 6245 | 6345 | ret = intel_crtc_prepare_cleared_state(state, crtc); |
| 6246 | 6346 | if (ret) |
| 6247 | − break; | |
| 6347 | + goto fail; | |
| 6248 | 6348 | |
| 6249 | 6349 | if (!new_crtc_state->hw.enable) |
| 6250 | 6350 | continue; |
| 6251 | 6351 | |
| 6252 | 6352 | ret = intel_modeset_pipe_config(state, crtc, limits); |
| 6253 | 6353 | if (ret) |
| 6254 | − break; | |
| 6354 | + goto fail; | |
| 6355 | + } | |
| 6255 | 6356 | |
| 6256 | − ret = intel_atomic_check_bigjoiner(state, crtc); | |
| 6357 | + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { | |
| 6358 | + if (!intel_crtc_needs_modeset(new_crtc_state)) | |
| 6359 | + continue; | |
| 6360 | + | |
| 6361 | + if (drm_WARN_ON(&i915->drm, intel_crtc_is_bigjoiner_slave(new_crtc_state))) | |
| 6362 | + continue; | |
| 6363 | + | |
| 6364 | + if (!new_crtc_state->hw.enable) | |
| 6365 | + continue; | |
| 6366 | + | |
| 6367 | + ret = intel_modeset_pipe_config_late(state, crtc); | |
| 6257 | 6368 | if (ret) |
| 6258 | − break; | |
| 6369 | + goto fail; | |
| 6259 | 6370 | } |
| 6260 | 6371 | |
| 6372 | +fail: | |
| 6261 | 6373 | if (ret) |
| 6262 | 6374 | *failed_pipe = crtc->pipe; |
| 6263 | 6375 | |
| @@ -6353,16 +6465,26 @@ int intel_atomic_check(struct drm_device *dev, · 89 unmodified lines | ||
| 6353 | 6465 | if (ret) |
| 6354 | 6466 | goto fail; |
| 6355 | 6467 | |
| 6468 | + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { | |
| 6469 | + if (!intel_crtc_needs_modeset(new_crtc_state)) | |
| 6470 | + continue; | |
| 6471 | + | |
| 6472 | + if (intel_crtc_is_bigjoiner_slave(new_crtc_state)) { | |
| 6473 | + drm_WARN_ON(&dev_priv->drm, new_crtc_state->uapi.enable); | |
| 6474 | + continue; | |
| 6475 | + } | |
| 6476 | + | |
| 6477 | + ret = intel_atomic_check_bigjoiner(state, crtc); | |
| 6478 | + if (ret) | |
| 6479 | + goto fail; | |
| 6480 | + } | |
| 6481 | + | |
| 6356 | 6482 | for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, |
| 6357 | 6483 | new_crtc_state, i) { |
| 6358 | 6484 | if (!intel_crtc_needs_modeset(new_crtc_state)) |
| 6359 | 6485 | continue; |
| 6360 | 6486 | |
| 6361 | − if (new_crtc_state->hw.enable) { | |
| 6362 | − ret = intel_modeset_pipe_config_late(state, crtc); | |
| 6363 | − if (ret) | |
| 6364 | − goto fail; | |
| 6365 | − } | |
| 6487 | + intel_bigjoiner_adjust_pipe_src(new_crtc_state); | |
| 6366 | 6488 | |
| 6367 | 6489 | intel_crtc_check_fastset(old_crtc_state, new_crtc_state); |
| 6368 | 6490 | } |
| @@ -6644,17 +6766,21 @@ static void intel_enable_crtc(struct intel_atomic_state *state, · 275 unmodified lines | ||
| 6644 | 6766 | struct drm_i915_private *dev_priv = to_i915(state->base.dev); |
| 6645 | 6767 | const struct intel_crtc_state *new_crtc_state = |
| 6646 | 6768 | intel_atomic_get_new_crtc_state(state, crtc); |
| 6769 | + struct intel_crtc *pipe_crtc; | |
| 6647 | 6770 | |
| 6648 | 6771 | if (!intel_crtc_needs_modeset(new_crtc_state)) |
| 6649 | 6772 | return; |
| 6650 | 6773 | |
| 6651 | − /* VRR will be enable later, if required */ | |
| 6652 | − intel_crtc_update_active_timings(new_crtc_state, false); | |
| 6774 | + for_each_intel_crtc_in_pipe_mask_reverse(&dev_priv->drm, pipe_crtc, | |
| 6775 | + intel_crtc_joined_pipe_mask(new_crtc_state)) { | |
| 6776 | + const struct intel_crtc_state *pipe_crtc_state = | |
| 6777 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 6653 | 6778 | |
| 6654 | − dev_priv->display.funcs.display->crtc_enable(state, crtc); | |
| 6779 | + /* VRR will be enable later, if required */ | |
| 6780 | + intel_crtc_update_active_timings(pipe_crtc_state, false); | |
| 6781 | + } | |
| 6655 | 6782 | |
| 6656 | − if (intel_crtc_is_bigjoiner_slave(new_crtc_state)) | |
| 6657 | − return; | |
| 6783 | + dev_priv->display.funcs.display->crtc_enable(state, crtc); | |
| 6658 | 6784 | |
| 6659 | 6785 | /* vblanks work again, re-enable pipe CRC. */ |
| 6660 | 6786 | intel_crtc_enable_pipe_crc(crtc); |
| @@ -6746,31 +6872,42 @@ static void intel_update_crtc(struct intel_atomic_state *state, · 85 unmodified lines | ||
| 6746 | 6872 | } |
| 6747 | 6873 | |
| 6748 | 6874 | static void intel_old_crtc_state_disables(struct intel_atomic_state *state, |
| 6749 | − struct intel_crtc_state *old_crtc_state, | |
| 6750 | − struct intel_crtc_state *new_crtc_state, | |
| 6751 | 6875 | struct intel_crtc *crtc) |
| 6752 | 6876 | { |
| 6753 | 6877 | struct drm_i915_private *dev_priv = to_i915(state->base.dev); |
| 6878 | + const struct intel_crtc_state *old_crtc_state = | |
| 6879 | + intel_atomic_get_old_crtc_state(state, crtc); | |
| 6880 | + struct intel_crtc *pipe_crtc; | |
| 6754 | 6881 | |
| 6755 | 6882 | /* |
| 6756 | 6883 | * We need to disable pipe CRC before disabling the pipe, |
| 6757 | 6884 | * or we race against vblank off. |
| 6758 | 6885 | */ |
| 6759 | − intel_crtc_disable_pipe_crc(crtc); | |
| 6886 | + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, | |
| 6887 | + intel_crtc_joined_pipe_mask(old_crtc_state)) | |
| 6888 | + intel_crtc_disable_pipe_crc(pipe_crtc); | |
| 6760 | 6889 | |
| 6761 | 6890 | dev_priv->display.funcs.display->crtc_disable(state, crtc); |
| 6762 | − crtc->active = false; | |
| 6763 | − intel_fbc_disable(crtc); | |
| 6764 | 6891 | |
| 6765 | − if (!new_crtc_state->hw.active) | |
| 6766 | − intel_initial_watermarks(state, crtc); | |
| 6892 | + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, | |
| 6893 | + intel_crtc_joined_pipe_mask(old_crtc_state)) { | |
| 6894 | + const struct intel_crtc_state *new_pipe_crtc_state = | |
| 6895 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 6896 | + | |
| 6897 | + pipe_crtc->active = false; | |
| 6898 | + intel_fbc_disable(pipe_crtc); | |
| 6899 | + | |
| 6900 | + if (!new_pipe_crtc_state->hw.active) | |
| 6901 | + intel_initial_watermarks(state, pipe_crtc); | |
| 6902 | + } | |
| 6767 | 6903 | } |
| 6768 | 6904 | |
| 6769 | 6905 | static void intel_commit_modeset_disables(struct intel_atomic_state *state) |
| 6770 | 6906 | { |
| 6771 | − struct intel_crtc_state *new_crtc_state, *old_crtc_state; | |
| 6907 | + struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 6908 | + const struct intel_crtc_state *new_crtc_state, *old_crtc_state; | |
| 6772 | 6909 | struct intel_crtc *crtc; |
| 6773 | − u32 handled = 0; | |
| 6910 | + u8 disable_pipes = 0; | |
| 6774 | 6911 | int i; |
| 6775 | 6912 | |
| 6776 | 6913 | for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, |
| @@ -6778,21 +6915,31 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) · 1 unmodified line | ||
| 6778 | 6915 | if (!intel_crtc_needs_modeset(new_crtc_state)) |
| 6779 | 6916 | continue; |
| 6780 | 6917 | |
| 6918 | + /* | |
| 6919 | + * Needs to be done even for pipes | |
| 6920 | + * that weren't enabled previously. | |
| 6921 | + */ | |
| 6781 | 6922 | intel_pre_plane_update(state, crtc); |
| 6782 | 6923 | |
| 6783 | 6924 | if (!old_crtc_state->hw.active) |
| 6784 | 6925 | continue; |
| 6785 | 6926 | |
| 6927 | + disable_pipes |= BIT(crtc->pipe); | |
| 6928 | + } | |
| 6929 | + | |
| 6930 | + for_each_old_intel_crtc_in_state(state, crtc, old_crtc_state, i) { | |
| 6931 | + if ((disable_pipes & BIT(crtc->pipe)) == 0) | |
| 6932 | + continue; | |
| 6933 | + | |
| 6786 | 6934 | intel_crtc_disable_planes(state, crtc); |
| 6787 | 6935 | } |
| 6788 | 6936 | |
| 6789 | 6937 | /* Only disable port sync and MST slaves */ |
| 6790 | − for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, | |
| 6791 | − new_crtc_state, i) { | |
| 6792 | − if (!intel_crtc_needs_modeset(new_crtc_state)) | |
| 6938 | + for_each_old_intel_crtc_in_state(state, crtc, old_crtc_state, i) { | |
| 6939 | + if ((disable_pipes & BIT(crtc->pipe)) == 0) | |
| 6793 | 6940 | continue; |
| 6794 | 6941 | |
| 6795 | − if (!old_crtc_state->hw.active) | |
| 6942 | + if (intel_crtc_is_bigjoiner_slave(old_crtc_state)) | |
| 6796 | 6943 | continue; |
| 6797 | 6944 | |
| 6798 | 6945 | /* In case of Transcoder port Sync master slave CRTCs can be |
| @@ -6801,28 +6948,28 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) · 2 unmodified lines | ||
| 6801 | 6948 | * Slave vblanks are masked till Master Vblanks. |
| 6802 | 6949 | */ |
| 6803 | 6950 | if (!is_trans_port_sync_slave(old_crtc_state) && |
| 6804 | − !intel_dp_mst_is_slave_trans(old_crtc_state) && | |
| 6805 | − !intel_crtc_is_bigjoiner_slave(old_crtc_state)) | |
| 6951 | + !intel_dp_mst_is_slave_trans(old_crtc_state)) | |
| 6806 | 6952 | continue; |
| 6807 | 6953 | |
| 6808 | − intel_old_crtc_state_disables(state, old_crtc_state, | |
| 6809 | − new_crtc_state, crtc); | |
| 6810 | − handled |= BIT(crtc->pipe); | |
| 6954 | + intel_old_crtc_state_disables(state, crtc); | |
| 6955 | + | |
| 6956 | + disable_pipes &= ~intel_crtc_joined_pipe_mask(old_crtc_state); | |
| 6811 | 6957 | } |
| 6812 | 6958 | |
| 6813 | 6959 | /* Disable everything else left on */ |
| 6814 | − for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, | |
| 6815 | − new_crtc_state, i) { | |
| 6816 | − if (!intel_crtc_needs_modeset(new_crtc_state) || | |
| 6817 | − (handled & BIT(crtc->pipe))) | |
| 6960 | + for_each_old_intel_crtc_in_state(state, crtc, old_crtc_state, i) { | |
| 6961 | + if ((disable_pipes & BIT(crtc->pipe)) == 0) | |
| 6818 | 6962 | continue; |
| 6819 | 6963 | |
| 6820 | − if (!old_crtc_state->hw.active) | |
| 6964 | + if (intel_crtc_is_bigjoiner_slave(old_crtc_state)) | |
| 6821 | 6965 | continue; |
| 6822 | 6966 | |
| 6823 | − intel_old_crtc_state_disables(state, old_crtc_state, | |
| 6824 | − new_crtc_state, crtc); | |
| 6967 | + intel_old_crtc_state_disables(state, crtc); | |
| 6968 | + | |
| 6969 | + disable_pipes &= ~intel_crtc_joined_pipe_mask(old_crtc_state); | |
| 6825 | 6970 | } |
| 6971 | + | |
| 6972 | + drm_WARN_ON(&i915->drm, disable_pipes); | |
| 6826 | 6973 | } |
| 6827 | 6974 | |
| 6828 | 6975 | static void intel_commit_modeset_enables(struct intel_atomic_state *state) |
| @@ -6889,9 +7036,15 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state) · 60 unmodified lines | ||
| 6889 | 7036 | intel_pre_update_crtc(state, crtc); |
| 6890 | 7037 | } |
| 6891 | 7038 | |
| 7039 | + intel_dbuf_mbus_pre_ddb_update(state); | |
| 7040 | + | |
| 6892 | 7041 | while (update_pipes) { |
| 6893 | − for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, | |
| 6894 | − new_crtc_state, i) { | |
| 7042 | + /* | |
| 7043 | + * Commit in reverse order to make bigjoiner master | |
| 7044 | + * send the uapi events after slaves are done. | |
| 7045 | + */ | |
| 7046 | + for_each_oldnew_intel_crtc_in_state_reverse(state, crtc, old_crtc_state, | |
| 7047 | + new_crtc_state, i) { | |
| 6895 | 7048 | enum pipe pipe = crtc->pipe; |
| 6896 | 7049 | |
| 6897 | 7050 | if ((update_pipes & BIT(pipe)) == 0) |
| @@ -6919,6 +7072,8 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state) · 21 unmodified lines | ||
| 6919 | 7072 | } |
| 6920 | 7073 | } |
| 6921 | 7074 | |
| 7075 | + intel_dbuf_mbus_post_ddb_update(state); | |
| 7076 | + | |
| 6922 | 7077 | update_pipes = modeset_pipes; |
| 6923 | 7078 | |
| 6924 | 7079 | /* |
| @@ -6931,12 +7086,14 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state) · 6 unmodified lines | ||
| 6931 | 7086 | if ((modeset_pipes & BIT(pipe)) == 0) |
| 6932 | 7087 | continue; |
| 6933 | 7088 | |
| 7089 | + if (intel_crtc_is_bigjoiner_slave(new_crtc_state)) | |
| 7090 | + continue; | |
| 7091 | + | |
| 6934 | 7092 | if (intel_dp_mst_is_slave_trans(new_crtc_state) || |
| 6935 | − is_trans_port_sync_master(new_crtc_state) || | |
| 6936 | − intel_crtc_is_bigjoiner_master(new_crtc_state)) | |
| 7093 | + is_trans_port_sync_master(new_crtc_state)) | |
| 6937 | 7094 | continue; |
| 6938 | 7095 | |
| 6939 | − modeset_pipes &= ~BIT(pipe); | |
| 7096 | + modeset_pipes &= ~intel_crtc_joined_pipe_mask(new_crtc_state); | |
| 6940 | 7097 | |
| 6941 | 7098 | intel_enable_crtc(state, crtc); |
| 6942 | 7099 | } |
| @@ -6951,7 +7108,10 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state) · 8 unmodified lines | ||
| 6951 | 7108 | if ((modeset_pipes & BIT(pipe)) == 0) |
| 6952 | 7109 | continue; |
| 6953 | 7110 | |
| 6954 | − modeset_pipes &= ~BIT(pipe); | |
| 7111 | + if (intel_crtc_is_bigjoiner_slave(new_crtc_state)) | |
| 7112 | + continue; | |
| 7113 | + | |
| 7114 | + modeset_pipes &= ~intel_crtc_joined_pipe_mask(new_crtc_state); | |
| 6955 | 7115 | |
| 6956 | 7116 | intel_enable_crtc(state, crtc); |
| 6957 | 7117 | } |
| @@ -6968,7 +7128,11 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state) · 10 unmodified lines | ||
| 6968 | 7128 | intel_pre_update_crtc(state, crtc); |
| 6969 | 7129 | } |
| 6970 | 7130 | |
| 6971 | − for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { | |
| 7131 | + /* | |
| 7132 | + * Commit in reverse order to make bigjoiner master | |
| 7133 | + * send the uapi events after slaves are done. | |
| 7134 | + */ | |
| 7135 | + for_each_new_intel_crtc_in_state_reverse(state, crtc, new_crtc_state, i) { | |
| 6972 | 7136 | enum pipe pipe = crtc->pipe; |
| 6973 | 7137 | |
| 6974 | 7138 | if ((update_pipes & BIT(pipe)) == 0) |
| @@ -7165,7 +7329,6 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) · 190 unmodified lines | ||
| 7165 | 7329 | intel_encoders_update_prepare(state); |
| 7166 | 7330 | |
| 7167 | 7331 | intel_dbuf_pre_plane_update(state); |
| 7168 | − intel_mbus_dbox_update(state); | |
| 7169 | 7332 | |
| 7170 | 7333 | for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { |
| 7171 | 7334 | if (new_crtc_state->do_async_flip) |
| @@ -7690,7 +7853,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv) · 518 unmodified lines | ||
| 7690 | 7853 | |
| 7691 | 7854 | static int max_dotclock(struct drm_i915_private *i915) |
| 7692 | 7855 | { |
| 7693 | − int max_dotclock = i915->max_dotclk_freq; | |
| 7856 | + int max_dotclock = i915->display.cdclk.max_dotclk_freq; | |
| 7694 | 7857 | |
| 7695 | 7858 | /* icl+ might use bigjoiner */ |
| 7696 | 7859 | if (DISPLAY_VER(i915) >= 11) |
| @@ -280,6 +280,12 @@ enum phy_fia { · 279 unmodified lines | ||
| 280 | 280 | base.head) \ |
| 281 | 281 | for_each_if((pipe_mask) & BIT(intel_crtc->pipe)) |
| 282 | 282 | |
| 283 | +#define for_each_intel_crtc_in_pipe_mask_reverse(dev, intel_crtc, pipe_mask) \ | |
| 284 | + list_for_each_entry_reverse((intel_crtc), \ | |
| 285 | + &(dev)->mode_config.crtc_list, \ | |
| 286 | + base.head) \ | |
| 287 | + for_each_if((pipe_mask) & BIT((intel_crtc)->pipe)) | |
| 288 | + | |
| 283 | 289 | #define for_each_intel_encoder(dev, intel_encoder) \ |
| 284 | 290 | list_for_each_entry(intel_encoder, \ |
| 285 | 291 | &(dev)->mode_config.encoder_list, \ |
| @@ -344,6 +350,14 @@ enum phy_fia { · 58 unmodified lines | ||
| 344 | 350 | (__i)++) \ |
| 345 | 351 | for_each_if(crtc) |
| 346 | 352 | |
| 353 | +#define for_each_new_intel_crtc_in_state_reverse(__state, crtc, new_crtc_state, __i) \ | |
| 354 | + for ((__i) = (__state)->base.dev->mode_config.num_crtc - 1; \ | |
| 355 | + (__i) >= 0 && \ | |
| 356 | + ((crtc) = to_intel_crtc((__state)->base.crtcs[__i].ptr), \ | |
| 357 | + (new_crtc_state) = to_intel_crtc_state((__state)->base.crtcs[__i].new_state), 1); \ | |
| 358 | + (__i)--) \ | |
| 359 | + for_each_if(crtc) | |
| 360 | + | |
| 347 | 361 | #define for_each_oldnew_intel_plane_in_state(__state, plane, old_plane_state, new_plane_state, __i) \ |
| 348 | 362 | for ((__i) = 0; \ |
| 349 | 363 | (__i) < (__state)->base.dev->mode_config.num_total_plane && \ |
| @@ -408,6 +422,7 @@ intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915, · 58 unmodified lines | ||
| 408 | 422 | enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port); |
| 409 | 423 | bool is_trans_port_sync_mode(const struct intel_crtc_state *state); |
| 410 | 424 | bool is_trans_port_sync_master(const struct intel_crtc_state *state); |
| 425 | +u8 intel_crtc_joined_pipe_mask(const struct intel_crtc_state *crtc_state); | |
| 411 | 426 | bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state); |
| 412 | 427 | bool intel_crtc_is_bigjoiner_master(const struct intel_crtc_state *crtc_state); |
| 413 | 428 | u8 intel_crtc_bigjoiner_slave_pipes(const struct intel_crtc_state *crtc_state); |
| @@ -448,6 +463,13 @@ bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy); · 34 unmodified lines | ||
| 448 | 463 | bool intel_phy_is_snps(struct drm_i915_private *dev_priv, enum phy phy); |
| 449 | 464 | enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv, |
| 450 | 465 | enum port port); |
| 466 | + | |
| 467 | +enum phy intel_encoder_to_phy(struct intel_encoder *encoder); | |
| 468 | +bool intel_encoder_is_combo(struct intel_encoder *encoder); | |
| 469 | +bool intel_encoder_is_snps(struct intel_encoder *encoder); | |
| 470 | +bool intel_encoder_is_tc(struct intel_encoder *encoder); | |
| 471 | +enum tc_port intel_encoder_to_tc(struct intel_encoder *encoder); | |
| 472 | + | |
| 451 | 473 | int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data, |
| 452 | 474 | struct drm_file *file_priv); |
| 453 | 475 | |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include "intel_global_state.h" |
| 27 | 27 | #include "intel_gmbus.h" |
| 28 | 28 | #include "intel_opregion.h" |
| 29 | +#include "intel_dmc_wl.h" | |
| 29 | 30 | #include "intel_wm_types.h" |
| 30 | 31 | |
| 31 | 32 | struct task_struct; |
| @@ -345,6 +346,8 @@ struct intel_display { · 313 unmodified lines | ||
| 345 | 346 | struct intel_global_obj obj; |
| 346 | 347 | |
| 347 | 348 | unsigned int max_cdclk_freq; |
| 349 | + unsigned int max_dotclk_freq; | |
| 350 | + unsigned int skl_preferred_vco_freq; | |
| 348 | 351 | } cdclk; |
| 349 | 352 | |
| 350 | 353 | struct { |
| @@ -445,6 +448,16 @@ struct intel_display { · 94 unmodified lines | ||
| 445 | 448 | bool false_color; |
| 446 | 449 | } ips; |
| 447 | 450 | |
| 451 | + struct { | |
| 452 | + bool display_irqs_enabled; | |
| 453 | + | |
| 454 | + /* For i915gm/i945gm vblank irq workaround */ | |
| 455 | + u8 vblank_enabled; | |
| 456 | + | |
| 457 | + u32 de_irq_mask[I915_MAX_PIPES]; | |
| 458 | + u32 pipestat_irq_mask[I915_MAX_PIPES]; | |
| 459 | + } irq; | |
| 460 | + | |
| 448 | 461 | struct { |
| 449 | 462 | wait_queue_head_t waitqueue; |
| 450 | 463 | |
| @@ -534,6 +547,7 @@ struct intel_display { · 83 unmodified lines | ||
| 534 | 547 | struct intel_overlay *overlay; |
| 535 | 548 | struct intel_display_params params; |
| 536 | 549 | struct intel_vbt_data vbt; |
| 550 | + struct intel_dmc_wl wl; | |
| 537 | 551 | struct intel_wm wm; |
| 538 | 552 | }; |
| 539 | 553 | |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include "intel_hdmi.h" |
| 32 | 32 | #include "intel_hotplug.h" |
| 33 | 33 | #include "intel_panel.h" |
| 34 | +#include "intel_pps.h" | |
| 34 | 35 | #include "intel_psr.h" |
| 35 | 36 | #include "intel_psr_regs.h" |
| 36 | 37 | #include "intel_wm.h" |
| @@ -191,7 +192,7 @@ static void intel_hdcp_info(struct seq_file *m, · 154 unmodified lines | ||
| 191 | 192 | struct intel_connector *intel_connector, |
| 192 | 193 | bool remote_req) |
| 193 | 194 | { |
| 194 | − bool hdcp_cap, hdcp2_cap; | |
| 195 | + bool hdcp_cap = false, hdcp2_cap = false; | |
| 195 | 196 | |
| 196 | 197 | if (!intel_connector->hdcp.shim) { |
| 197 | 198 | seq_puts(m, "No Connector Support"); |
| @@ -252,9 +253,6 @@ static void intel_connector_info(struct seq_file *m, · 54 unmodified lines | ||
| 252 | 253 | struct drm_connector *connector) |
| 253 | 254 | { |
| 254 | 255 | struct intel_connector *intel_connector = to_intel_connector(connector); |
| 255 | − const struct drm_connector_state *conn_state = connector->state; | |
| 256 | − struct intel_encoder *encoder = | |
| 257 | − to_intel_encoder(conn_state->best_encoder); | |
| 258 | 256 | const struct drm_display_mode *mode; |
| 259 | 257 | |
| 260 | 258 | seq_printf(m, "[CONNECTOR:%d:%s]: status: %s\n", |
| @@ -271,28 +269,23 @@ static void intel_connector_info(struct seq_file *m, · 10 unmodified lines | ||
| 271 | 269 | drm_get_subpixel_order_name(connector->display_info.subpixel_order)); |
| 272 | 270 | seq_printf(m, "\tCEA rev: %d\n", connector->display_info.cea_rev); |
| 273 | 271 | |
| 274 | − if (!encoder) | |
| 275 | − return; | |
| 276 | − | |
| 277 | 272 | switch (connector->connector_type) { |
| 278 | 273 | case DRM_MODE_CONNECTOR_DisplayPort: |
| 279 | 274 | case DRM_MODE_CONNECTOR_eDP: |
| 280 | − if (encoder->type == INTEL_OUTPUT_DP_MST) | |
| 275 | + if (intel_connector->mst_port) | |
| 281 | 276 | intel_dp_mst_info(m, intel_connector); |
| 282 | 277 | else |
| 283 | 278 | intel_dp_info(m, intel_connector); |
| 284 | 279 | break; |
| 285 | 280 | case DRM_MODE_CONNECTOR_HDMIA: |
| 286 | − if (encoder->type == INTEL_OUTPUT_HDMI || | |
| 287 | − encoder->type == INTEL_OUTPUT_DDI) | |
| 288 | − intel_hdmi_info(m, intel_connector); | |
| 281 | + intel_hdmi_info(m, intel_connector); | |
| 289 | 282 | break; |
| 290 | 283 | default: |
| 291 | 284 | break; |
| 292 | 285 | } |
| 293 | 286 | |
| 294 | 287 | seq_puts(m, "\tHDCP version: "); |
| 295 | − if (intel_encoder_is_mst(encoder)) { | |
| 288 | + if (intel_connector->mst_port) { | |
| 296 | 289 | intel_hdcp_info(m, intel_connector, true); |
| 297 | 290 | seq_puts(m, "\tMST Hub HDCP version: "); |
| 298 | 291 | } |
| @@ -1103,27 +1096,6 @@ void intel_display_debugfs_register(struct drm_i915_private *i915) · 804 unmodified lines | ||
| 1103 | 1096 | intel_display_debugfs_params(i915); |
| 1104 | 1097 | } |
| 1105 | 1098 | |
| 1106 | −static int i915_panel_show(struct seq_file *m, void *data) | |
| 1107 | −{ | |
| 1108 | − struct intel_connector *connector = m->private; | |
| 1109 | − struct intel_dp *intel_dp = intel_attached_dp(connector); | |
| 1110 | − | |
| 1111 | − if (connector->base.status != connector_status_connected) | |
| 1112 | − return -ENODEV; | |
| 1113 | − | |
| 1114 | − seq_printf(m, "Panel power up delay: %d\n", | |
| 1115 | − intel_dp->pps.panel_power_up_delay); | |
| 1116 | − seq_printf(m, "Panel power down delay: %d\n", | |
| 1117 | − intel_dp->pps.panel_power_down_delay); | |
| 1118 | − seq_printf(m, "Backlight on delay: %d\n", | |
| 1119 | − intel_dp->pps.backlight_on_delay); | |
| 1120 | − seq_printf(m, "Backlight off delay: %d\n", | |
| 1121 | − intel_dp->pps.backlight_off_delay); | |
| 1122 | − | |
| 1123 | − return 0; | |
| 1124 | −} | |
| 1125 | −DEFINE_SHOW_ATTRIBUTE(i915_panel); | |
| 1126 | − | |
| 1127 | 1099 | static int i915_hdcp_sink_capability_show(struct seq_file *m, void *data) |
| 1128 | 1100 | { |
| 1129 | 1101 | struct intel_connector *connector = m->private; |
| @@ -1402,20 +1374,6 @@ out: drm_modeset_unlock(&i915->drm.mode_config.connection_mutex); · 272 unmodified lines | ||
| 1402 | 1374 | return ret; |
| 1403 | 1375 | } |
| 1404 | 1376 | |
| 1405 | −static int i915_bigjoiner_enable_show(struct seq_file *m, void *data) | |
| 1406 | −{ | |
| 1407 | − struct intel_connector *connector = m->private; | |
| 1408 | − struct drm_crtc *crtc; | |
| 1409 | − | |
| 1410 | − crtc = connector->base.state->crtc; | |
| 1411 | − if (connector->base.status != connector_status_connected || !crtc) | |
| 1412 | − return -ENODEV; | |
| 1413 | − | |
| 1414 | − seq_printf(m, "Bigjoiner enable: %d\n", connector->force_bigjoiner_enable); | |
| 1415 | − | |
| 1416 | − return 0; | |
| 1417 | −} | |
| 1418 | − | |
| 1419 | 1377 | static ssize_t i915_dsc_output_format_write(struct file *file, |
| 1420 | 1378 | const char __user *ubuf, |
| 1421 | 1379 | size_t len, loff_t *offp) |
| @@ -1437,30 +1395,6 @@ static ssize_t i915_dsc_output_format_write(struct file *file, · 15 unmodified lines | ||
| 1437 | 1395 | return len; |
| 1438 | 1396 | } |
| 1439 | 1397 | |
| 1440 | −static ssize_t i915_bigjoiner_enable_write(struct file *file, | |
| 1441 | − const char __user *ubuf, | |
| 1442 | − size_t len, loff_t *offp) | |
| 1443 | −{ | |
| 1444 | − struct seq_file *m = file->private_data; | |
| 1445 | − struct intel_connector *connector = m->private; | |
| 1446 | − struct drm_crtc *crtc; | |
| 1447 | − bool bigjoiner_en = 0; | |
| 1448 | − int ret; | |
| 1449 | − | |
| 1450 | − crtc = connector->base.state->crtc; | |
| 1451 | − if (connector->base.status != connector_status_connected || !crtc) | |
| 1452 | − return -ENODEV; | |
| 1453 | − | |
| 1454 | − ret = kstrtobool_from_user(ubuf, len, &bigjoiner_en); | |
| 1455 | − if (ret < 0) | |
| 1456 | − return ret; | |
| 1457 | − | |
| 1458 | − connector->force_bigjoiner_enable = bigjoiner_en; | |
| 1459 | − *offp += len; | |
| 1460 | − | |
| 1461 | − return len; | |
| 1462 | −} | |
| 1463 | − | |
| 1464 | 1398 | static int i915_dsc_output_format_open(struct inode *inode, |
| 1465 | 1399 | struct file *file) |
| 1466 | 1400 | { |
| @@ -1554,8 +1488,6 @@ static const struct file_operations i915_dsc_fractional_bpp_fops = { · 87 unmodified lines | ||
| 1554 | 1488 | .write = i915_dsc_fractional_bpp_write |
| 1555 | 1489 | }; |
| 1556 | 1490 | |
| 1557 | −DEFINE_SHOW_STORE_ATTRIBUTE(i915_bigjoiner_enable); | |
| 1558 | − | |
| 1559 | 1491 | /* |
| 1560 | 1492 | * Returns the Current CRTC's bpc. |
| 1561 | 1493 | * Example usage: cat /sys/kernel/debug/dri/0/crtc-0/i915_current_bpc |
| @@ -1608,12 +1540,9 @@ void intel_connector_debugfs_add(struct intel_connector *connector) · 46 unmodified lines | ||
| 1608 | 1540 | return; |
| 1609 | 1541 | |
| 1610 | 1542 | intel_drrs_connector_debugfs_add(connector); |
| 1543 | + intel_pps_connector_debugfs_add(connector); | |
| 1611 | 1544 | intel_psr_connector_debugfs_add(connector); |
| 1612 | 1545 | |
| 1613 | − if (connector_type == DRM_MODE_CONNECTOR_eDP) | |
| 1614 | − debugfs_create_file("i915_panel_timings", 0444, root, | |
| 1615 | − connector, &i915_panel_fops); | |
| 1616 | − | |
| 1617 | 1546 | if (connector_type == DRM_MODE_CONNECTOR_DisplayPort || |
| 1618 | 1547 | connector_type == DRM_MODE_CONNECTOR_HDMIA || |
| 1619 | 1548 | connector_type == DRM_MODE_CONNECTOR_HDMIB) { |
| @@ -1640,8 +1569,8 @@ void intel_connector_debugfs_add(struct intel_connector *connector) · 20 unmodified lines | ||
| 1640 | 1569 | if (DISPLAY_VER(i915) >= 11 && |
| 1641 | 1570 | (connector_type == DRM_MODE_CONNECTOR_DisplayPort || |
| 1642 | 1571 | connector_type == DRM_MODE_CONNECTOR_eDP)) { |
| 1643 | − debugfs_create_file("i915_bigjoiner_force_enable", 0644, root, | |
| 1644 | − connector, &i915_bigjoiner_enable_fops); | |
| 1572 | + debugfs_create_bool("i915_bigjoiner_force_enable", 0644, root, | |
| 1573 | + &connector->force_bigjoiner_enable); | |
| 1645 | 1574 | } |
| 1646 | 1575 | |
| 1647 | 1576 | if (connector_type == DRM_MODE_CONNECTOR_DSI || |
| @@ -17,6 +17,9 @@ · 16 unmodified lines | ||
| 17 | 17 | #include "intel_display_reg_defs.h" |
| 18 | 18 | #include "intel_fbc.h" |
| 19 | 19 | |
| 20 | +__diag_push(); | |
| 21 | +__diag_ignore_all("-Woverride-init", "Allow field initialization overrides for display info"); | |
| 22 | + | |
| 20 | 23 | static const struct intel_display_device_info no_display = {}; |
| 21 | 24 | |
| 22 | 25 | #define PIPE_A_OFFSET 0x70000 |
| @@ -768,6 +771,8 @@ static const struct intel_display_device_info xe2_lpd_display = { · 745 unmodified lines | ||
| 768 | 771 | BIT(INTEL_FBC_C) | BIT(INTEL_FBC_D), |
| 769 | 772 | }; |
| 770 | 773 | |
| 774 | +__diag_pop(); | |
| 775 | + | |
| 771 | 776 | /* |
| 772 | 777 | * Separate detection for no display cases to keep the display id array simple. |
| 773 | 778 | * |
| @@ -47,6 +47,7 @@ struct drm_printer; · 46 unmodified lines | ||
| 47 | 47 | #define HAS_DPT(i915) (DISPLAY_VER(i915) >= 13) |
| 48 | 48 | #define HAS_DSB(i915) (DISPLAY_INFO(i915)->has_dsb) |
| 49 | 49 | #define HAS_DSC(__i915) (DISPLAY_RUNTIME_INFO(__i915)->has_dsc) |
| 50 | +#define HAS_DSC_MST(__i915) (DISPLAY_VER(__i915) >= 12 && HAS_DSC(__i915)) | |
| 50 | 51 | #define HAS_FBC(i915) (DISPLAY_RUNTIME_INFO(i915)->fbc_mask != 0) |
| 51 | 52 | #define HAS_FPGA_DBG_UNCLAIMED(i915) (DISPLAY_INFO(i915)->has_fpga_dbg) |
| 52 | 53 | #define HAS_FW_BLC(i915) (DISPLAY_VER(i915) >= 3) |
| @@ -68,6 +69,7 @@ struct drm_printer; · 15 unmodified lines | ||
| 68 | 69 | #define HAS_TRANSCODER(i915, trans) ((DISPLAY_RUNTIME_INFO(i915)->cpu_transcoder_mask & \ |
| 69 | 70 | BIT(trans)) != 0) |
| 70 | 71 | #define HAS_VRR(i915) (DISPLAY_VER(i915) >= 11) |
| 72 | +#define HAS_AS_SDP(i915) (DISPLAY_VER(i915) >= 13) | |
| 71 | 73 | #define INTEL_NUM_PIPES(i915) (hweight8(DISPLAY_RUNTIME_INFO(i915)->pipe_mask)) |
| 72 | 74 | #define I915_HAS_HOTPLUG(i915) (DISPLAY_INFO(i915)->has_hotplug) |
| 73 | 75 | #define OVERLAY_NEEDS_PHYSICAL(i915) (DISPLAY_INFO(i915)->overlay_needs_physical) |
| @@ -198,6 +198,7 @@ void intel_display_driver_early_probe(struct drm_i915_private *i915) · 197 unmodified lines | ||
| 198 | 198 | intel_dpll_init_clock_hook(i915); |
| 199 | 199 | intel_init_display_hooks(i915); |
| 200 | 200 | intel_fdi_init_hook(i915); |
| 201 | + intel_dmc_wl_init(i915); | |
| 201 | 202 | } |
| 202 | 203 | |
| 203 | 204 | /* part #1: call before irq install */ |
| @@ -117,13 +117,14 @@ static void bdw_update_pipe_irq(struct drm_i915_private *dev_priv, · 116 unmodified lines | ||
| 117 | 117 | if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) |
| 118 | 118 | return; |
| 119 | 119 | |
| 120 | − new_val = dev_priv->de_irq_mask[pipe]; | |
| 120 | + new_val = dev_priv->display.irq.de_irq_mask[pipe]; | |
| 121 | 121 | new_val &= ~interrupt_mask; |
| 122 | 122 | new_val |= (~enabled_irq_mask & interrupt_mask); |
| 123 | 123 | |
| 124 | − if (new_val != dev_priv->de_irq_mask[pipe]) { | |
| 125 | − dev_priv->de_irq_mask[pipe] = new_val; | |
| 126 | − intel_uncore_write(&dev_priv->uncore, GEN8_DE_PIPE_IMR(pipe), dev_priv->de_irq_mask[pipe]); | |
| 124 | + if (new_val != dev_priv->display.irq.de_irq_mask[pipe]) { | |
| 125 | + dev_priv->display.irq.de_irq_mask[pipe] = new_val; | |
| 126 | + intel_uncore_write(&dev_priv->uncore, GEN8_DE_PIPE_IMR(pipe), | |
| 127 | + dev_priv->display.irq.de_irq_mask[pipe]); | |
| 127 | 128 | intel_uncore_posting_read(&dev_priv->uncore, GEN8_DE_PIPE_IMR(pipe)); |
| 128 | 129 | } |
| 129 | 130 | } |
| @@ -179,7 +180,7 @@ void ibx_disable_display_interrupt(struct drm_i915_private *i915, u32 bits) · 49 unmodified lines | ||
| 179 | 180 | u32 i915_pipestat_enable_mask(struct drm_i915_private *dev_priv, |
| 180 | 181 | enum pipe pipe) |
| 181 | 182 | { |
| 182 | − u32 status_mask = dev_priv->pipestat_irq_mask[pipe]; | |
| 183 | + u32 status_mask = dev_priv->display.irq.pipestat_irq_mask[pipe]; | |
| 183 | 184 | u32 enable_mask = status_mask << 16; |
| 184 | 185 | |
| 185 | 186 | lockdep_assert_held(&dev_priv->irq_lock); |
| @@ -233,10 +234,10 @@ void i915_enable_pipestat(struct drm_i915_private *dev_priv, · 47 unmodified lines | ||
| 233 | 234 | lockdep_assert_held(&dev_priv->irq_lock); |
| 234 | 235 | drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)); |
| 235 | 236 | |
| 236 | − if ((dev_priv->pipestat_irq_mask[pipe] & status_mask) == status_mask) | |
| 237 | + if ((dev_priv->display.irq.pipestat_irq_mask[pipe] & status_mask) == status_mask) | |
| 237 | 238 | return; |
| 238 | 239 | |
| 239 | − dev_priv->pipestat_irq_mask[pipe] |= status_mask; | |
| 240 | + dev_priv->display.irq.pipestat_irq_mask[pipe] |= status_mask; | |
| 240 | 241 | enable_mask = i915_pipestat_enable_mask(dev_priv, pipe); |
| 241 | 242 | |
| 242 | 243 | intel_uncore_write(&dev_priv->uncore, reg, enable_mask | status_mask); |
| @@ -256,10 +257,10 @@ void i915_disable_pipestat(struct drm_i915_private *dev_priv, · 13 unmodified lines | ||
| 256 | 257 | lockdep_assert_held(&dev_priv->irq_lock); |
| 257 | 258 | drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)); |
| 258 | 259 | |
| 259 | − if ((dev_priv->pipestat_irq_mask[pipe] & status_mask) == 0) | |
| 260 | + if ((dev_priv->display.irq.pipestat_irq_mask[pipe] & status_mask) == 0) | |
| 260 | 261 | return; |
| 261 | 262 | |
| 262 | − dev_priv->pipestat_irq_mask[pipe] &= ~status_mask; | |
| 263 | + dev_priv->display.irq.pipestat_irq_mask[pipe] &= ~status_mask; | |
| 263 | 264 | enable_mask = i915_pipestat_enable_mask(dev_priv, pipe); |
| 264 | 265 | |
| 265 | 266 | intel_uncore_write(&dev_priv->uncore, reg, enable_mask | status_mask); |
| @@ -401,7 +402,7 @@ void i9xx_pipestat_irq_reset(struct drm_i915_private *dev_priv) · 135 unmodified lines | ||
| 401 | 402 | PIPESTAT_INT_STATUS_MASK | |
| 402 | 403 | PIPE_FIFO_UNDERRUN_STATUS); |
| 403 | 404 | |
| 404 | − dev_priv->pipestat_irq_mask[pipe] = 0; | |
| 405 | + dev_priv->display.irq.pipestat_irq_mask[pipe] = 0; | |
| 405 | 406 | } |
| 406 | 407 | } |
| 407 | 408 | |
| @@ -412,7 +413,7 @@ void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv, · 4 unmodified lines | ||
| 412 | 413 | |
| 413 | 414 | spin_lock(&dev_priv->irq_lock); |
| 414 | 415 | |
| 415 | − if (!dev_priv->display_irqs_enabled) { | |
| 416 | + if (!dev_priv->display.irq.display_irqs_enabled) { | |
| 416 | 417 | spin_unlock(&dev_priv->irq_lock); |
| 417 | 418 | return; |
| 418 | 419 | } |
| @@ -445,7 +446,7 @@ void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv, · 26 unmodified lines | ||
| 445 | 446 | break; |
| 446 | 447 | } |
| 447 | 448 | if (iir & iir_bit) |
| 448 | − status_mask |= dev_priv->pipestat_irq_mask[pipe]; | |
| 449 | + status_mask |= dev_priv->display.irq.pipestat_irq_mask[pipe]; | |
| 449 | 450 | |
| 450 | 451 | if (!status_mask) |
| 451 | 452 | continue; |
| @@ -1203,7 +1204,7 @@ int i8xx_enable_vblank(struct drm_crtc *crtc) · 751 unmodified lines | ||
| 1203 | 1204 | |
| 1204 | 1205 | int i915gm_enable_vblank(struct drm_crtc *crtc) |
| 1205 | 1206 | { |
| 1206 | − struct drm_i915_private *dev_priv = to_i915(crtc->dev); | |
| 1207 | + struct drm_i915_private *i915 = to_i915(crtc->dev); | |
| 1207 | 1208 | |
| 1208 | 1209 | /* |
| 1209 | 1210 | * Vblank interrupts fail to wake the device up from C2+. |
| @@ -1211,8 +1212,8 @@ int i915gm_enable_vblank(struct drm_crtc *crtc) · 1 unmodified line | ||
| 1211 | 1212 | * the problem. There is a small power cost so we do this |
| 1212 | 1213 | * only when vblank interrupts are actually enabled. |
| 1213 | 1214 | */ |
| 1214 | − if (dev_priv->vblank_enabled++ == 0) | |
| 1215 | − intel_uncore_write(&dev_priv->uncore, SCPD0, _MASKED_BIT_ENABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE)); | |
| 1215 | + if (i915->display.irq.vblank_enabled++ == 0) | |
| 1216 | + intel_uncore_write(&i915->uncore, SCPD0, _MASKED_BIT_ENABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE)); | |
| 1216 | 1217 | |
| 1217 | 1218 | return i8xx_enable_vblank(crtc); |
| 1218 | 1219 | } |
| @@ -1315,12 +1316,12 @@ void i8xx_disable_vblank(struct drm_crtc *crtc) · 96 unmodified lines | ||
| 1315 | 1316 | |
| 1316 | 1317 | void i915gm_disable_vblank(struct drm_crtc *crtc) |
| 1317 | 1318 | { |
| 1318 | − struct drm_i915_private *dev_priv = to_i915(crtc->dev); | |
| 1319 | + struct drm_i915_private *i915 = to_i915(crtc->dev); | |
| 1319 | 1320 | |
| 1320 | 1321 | i8xx_disable_vblank(crtc); |
| 1321 | 1322 | |
| 1322 | − if (--dev_priv->vblank_enabled == 0) | |
| 1323 | − intel_uncore_write(&dev_priv->uncore, SCPD0, _MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE)); | |
| 1323 | + if (--i915->display.irq.vblank_enabled == 0) | |
| 1324 | + intel_uncore_write(&i915->uncore, SCPD0, _MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE)); | |
| 1324 | 1325 | } |
| 1325 | 1326 | |
| 1326 | 1327 | void i965_disable_vblank(struct drm_crtc *crtc) |
| @@ -1497,8 +1498,8 @@ void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv, · 170 unmodified lines | ||
| 1497 | 1498 | |
| 1498 | 1499 | for_each_pipe_masked(dev_priv, pipe, pipe_mask) |
| 1499 | 1500 | GEN8_IRQ_INIT_NDX(uncore, DE_PIPE, pipe, |
| 1500 | − dev_priv->de_irq_mask[pipe], | |
| 1501 | − ~dev_priv->de_irq_mask[pipe] | extra_ier); | |
| 1501 | + dev_priv->display.irq.de_irq_mask[pipe], | |
| 1502 | + ~dev_priv->display.irq.de_irq_mask[pipe] | extra_ier); | |
| 1502 | 1503 | |
| 1503 | 1504 | spin_unlock_irq(&dev_priv->irq_lock); |
| 1504 | 1505 | } |
| @@ -1558,10 +1559,10 @@ void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv) · 53 unmodified lines | ||
| 1558 | 1559 | { |
| 1559 | 1560 | lockdep_assert_held(&dev_priv->irq_lock); |
| 1560 | 1561 | |
| 1561 | − if (dev_priv->display_irqs_enabled) | |
| 1562 | + if (dev_priv->display.irq.display_irqs_enabled) | |
| 1562 | 1563 | return; |
| 1563 | 1564 | |
| 1564 | − dev_priv->display_irqs_enabled = true; | |
| 1565 | + dev_priv->display.irq.display_irqs_enabled = true; | |
| 1565 | 1566 | |
| 1566 | 1567 | if (intel_irqs_enabled(dev_priv)) { |
| 1567 | 1568 | vlv_display_irq_reset(dev_priv); |
| @@ -1573,10 +1574,10 @@ void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv) · 5 unmodified lines | ||
| 1573 | 1574 | { |
| 1574 | 1575 | lockdep_assert_held(&dev_priv->irq_lock); |
| 1575 | 1576 | |
| 1576 | − if (!dev_priv->display_irqs_enabled) | |
| 1577 | + if (!dev_priv->display.irq.display_irqs_enabled) | |
| 1577 | 1578 | return; |
| 1578 | 1579 | |
| 1579 | − dev_priv->display_irqs_enabled = false; | |
| 1580 | + dev_priv->display.irq.display_irqs_enabled = false; | |
| 1580 | 1581 | |
| 1581 | 1582 | if (intel_irqs_enabled(dev_priv)) |
| 1582 | 1583 | vlv_display_irq_reset(dev_priv); |
| @@ -1694,12 +1695,12 @@ void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) · 111 unmodified lines | ||
| 1694 | 1695 | } |
| 1695 | 1696 | |
| 1696 | 1697 | for_each_pipe(dev_priv, pipe) { |
| 1697 | − dev_priv->de_irq_mask[pipe] = ~de_pipe_masked; | |
| 1698 | + dev_priv->display.irq.de_irq_mask[pipe] = ~de_pipe_masked; | |
| 1698 | 1699 | |
| 1699 | 1700 | if (intel_display_power_is_enabled(dev_priv, |
| 1700 | 1701 | POWER_DOMAIN_PIPE(pipe))) |
| 1701 | 1702 | GEN8_IRQ_INIT_NDX(uncore, DE_PIPE, pipe, |
| 1702 | − dev_priv->de_irq_mask[pipe], | |
| 1703 | + dev_priv->display.irq.de_irq_mask[pipe], | |
| 1703 | 1704 | de_pipe_enables); |
| 1704 | 1705 | } |
| 1705 | 1706 | |
| @@ -1770,9 +1771,9 @@ void intel_display_irq_init(struct drm_i915_private *i915) · 64 unmodified lines | ||
| 1770 | 1771 | * domain. We defer setting up the display irqs in this case to the |
| 1771 | 1772 | * runtime pm. |
| 1772 | 1773 | */ |
| 1773 | − i915->display_irqs_enabled = true; | |
| 1774 | + i915->display.irq.display_irqs_enabled = true; | |
| 1774 | 1775 | if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) |
| 1775 | − i915->display_irqs_enabled = false; | |
| 1776 | + i915->display.irq.display_irqs_enabled = false; | |
| 1776 | 1777 | |
| 1777 | 1778 | intel_hotplug_irq_init(i915); |
| 1778 | 1779 | } |
| @@ -116,6 +116,11 @@ intel_display_param_named_unsafe(enable_psr2_sel_fetch, bool, 0400, · 115 unmodified lines | ||
| 116 | 116 | "(0=disabled, 1=enabled) " |
| 117 | 117 | "Default: 1"); |
| 118 | 118 | |
| 119 | +intel_display_param_named_unsafe(enable_dmc_wl, bool, 0400, | |
| 120 | + "Enable DMC wakelock " | |
| 121 | + "(0=disabled, 1=enabled) " | |
| 122 | + "Default: 0"); | |
| 123 | + | |
| 119 | 124 | __maybe_unused |
| 120 | 125 | static void _param_print_bool(struct drm_printer *p, const char *driver_name, |
| 121 | 126 | const char *name, bool val) |
| @@ -46,6 +46,7 @@ struct drm_i915_private; · 45 unmodified lines | ||
| 46 | 46 | param(int, enable_psr, -1, 0600) \ |
| 47 | 47 | param(bool, psr_safest_params, false, 0400) \ |
| 48 | 48 | param(bool, enable_psr2_sel_fetch, true, 0400) \ |
| 49 | + param(bool, enable_dmc_wl, false, 0400) \ | |
| 49 | 50 | |
| 50 | 51 | #define MEMBER(T, member, ...) T member; |
| 51 | 52 | struct intel_display_params { |
| @@ -17,6 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | #include "intel_dkl_phy.h" |
| 18 | 18 | #include "intel_dkl_phy_regs.h" |
| 19 | 19 | #include "intel_dmc.h" |
| 20 | +#include "intel_dmc_wl.h" | |
| 20 | 21 | #include "intel_dp_aux_regs.h" |
| 21 | 22 | #include "intel_dpio_phy.h" |
| 22 | 23 | #include "intel_dpll.h" |
| @@ -199,6 +200,9 @@ static void hsw_power_well_pre_disable(struct drm_i915_private *dev_priv, · 176 unmodified lines | ||
| 199 | 200 | gen8_irq_power_well_pre_disable(dev_priv, irq_pipe_mask); |
| 200 | 201 | } |
| 201 | 202 | |
| 203 | +#define ICL_AUX_PW_TO_PHY(pw_idx) \ | |
| 204 | + ((pw_idx) - ICL_PW_CTL_IDX_AUX_A + PHY_A) | |
| 205 | + | |
| 202 | 206 | #define ICL_AUX_PW_TO_CH(pw_idx) \ |
| 203 | 207 | ((pw_idx) - ICL_PW_CTL_IDX_AUX_A + AUX_CH_A) |
| 204 | 208 | |
| @@ -217,27 +221,22 @@ static struct intel_digital_port * · 12 unmodified lines | ||
| 217 | 221 | aux_ch_to_digital_port(struct drm_i915_private *dev_priv, |
| 218 | 222 | enum aux_ch aux_ch) |
| 219 | 223 | { |
| 220 | − struct intel_digital_port *dig_port = NULL; | |
| 221 | 224 | struct intel_encoder *encoder; |
| 222 | 225 | |
| 223 | 226 | for_each_intel_encoder(&dev_priv->drm, encoder) { |
| 227 | + struct intel_digital_port *dig_port; | |
| 228 | + | |
| 224 | 229 | /* We'll check the MST primary port */ |
| 225 | 230 | if (encoder->type == INTEL_OUTPUT_DP_MST) |
| 226 | 231 | continue; |
| 227 | 232 | |
| 228 | 233 | dig_port = enc_to_dig_port(encoder); |
| 229 | − if (!dig_port) | |
| 230 | − continue; | |
| 231 | − | |
| 232 | − if (dig_port->aux_ch != aux_ch) { | |
| 233 | − dig_port = NULL; | |
| 234 | − continue; | |
| 235 | − } | |
| 236 | 234 | |
| 237 | − break; | |
| 235 | + if (dig_port && dig_port->aux_ch == aux_ch) | |
| 236 | + return dig_port; | |
| 238 | 237 | } |
| 239 | 238 | |
| 240 | − return dig_port; | |
| 239 | + return NULL; | |
| 241 | 240 | } |
| 242 | 241 | |
| 243 | 242 | static enum phy icl_aux_pw_to_phy(struct drm_i915_private *i915, |
| @@ -253,7 +252,7 @@ static enum phy icl_aux_pw_to_phy(struct drm_i915_private *i915, · 9 unmodified lines | ||
| 253 | 252 | * as HDMI-only and routed to a combo PHY, the encoder either won't be |
| 254 | 253 | * present at all or it will not have an aux_ch assigned. |
| 255 | 254 | */ |
| 256 | − return dig_port ? intel_port_to_phy(i915, dig_port->base.port) : PHY_NONE; | |
| 255 | + return dig_port ? intel_encoder_to_phy(&dig_port->base) : PHY_NONE; | |
| 257 | 256 | } |
| 258 | 257 | |
| 259 | 258 | static void hsw_wait_for_power_well_enable(struct drm_i915_private *dev_priv, |
| @@ -396,17 +395,11 @@ static void hsw_power_well_disable(struct drm_i915_private *dev_priv, · 136 unmodified lines | ||
| 396 | 395 | hsw_wait_for_power_well_disable(dev_priv, power_well); |
| 397 | 396 | } |
| 398 | 397 | |
| 399 | −static bool intel_port_is_edp(struct drm_i915_private *i915, enum port port) | |
| 398 | +static bool intel_aux_ch_is_edp(struct drm_i915_private *i915, enum aux_ch aux_ch) | |
| 400 | 399 | { |
| 401 | − struct intel_encoder *encoder; | |
| 402 | − | |
| 403 | − for_each_intel_encoder(&i915->drm, encoder) { | |
| 404 | − if (encoder->type == INTEL_OUTPUT_EDP && | |
| 405 | − encoder->port == port) | |
| 406 | − return true; | |
| 407 | − } | |
| 400 | + struct intel_digital_port *dig_port = aux_ch_to_digital_port(i915, aux_ch); | |
| 408 | 401 | |
| 409 | − return false; | |
| 402 | + return dig_port && dig_port->base.type == INTEL_OUTPUT_EDP; | |
| 410 | 403 | } |
| 411 | 404 | |
| 412 | 405 | static void |
| @@ -415,24 +408,25 @@ icl_combo_phy_aux_power_well_enable(struct drm_i915_private *dev_priv, · 2 unmodified lines | ||
| 415 | 408 | { |
| 416 | 409 | const struct i915_power_well_regs *regs = power_well->desc->ops->regs; |
| 417 | 410 | int pw_idx = i915_power_well_instance(power_well)->hsw.idx; |
| 418 | − enum phy phy = icl_aux_pw_to_phy(dev_priv, power_well); | |
| 419 | 411 | |
| 420 | 412 | drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv)); |
| 421 | 413 | |
| 422 | 414 | intel_de_rmw(dev_priv, regs->driver, 0, HSW_PWR_WELL_CTL_REQ(pw_idx)); |
| 423 | 415 | |
| 424 | − /* FIXME this is a mess */ | |
| 425 | − if (phy != PHY_NONE) | |
| 426 | − intel_de_rmw(dev_priv, ICL_PORT_CL_DW12(phy), | |
| 427 | − 0, ICL_LANE_ENABLE_AUX); | |
| 416 | + /* | |
| 417 | + * FIXME not sure if we should derive the PHY from the pw_idx, or | |
| 418 | + * from the VBT defined AUX_CH->DDI->PHY mapping. | |
| 419 | + */ | |
| 420 | + intel_de_rmw(dev_priv, ICL_PORT_CL_DW12(ICL_AUX_PW_TO_PHY(pw_idx)), | |
| 421 | + 0, ICL_LANE_ENABLE_AUX); | |
| 428 | 422 | |
| 429 | 423 | hsw_wait_for_power_well_enable(dev_priv, power_well, false); |
| 430 | 424 | |
| 431 | 425 | /* Display WA #1178: icl */ |
| 432 | 426 | if (pw_idx >= ICL_PW_CTL_IDX_AUX_A && pw_idx <= ICL_PW_CTL_IDX_AUX_B && |
| 433 | − !intel_port_is_edp(dev_priv, (enum port)phy)) | |
| 434 | − intel_de_rmw(dev_priv, ICL_AUX_ANAOVRD1(pw_idx), | |
| 435 | − 0, ICL_AUX_ANAOVRD1_ENABLE | ICL_AUX_ANAOVRD1_LDO_BYPASS); | |
| 427 | + !intel_aux_ch_is_edp(dev_priv, ICL_AUX_PW_TO_CH(pw_idx))) | |
| 428 | + intel_de_rmw(dev_priv, ICL_PORT_TX_DW6_AUX(ICL_AUX_PW_TO_PHY(pw_idx)), | |
| 429 | + 0, O_FUNC_OVRD_EN | O_LDO_BYPASS_CRI); | |
| 436 | 430 | } |
| 437 | 431 | |
| 438 | 432 | static void |
| @@ -441,14 +435,15 @@ icl_combo_phy_aux_power_well_disable(struct drm_i915_private *dev_priv, · 2 unmodified lines | ||
| 441 | 435 | { |
| 442 | 436 | const struct i915_power_well_regs *regs = power_well->desc->ops->regs; |
| 443 | 437 | int pw_idx = i915_power_well_instance(power_well)->hsw.idx; |
| 444 | − enum phy phy = icl_aux_pw_to_phy(dev_priv, power_well); | |
| 445 | 438 | |
| 446 | 439 | drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv)); |
| 447 | 440 | |
| 448 | − /* FIXME this is a mess */ | |
| 449 | − if (phy != PHY_NONE) | |
| 450 | − intel_de_rmw(dev_priv, ICL_PORT_CL_DW12(phy), | |
| 451 | − ICL_LANE_ENABLE_AUX, 0); | |
| 441 | + /* | |
| 442 | + * FIXME not sure if we should derive the PHY from the pw_idx, or | |
| 443 | + * from the VBT defined AUX_CH->DDI->PHY mapping. | |
| 444 | + */ | |
| 445 | + intel_de_rmw(dev_priv, ICL_PORT_CL_DW12(ICL_AUX_PW_TO_PHY(pw_idx)), | |
| 446 | + ICL_LANE_ENABLE_AUX, 0); | |
| 452 | 447 | |
| 453 | 448 | intel_de_rmw(dev_priv, regs->driver, HSW_PWR_WELL_CTL_REQ(pw_idx), 0); |
| 454 | 449 | |
| @@ -827,6 +822,8 @@ void gen9_enable_dc5(struct drm_i915_private *dev_priv) · 372 unmodified lines | ||
| 827 | 822 | intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, |
| 828 | 823 | 0, SKL_SELECT_ALTERNATE_DC_EXIT); |
| 829 | 824 | |
| 825 | + intel_dmc_wl_enable(dev_priv); | |
| 826 | + | |
| 830 | 827 | gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC5); |
| 831 | 828 | } |
| 832 | 829 | |
| @@ -856,6 +853,8 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv) · 23 unmodified lines | ||
| 856 | 853 | intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, |
| 857 | 854 | 0, SKL_SELECT_ALTERNATE_DC_EXIT); |
| 858 | 855 | |
| 856 | + intel_dmc_wl_enable(dev_priv); | |
| 857 | + | |
| 859 | 858 | gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); |
| 860 | 859 | } |
| 861 | 860 | |
| @@ -976,10 +975,12 @@ void gen9_disable_dc_states(struct drm_i915_private *dev_priv) · 114 unmodified lines | ||
| 976 | 975 | if (!HAS_DISPLAY(dev_priv)) |
| 977 | 976 | return; |
| 978 | 977 | |
| 978 | + intel_dmc_wl_disable(dev_priv); | |
| 979 | + | |
| 979 | 980 | intel_cdclk_get_cdclk(dev_priv, &cdclk_config); |
| 980 | 981 | /* Can't read out voltage_level so can't use intel_cdclk_changed() */ |
| 981 | 982 | drm_WARN_ON(&dev_priv->drm, |
| 982 | − intel_cdclk_needs_modeset(&dev_priv->display.cdclk.hw, | |
| 983 | + intel_cdclk_clock_changed(&dev_priv->display.cdclk.hw, | |
| 983 | 984 | &cdclk_config)); |
| 984 | 985 | |
| 985 | 986 | gen9_assert_dbuf_enabled(dev_priv); |
| @@ -1396,8 +1397,8 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv) · 410 unmodified lines | ||
| 1396 | 1397 | * The PHY may be busy with some initial calibration and whatnot, |
| 1397 | 1398 | * so the power state can take a while to actually change. |
| 1398 | 1399 | */ |
| 1399 | − if (intel_de_wait_for_register(dev_priv, DISPLAY_PHY_STATUS, | |
| 1400 | − phy_status_mask, phy_status, 10)) | |
| 1400 | + if (intel_de_wait(dev_priv, DISPLAY_PHY_STATUS, | |
| 1401 | + phy_status_mask, phy_status, 10)) | |
| 1401 | 1402 | drm_err(&dev_priv->drm, |
| 1402 | 1403 | "Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n", |
| 1403 | 1404 | intel_de_read(dev_priv, DISPLAY_PHY_STATUS) & phy_status_mask, |
| @@ -661,7 +661,8 @@ struct intel_digital_connector_state { · 660 unmodified lines | ||
| 661 | 661 | int broadcast_rgb; |
| 662 | 662 | }; |
| 663 | 663 | |
| 664 | −#define to_intel_digital_connector_state(x) container_of(x, struct intel_digital_connector_state, base) | |
| 664 | +#define to_intel_digital_connector_state(conn_state) \ | |
| 665 | + container_of_const((conn_state), struct intel_digital_connector_state, base) | |
| 665 | 666 | |
| 666 | 667 | struct dpll { |
| 667 | 668 | /* given values */ |
| @@ -1346,6 +1347,7 @@ struct intel_crtc_state { · 678 unmodified lines | ||
| 1346 | 1347 | union hdmi_infoframe hdmi; |
| 1347 | 1348 | union hdmi_infoframe drm; |
| 1348 | 1349 | struct drm_dp_vsc_sdp vsc; |
| 1350 | + struct drm_dp_as_sdp as_sdp; | |
| 1349 | 1351 | } infoframes; |
| 1350 | 1352 | |
| 1351 | 1353 | u8 eld[MAX_ELD_BYTES]; |
| @@ -1423,6 +1425,8 @@ struct intel_crtc_state { · 71 unmodified lines | ||
| 1423 | 1425 | |
| 1424 | 1426 | u32 psr2_man_track_ctl; |
| 1425 | 1427 | |
| 1428 | + u32 pipe_srcsz_early_tpt; | |
| 1429 | + | |
| 1426 | 1430 | struct drm_rect psr2_su_area; |
| 1427 | 1431 | |
| 1428 | 1432 | /* Variable Refresh Rate state */ |
| @@ -1430,6 +1434,7 @@ struct intel_crtc_state { · 1 unmodified line | ||
| 1430 | 1434 | bool enable, in_range; |
| 1431 | 1435 | u8 pipeline_full; |
| 1432 | 1436 | u16 flipline, vmin, vmax, guardband; |
| 1437 | + u32 vsync_end, vsync_start; | |
| 1433 | 1438 | } vrr; |
| 1434 | 1439 | |
| 1435 | 1440 | /* Stream Splitter for eDP MSO */ |
| @@ -1618,12 +1623,17 @@ struct intel_watermark_params { · 182 unmodified lines | ||
| 1618 | 1623 | |
| 1619 | 1624 | #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base) |
| 1620 | 1625 | #define to_intel_crtc(x) container_of(x, struct intel_crtc, base) |
| 1621 | −#define to_intel_crtc_state(x) container_of(x, struct intel_crtc_state, uapi) | |
| 1622 | 1626 | #define to_intel_connector(x) container_of(x, struct intel_connector, base) |
| 1623 | 1627 | #define to_intel_encoder(x) container_of(x, struct intel_encoder, base) |
| 1624 | −#define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base) | |
| 1625 | 1628 | #define to_intel_plane(x) container_of(x, struct intel_plane, base) |
| 1626 | −#define to_intel_plane_state(x) container_of(x, struct intel_plane_state, uapi) | |
| 1629 | + | |
| 1630 | +#define to_intel_crtc_state(crtc_state) \ | |
| 1631 | + container_of_const((crtc_state), struct intel_crtc_state, uapi) | |
| 1632 | +#define to_intel_plane_state(plane_state) \ | |
| 1633 | + container_of_const((plane_state), struct intel_plane_state, uapi) | |
| 1634 | +#define to_intel_framebuffer(fb) \ | |
| 1635 | + container_of_const((fb), struct intel_framebuffer, base) | |
| 1636 | + | |
| 1627 | 1637 | #define intel_fb_obj(x) ((x) ? to_intel_bo((x)->obj[0]) : NULL) |
| 1628 | 1638 | |
| 1629 | 1639 | struct intel_hdmi { |
| @@ -1738,6 +1748,8 @@ struct intel_psr { · 108 unmodified lines | ||
| 1738 | 1748 | |
| 1739 | 1749 | /* LNL and beyond */ |
| 1740 | 1750 | u8 check_entry_lines; |
| 1751 | + u8 silence_period_sym_clocks; | |
| 1752 | + u8 lfps_half_cycle_num_of_syms; | |
| 1741 | 1753 | } alpm_parameters; |
| 1742 | 1754 | |
| 1743 | 1755 | ktime_t last_entry_attempt; |
| @@ -1799,6 +1811,7 @@ struct intel_dp { · 55 unmodified lines | ||
| 1799 | 1811 | |
| 1800 | 1812 | bool is_mst; |
| 1801 | 1813 | int active_mst_links; |
| 1814 | + enum drm_dp_mst_mode mst_detect; | |
| 1802 | 1815 | |
| 1803 | 1816 | /* connector directly attached - won't be use for modeset in mst world */ |
| 1804 | 1817 | struct intel_connector *attached_connector; |
| @@ -10,20 +10,12 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | static void gen11_display_wa_apply(struct drm_i915_private *i915) |
| 12 | 12 | { |
| 13 | − /* Wa_1409120013 */ | |
| 14 | − intel_de_write(i915, ILK_DPFC_CHICKEN(INTEL_FBC_A), | |
| 15 | − DPFC_CHICKEN_COMP_DUMMY_PIXEL); | |
| 16 | − | |
| 17 | 13 | /* Wa_14010594013 */ |
| 18 | 14 | intel_de_rmw(i915, GEN8_CHICKEN_DCPR_1, 0, ICL_DELAY_PMRSP); |
| 19 | 15 | } |
| 20 | 16 | |
| 21 | 17 | static void xe_d_display_wa_apply(struct drm_i915_private *i915) |
| 22 | 18 | { |
| 23 | − /* Wa_1409120013 */ | |
| 24 | − intel_de_write(i915, ILK_DPFC_CHICKEN(INTEL_FBC_A), | |
| 25 | − DPFC_CHICKEN_COMP_DUMMY_PIXEL); | |
| 26 | − | |
| 27 | 19 | /* Wa_14013723622 */ |
| 28 | 20 | intel_de_rmw(i915, CLKREQ_POLICY, CLKREQ_POLICY_MEM_UP_OVRD, 0); |
| 29 | 21 | } |
| @@ -38,6 +38,8 @@ · 37 unmodified lines | ||
| 38 | 38 | * low-power state and comes back to normal. |
| 39 | 39 | */ |
| 40 | 40 | |
| 41 | +#define INTEL_DMC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" | |
| 42 | + | |
| 41 | 43 | enum intel_dmc_id { |
| 42 | 44 | DMC_FW_MAIN = 0, |
| 43 | 45 | DMC_FW_PIPEA, |
| @@ -89,10 +91,14 @@ static struct intel_dmc *i915_to_dmc(struct drm_i915_private *i915) · 45 unmodified lines | ||
| 89 | 91 | __stringify(major) "_" \ |
| 90 | 92 | __stringify(minor) ".bin" |
| 91 | 93 | |
| 94 | +#define XE2LPD_DMC_MAX_FW_SIZE 0x8000 | |
| 92 | 95 | #define XELPDP_DMC_MAX_FW_SIZE 0x7000 |
| 93 | 96 | #define DISPLAY_VER13_DMC_MAX_FW_SIZE 0x20000 |
| 94 | 97 | #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE |
| 95 | 98 | |
| 99 | +#define XE2LPD_DMC_PATH DMC_PATH(xe2lpd) | |
| 100 | +MODULE_FIRMWARE(XE2LPD_DMC_PATH); | |
| 101 | + | |
| 96 | 102 | #define MTL_DMC_PATH DMC_PATH(mtl) |
| 97 | 103 | MODULE_FIRMWARE(MTL_DMC_PATH); |
| 98 | 104 | |
| @@ -546,6 +552,8 @@ void intel_dmc_disable_program(struct drm_i915_private *i915) · 447 unmodified lines | ||
| 546 | 552 | pipedmc_clock_gating_wa(i915, true); |
| 547 | 553 | disable_all_event_handlers(i915); |
| 548 | 554 | pipedmc_clock_gating_wa(i915, false); |
| 555 | + | |
| 556 | + intel_dmc_wl_disable(i915); | |
| 549 | 557 | } |
| 550 | 558 | |
| 551 | 559 | void assert_dmc_loaded(struct drm_i915_private *i915) |
| @@ -949,7 +957,7 @@ static void dmc_load_work_fn(struct work_struct *work) · 397 unmodified lines | ||
| 949 | 957 | " Disabling runtime power management.\n", |
| 950 | 958 | dmc->fw_path); |
| 951 | 959 | drm_notice(&i915->drm, "DMC firmware homepage: %s", |
| 952 | − INTEL_UC_FIRMWARE_URL); | |
| 960 | + INTEL_DMC_FIRMWARE_URL); | |
| 953 | 961 | } |
| 954 | 962 | |
| 955 | 963 | release_firmware(fw); |
| @@ -987,7 +995,10 @@ void intel_dmc_init(struct drm_i915_private *i915) · 31 unmodified lines | ||
| 987 | 995 | |
| 988 | 996 | INIT_WORK(&dmc->work, dmc_load_work_fn); |
| 989 | 997 | |
| 990 | − if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { | |
| 998 | + if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) { | |
| 999 | + dmc->fw_path = XE2LPD_DMC_PATH; | |
| 1000 | + dmc->max_fw_size = XE2LPD_DMC_MAX_FW_SIZE; | |
| 1001 | + } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { | |
| 991 | 1002 | dmc->fw_path = MTL_DMC_PATH; |
| 992 | 1003 | dmc->max_fw_size = XELPDP_DMC_MAX_FW_SIZE; |
| 993 | 1004 | } else if (IS_DG2(i915)) { |
| @@ -1072,6 +1083,8 @@ void intel_dmc_suspend(struct drm_i915_private *i915) · 78 unmodified lines | ||
| 1072 | 1083 | if (dmc) |
| 1073 | 1084 | flush_work(&dmc->work); |
| 1074 | 1085 | |
| 1086 | + intel_dmc_wl_disable(i915); | |
| 1087 | + | |
| 1075 | 1088 | /* Drop the reference held in case DMC isn't loaded. */ |
| 1076 | 1089 | if (!intel_dmc_has_payload(i915)) |
| 1077 | 1090 | intel_dmc_runtime_pm_put(i915); |
| @@ -97,4 +97,10 @@ · 96 unmodified lines | ||
| 97 | 97 | #define TGL_DMC_DEBUG3 _MMIO(0x101090) |
| 98 | 98 | #define DG1_DMC_DEBUG3 _MMIO(0x13415c) |
| 99 | 99 | |
| 100 | +#define DMC_WAKELOCK_CFG _MMIO(0x8F1B0) | |
| 101 | +#define DMC_WAKELOCK_CFG_ENABLE REG_BIT(31) | |
| 102 | +#define DMC_WAKELOCK1_CTL _MMIO(0x8F140) | |
| 103 | +#define DMC_WAKELOCK_CTL_REQ REG_BIT(31) | |
| 104 | +#define DMC_WAKELOCK_CTL_ACK REG_BIT(15) | |
| 105 | + | |
| 100 | 106 | #endif /* __INTEL_DMC_REGS_H__ */ |
| @@ -0,0 +1,262 @@ | ||
| 1 | +// SPDX-License-Identifier: MIT | |
| 2 | +/* | |
| 3 | + * Copyright (C) 2024 Intel Corporation | |
| 4 | + */ | |
| 5 | + | |
| 6 | +#include <linux/kernel.h> | |
| 7 | + | |
| 8 | +#include "intel_de.h" | |
| 9 | +#include "intel_dmc.h" | |
| 10 | +#include "intel_dmc_regs.h" | |
| 11 | +#include "intel_dmc_wl.h" | |
| 12 | + | |
| 13 | +/** | |
| 14 | + * DOC: DMC wakelock support | |
| 15 | + * | |
| 16 | + * Wake lock is the mechanism to cause display engine to exit DC | |
| 17 | + * states to allow programming to registers that are powered down in | |
| 18 | + * those states. Previous projects exited DC states automatically when | |
| 19 | + * detecting programming. Now software controls the exit by | |
| 20 | + * programming the wake lock. This improves system performance and | |
| 21 | + * system interactions and better fits the flip queue style of | |
| 22 | + * programming. Wake lock is only required when DC5, DC6, or DC6v have | |
| 23 | + * been enabled in DC_STATE_EN and the wake lock mode of operation has | |
| 24 | + * been enabled. | |
| 25 | + * | |
| 26 | + * The wakelock mechanism in DMC allows the display engine to exit DC | |
| 27 | + * states explicitly before programming registers that may be powered | |
| 28 | + * down. In earlier hardware, this was done automatically and | |
| 29 | + * implicitly when the display engine accessed a register. With the | |
| 30 | + * wakelock implementation, the driver asserts a wakelock in DMC, | |
| 31 | + * which forces it to exit the DC state until the wakelock is | |
| 32 | + * deasserted. | |
| 33 | + * | |
| 34 | + * The mechanism can be enabled and disabled by writing to the | |
| 35 | + * DMC_WAKELOCK_CFG register. There are also 13 control registers | |
| 36 | + * that can be used to hold and release different wakelocks. In the | |
| 37 | + * current implementation, we only need one wakelock, so only | |
| 38 | + * DMC_WAKELOCK1_CTL is used. The other definitions are here for | |
| 39 | + * potential future use. | |
| 40 | + */ | |
| 41 | + | |
| 42 | +#define DMC_WAKELOCK_CTL_TIMEOUT 5 | |
| 43 | +#define DMC_WAKELOCK_HOLD_TIME 50 | |
| 44 | + | |
| 45 | +struct intel_dmc_wl_range { | |
| 46 | + u32 start; | |
| 47 | + u32 end; | |
| 48 | +}; | |
| 49 | + | |
| 50 | +static struct intel_dmc_wl_range lnl_wl_range[] = { | |
| 51 | + { .start = 0x60000, .end = 0x7ffff }, | |
| 52 | +}; | |
| 53 | + | |
| 54 | +static void __intel_dmc_wl_release(struct drm_i915_private *i915) | |
| 55 | +{ | |
| 56 | + struct intel_dmc_wl *wl = &i915->display.wl; | |
| 57 | + | |
| 58 | + WARN_ON(refcount_read(&wl->refcount)); | |
| 59 | + | |
| 60 | + queue_delayed_work(i915->unordered_wq, &wl->work, | |
| 61 | + msecs_to_jiffies(DMC_WAKELOCK_HOLD_TIME)); | |
| 62 | +} | |
| 63 | + | |
| 64 | +static void intel_dmc_wl_work(struct work_struct *work) | |
| 65 | +{ | |
| 66 | + struct intel_dmc_wl *wl = | |
| 67 | + container_of(work, struct intel_dmc_wl, work.work); | |
| 68 | + struct drm_i915_private *i915 = | |
| 69 | + container_of(wl, struct drm_i915_private, display.wl); | |
| 70 | + unsigned long flags; | |
| 71 | + | |
| 72 | + spin_lock_irqsave(&wl->lock, flags); | |
| 73 | + | |
| 74 | + /* Bail out if refcount reached zero while waiting for the spinlock */ | |
| 75 | + if (!refcount_read(&wl->refcount)) | |
| 76 | + goto out_unlock; | |
| 77 | + | |
| 78 | + __intel_de_rmw_nowl(i915, DMC_WAKELOCK1_CTL, DMC_WAKELOCK_CTL_REQ, 0); | |
| 79 | + | |
| 80 | + if (__intel_wait_for_register_nowl(i915, DMC_WAKELOCK1_CTL, | |
| 81 | + DMC_WAKELOCK_CTL_ACK, 0, | |
| 82 | + DMC_WAKELOCK_CTL_TIMEOUT)) { | |
| 83 | + WARN_RATELIMIT(1, "DMC wakelock release timed out"); | |
| 84 | + goto out_unlock; | |
| 85 | + } | |
| 86 | + | |
| 87 | + wl->taken = false; | |
| 88 | + | |
| 89 | +out_unlock: | |
| 90 | + spin_unlock_irqrestore(&wl->lock, flags); | |
| 91 | +} | |
| 92 | + | |
| 93 | +static bool intel_dmc_wl_check_range(u32 address) | |
| 94 | +{ | |
| 95 | + int i; | |
| 96 | + bool wl_needed = false; | |
| 97 | + | |
| 98 | + for (i = 0; i < ARRAY_SIZE(lnl_wl_range); i++) { | |
| 99 | + if (address >= lnl_wl_range[i].start && | |
| 100 | + address <= lnl_wl_range[i].end) { | |
| 101 | + wl_needed = true; | |
| 102 | + break; | |
| 103 | + } | |
| 104 | + } | |
| 105 | + | |
| 106 | + return wl_needed; | |
| 107 | +} | |
| 108 | + | |
| 109 | +static bool __intel_dmc_wl_supported(struct drm_i915_private *i915) | |
| 110 | +{ | |
| 111 | + if (DISPLAY_VER(i915) < 20 || | |
| 112 | + !intel_dmc_has_payload(i915) || | |
| 113 | + !i915->display.params.enable_dmc_wl) | |
| 114 | + return false; | |
| 115 | + | |
| 116 | + return true; | |
| 117 | +} | |
| 118 | + | |
| 119 | +void intel_dmc_wl_init(struct drm_i915_private *i915) | |
| 120 | +{ | |
| 121 | + struct intel_dmc_wl *wl = &i915->display.wl; | |
| 122 | + | |
| 123 | + /* don't call __intel_dmc_wl_supported(), DMC is not loaded yet */ | |
| 124 | + if (DISPLAY_VER(i915) < 20 || | |
| 125 | + !i915->display.params.enable_dmc_wl) | |
| 126 | + return; | |
| 127 | + | |
| 128 | + INIT_DELAYED_WORK(&wl->work, intel_dmc_wl_work); | |
| 129 | + spin_lock_init(&wl->lock); | |
| 130 | + refcount_set(&wl->refcount, 0); | |
| 131 | +} | |
| 132 | + | |
| 133 | +void intel_dmc_wl_enable(struct drm_i915_private *i915) | |
| 134 | +{ | |
| 135 | + struct intel_dmc_wl *wl = &i915->display.wl; | |
| 136 | + unsigned long flags; | |
| 137 | + | |
| 138 | + if (!__intel_dmc_wl_supported(i915)) | |
| 139 | + return; | |
| 140 | + | |
| 141 | + spin_lock_irqsave(&wl->lock, flags); | |
| 142 | + | |
| 143 | + if (wl->enabled) | |
| 144 | + goto out_unlock; | |
| 145 | + | |
| 146 | + /* | |
| 147 | + * Enable wakelock in DMC. We shouldn't try to take the | |
| 148 | + * wakelock, because we're just enabling it, so call the | |
| 149 | + * non-locking version directly here. | |
| 150 | + */ | |
| 151 | + __intel_de_rmw_nowl(i915, DMC_WAKELOCK_CFG, 0, DMC_WAKELOCK_CFG_ENABLE); | |
| 152 | + | |
| 153 | + wl->enabled = true; | |
| 154 | + wl->taken = false; | |
| 155 | + | |
| 156 | +out_unlock: | |
| 157 | + spin_unlock_irqrestore(&wl->lock, flags); | |
| 158 | +} | |
| 159 | + | |
| 160 | +void intel_dmc_wl_disable(struct drm_i915_private *i915) | |
| 161 | +{ | |
| 162 | + struct intel_dmc_wl *wl = &i915->display.wl; | |
| 163 | + unsigned long flags; | |
| 164 | + | |
| 165 | + if (!__intel_dmc_wl_supported(i915)) | |
| 166 | + return; | |
| 167 | + | |
| 168 | + flush_delayed_work(&wl->work); | |
| 169 | + | |
| 170 | + spin_lock_irqsave(&wl->lock, flags); | |
| 171 | + | |
| 172 | + if (!wl->enabled) | |
| 173 | + goto out_unlock; | |
| 174 | + | |
| 175 | + /* Disable wakelock in DMC */ | |
| 176 | + __intel_de_rmw_nowl(i915, DMC_WAKELOCK_CFG, DMC_WAKELOCK_CFG_ENABLE, 0); | |
| 177 | + | |
| 178 | + refcount_set(&wl->refcount, 0); | |
| 179 | + wl->enabled = false; | |
| 180 | + wl->taken = false; | |
| 181 | + | |
| 182 | +out_unlock: | |
| 183 | + spin_unlock_irqrestore(&wl->lock, flags); | |
| 184 | +} | |
| 185 | + | |
| 186 | +void intel_dmc_wl_get(struct drm_i915_private *i915, i915_reg_t reg) | |
| 187 | +{ | |
| 188 | + struct intel_dmc_wl *wl = &i915->display.wl; | |
| 189 | + unsigned long flags; | |
| 190 | + | |
| 191 | + if (!__intel_dmc_wl_supported(i915)) | |
| 192 | + return; | |
| 193 | + | |
| 194 | + if (!intel_dmc_wl_check_range(reg.reg)) | |
| 195 | + return; | |
| 196 | + | |
| 197 | + spin_lock_irqsave(&wl->lock, flags); | |
| 198 | + | |
| 199 | + if (!wl->enabled) | |
| 200 | + goto out_unlock; | |
| 201 | + | |
| 202 | + cancel_delayed_work(&wl->work); | |
| 203 | + | |
| 204 | + if (refcount_inc_not_zero(&wl->refcount)) | |
| 205 | + goto out_unlock; | |
| 206 | + | |
| 207 | + refcount_set(&wl->refcount, 1); | |
| 208 | + | |
| 209 | + /* | |
| 210 | + * Only try to take the wakelock if it's not marked as taken | |
| 211 | + * yet. It may be already taken at this point if we have | |
| 212 | + * already released the last reference, but the work has not | |
| 213 | + * run yet. | |
| 214 | + */ | |
| 215 | + if (!wl->taken) { | |
| 216 | + __intel_de_rmw_nowl(i915, DMC_WAKELOCK1_CTL, 0, | |
| 217 | + DMC_WAKELOCK_CTL_REQ); | |
| 218 | + | |
| 219 | + if (__intel_wait_for_register_nowl(i915, DMC_WAKELOCK1_CTL, | |
| 220 | + DMC_WAKELOCK_CTL_ACK, | |
| 221 | + DMC_WAKELOCK_CTL_ACK, | |
| 222 | + DMC_WAKELOCK_CTL_TIMEOUT)) { | |
| 223 | + WARN_RATELIMIT(1, "DMC wakelock ack timed out"); | |
| 224 | + goto out_unlock; | |
| 225 | + } | |
| 226 | + | |
| 227 | + wl->taken = true; | |
| 228 | + } | |
| 229 | + | |
| 230 | +out_unlock: | |
| 231 | + spin_unlock_irqrestore(&wl->lock, flags); | |
| 232 | +} | |
| 233 | + | |
| 234 | +void intel_dmc_wl_put(struct drm_i915_private *i915, i915_reg_t reg) | |
| 235 | +{ | |
| 236 | + struct intel_dmc_wl *wl = &i915->display.wl; | |
| 237 | + unsigned long flags; | |
| 238 | + | |
| 239 | + if (!__intel_dmc_wl_supported(i915)) | |
| 240 | + return; | |
| 241 | + | |
| 242 | + if (!intel_dmc_wl_check_range(reg.reg)) | |
| 243 | + return; | |
| 244 | + | |
| 245 | + spin_lock_irqsave(&wl->lock, flags); | |
| 246 | + | |
| 247 | + if (!wl->enabled) | |
| 248 | + goto out_unlock; | |
| 249 | + | |
| 250 | + if (WARN_RATELIMIT(!refcount_read(&wl->refcount), | |
| 251 | + "Tried to put wakelock with refcount zero\n")) | |
| 252 | + goto out_unlock; | |
| 253 | + | |
| 254 | + if (refcount_dec_and_test(&wl->refcount)) { | |
| 255 | + __intel_dmc_wl_release(i915); | |
| 256 | + | |
| 257 | + goto out_unlock; | |
| 258 | + } | |
| 259 | + | |
| 260 | +out_unlock: | |
| 261 | + spin_unlock_irqrestore(&wl->lock, flags); | |
| 262 | +} | |
| @@ -0,0 +1,31 @@ | ||
| 1 | +/* SPDX-License-Identifier: MIT */ | |
| 2 | +/* | |
| 3 | + * Copyright (C) 2024 Intel Corporation | |
| 4 | + */ | |
| 5 | + | |
| 6 | +#ifndef __INTEL_WAKELOCK_H__ | |
| 7 | +#define __INTEL_WAKELOCK_H__ | |
| 8 | + | |
| 9 | +#include <linux/types.h> | |
| 10 | +#include <linux/workqueue.h> | |
| 11 | +#include <linux/refcount.h> | |
| 12 | + | |
| 13 | +#include "i915_reg_defs.h" | |
| 14 | + | |
| 15 | +struct drm_i915_private; | |
| 16 | + | |
| 17 | +struct intel_dmc_wl { | |
| 18 | + spinlock_t lock; /* protects enabled, taken and refcount */ | |
| 19 | + bool enabled; | |
| 20 | + bool taken; | |
| 21 | + refcount_t refcount; | |
| 22 | + struct delayed_work work; | |
| 23 | +}; | |
| 24 | + | |
| 25 | +void intel_dmc_wl_init(struct drm_i915_private *i915); | |
| 26 | +void intel_dmc_wl_enable(struct drm_i915_private *i915); | |
| 27 | +void intel_dmc_wl_disable(struct drm_i915_private *i915); | |
| 28 | +void intel_dmc_wl_get(struct drm_i915_private *i915, i915_reg_t reg); | |
| 29 | +void intel_dmc_wl_put(struct drm_i915_private *i915, i915_reg_t reg); | |
| 30 | + | |
| 31 | +#endif /* __INTEL_WAKELOCK_H__ */ | |
| @@ -123,6 +123,14 @@ bool intel_dp_is_edp(struct intel_dp *intel_dp) · 122 unmodified lines | ||
| 123 | 123 | return dig_port->base.type == INTEL_OUTPUT_EDP; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | +bool intel_dp_as_sdp_supported(struct intel_dp *intel_dp) | |
| 127 | +{ | |
| 128 | + struct drm_i915_private *i915 = dp_to_i915(intel_dp); | |
| 129 | + | |
| 130 | + return HAS_AS_SDP(i915) && | |
| 131 | + drm_dp_as_sdp_supported(&intel_dp->aux, intel_dp->dpcd); | |
| 132 | +} | |
| 133 | + | |
| 126 | 134 | static void intel_dp_unset_edid(struct intel_dp *intel_dp); |
| 127 | 135 | |
| 128 | 136 | /* Is link rate UHBR and thus 128b/132b? */ |
| @@ -425,7 +433,7 @@ int intel_dp_max_link_data_rate(struct intel_dp *intel_dp, · 296 unmodified lines | ||
| 425 | 433 | return max_rate; |
| 426 | 434 | } |
| 427 | 435 | |
| 428 | −bool intel_dp_can_bigjoiner(struct intel_dp *intel_dp) | |
| 436 | +bool intel_dp_has_bigjoiner(struct intel_dp *intel_dp) | |
| 429 | 437 | { |
| 430 | 438 | struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); |
| 431 | 439 | struct intel_encoder *encoder = &intel_dig_port->base; |
| @@ -443,11 +451,9 @@ static int dg2_max_source_rate(struct intel_dp *intel_dp) · 11 unmodified lines | ||
| 443 | 451 | |
| 444 | 452 | static int icl_max_source_rate(struct intel_dp *intel_dp) |
| 445 | 453 | { |
| 446 | − struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); | |
| 447 | − struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev); | |
| 448 | − enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port); | |
| 454 | + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; | |
| 449 | 455 | |
| 450 | − if (intel_phy_is_combo(dev_priv, phy) && !intel_dp_is_edp(intel_dp)) | |
| 456 | + if (intel_encoder_is_combo(encoder) && !intel_dp_is_edp(intel_dp)) | |
| 451 | 457 | return 540000; |
| 452 | 458 | |
| 453 | 459 | return 810000; |
| @@ -463,11 +469,9 @@ static int ehl_max_source_rate(struct intel_dp *intel_dp) · 9 unmodified lines | ||
| 463 | 469 | |
| 464 | 470 | static int mtl_max_source_rate(struct intel_dp *intel_dp) |
| 465 | 471 | { |
| 466 | − struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); | |
| 467 | − struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); | |
| 468 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 472 | + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; | |
| 469 | 473 | |
| 470 | − if (intel_is_c10phy(i915, phy)) | |
| 474 | + if (intel_encoder_is_c10phy(encoder)) | |
| 471 | 475 | return 810000; |
| 472 | 476 | |
| 473 | 477 | return 2000000; |
| @@ -499,7 +503,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) · 25 unmodified lines | ||
| 499 | 503 | /* The values must be in increasing order */ |
| 500 | 504 | static const int mtl_rates[] = { |
| 501 | 505 | 162000, 216000, 243000, 270000, 324000, 432000, 540000, 675000, |
| 502 | − 810000, 1000000, 1350000, 2000000, | |
| 506 | + 810000, 1000000, 2000000, | |
| 503 | 507 | }; |
| 504 | 508 | static const int icl_rates[] = { |
| 505 | 509 | 162000, 216000, 270000, 324000, 432000, 540000, 648000, 810000, |
| @@ -1198,15 +1202,15 @@ intel_dp_mode_valid_downstream(struct intel_connector *connector, · 692 unmodified lines | ||
| 1198 | 1202 | } |
| 1199 | 1203 | |
| 1200 | 1204 | bool intel_dp_need_bigjoiner(struct intel_dp *intel_dp, |
| 1205 | + struct intel_connector *connector, | |
| 1201 | 1206 | int hdisplay, int clock) |
| 1202 | 1207 | { |
| 1203 | 1208 | struct drm_i915_private *i915 = dp_to_i915(intel_dp); |
| 1204 | − struct intel_connector *connector = intel_dp->attached_connector; | |
| 1205 | 1209 | |
| 1206 | − if (!intel_dp_can_bigjoiner(intel_dp)) | |
| 1210 | + if (!intel_dp_has_bigjoiner(intel_dp)) | |
| 1207 | 1211 | return false; |
| 1208 | 1212 | |
| 1209 | − return clock > i915->max_dotclk_freq || hdisplay > 5120 || | |
| 1213 | + return clock > i915->display.cdclk.max_dotclk_freq || hdisplay > 5120 || | |
| 1210 | 1214 | connector->force_bigjoiner_enable; |
| 1211 | 1215 | } |
| 1212 | 1216 | |
| @@ -1220,7 +1224,7 @@ intel_dp_mode_valid(struct drm_connector *_connector, · 7 unmodified lines | ||
| 1220 | 1224 | const struct drm_display_mode *fixed_mode; |
| 1221 | 1225 | int target_clock = mode->clock; |
| 1222 | 1226 | int max_rate, mode_rate, max_lanes, max_link_clock; |
| 1223 | − int max_dotclk = dev_priv->max_dotclk_freq; | |
| 1227 | + int max_dotclk = dev_priv->display.cdclk.max_dotclk_freq; | |
| 1224 | 1228 | u16 dsc_max_compressed_bpp = 0; |
| 1225 | 1229 | u8 dsc_slice_count = 0; |
| 1226 | 1230 | enum drm_mode_status status; |
| @@ -1233,6 +1237,9 @@ intel_dp_mode_valid(struct drm_connector *_connector, · 6 unmodified lines | ||
| 1233 | 1237 | if (mode->flags & DRM_MODE_FLAG_DBLCLK) |
| 1234 | 1238 | return MODE_H_ILLEGAL; |
| 1235 | 1239 | |
| 1240 | + if (mode->clock < 10000) | |
| 1241 | + return MODE_CLOCK_LOW; | |
| 1242 | + | |
| 1236 | 1243 | fixed_mode = intel_panel_fixed_mode(connector, mode); |
| 1237 | 1244 | if (intel_dp_is_edp(intel_dp) && fixed_mode) { |
| 1238 | 1245 | status = intel_panel_mode_valid(connector, mode); |
| @@ -1242,10 +1249,8 @@ intel_dp_mode_valid(struct drm_connector *_connector, · 3 unmodified lines | ||
| 1242 | 1249 | target_clock = fixed_mode->clock; |
| 1243 | 1250 | } |
| 1244 | 1251 | |
| 1245 | − if (mode->clock < 10000) | |
| 1246 | − return MODE_CLOCK_LOW; | |
| 1247 | − | |
| 1248 | − if (intel_dp_need_bigjoiner(intel_dp, mode->hdisplay, target_clock)) { | |
| 1252 | + if (intel_dp_need_bigjoiner(intel_dp, connector, | |
| 1253 | + mode->hdisplay, target_clock)) { | |
| 1249 | 1254 | bigjoiner = true; |
| 1250 | 1255 | max_dotclk *= 2; |
| 1251 | 1256 | } |
| @@ -1306,11 +1311,7 @@ intel_dp_mode_valid(struct drm_connector *_connector, · 54 unmodified lines | ||
| 1306 | 1311 | dsc = dsc_max_compressed_bpp && dsc_slice_count; |
| 1307 | 1312 | } |
| 1308 | 1313 | |
| 1309 | − /* | |
| 1310 | − * Big joiner configuration needs DSC for TGL which is not true for | |
| 1311 | − * XE_LPD where uncompressed joiner is supported. | |
| 1312 | − */ | |
| 1313 | − if (DISPLAY_VER(dev_priv) < 13 && bigjoiner && !dsc) | |
| 1314 | + if (intel_dp_joiner_needs_dsc(dev_priv, bigjoiner) && !dsc) | |
| 1314 | 1315 | return MODE_CLOCK_HIGH; |
| 1315 | 1316 | |
| 1316 | 1317 | if (mode_rate > max_rate && !dsc) |
| @@ -1422,7 +1423,8 @@ static bool intel_dp_source_supports_fec(struct intel_dp *intel_dp, · 105 unmodified lines | ||
| 1422 | 1423 | if (DISPLAY_VER(dev_priv) >= 12) |
| 1423 | 1424 | return true; |
| 1424 | 1425 | |
| 1425 | − if (DISPLAY_VER(dev_priv) == 11 && encoder->port != PORT_A) | |
| 1426 | + if (DISPLAY_VER(dev_priv) == 11 && encoder->port != PORT_A && | |
| 1427 | + !intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) | |
| 1426 | 1428 | return true; |
| 1427 | 1429 | |
| 1428 | 1430 | return false; |
| @@ -1917,8 +1919,9 @@ icl_dsc_compute_link_config(struct intel_dp *intel_dp, · 488 unmodified lines | ||
| 1917 | 1919 | dsc_max_bpp = min(dsc_max_bpp, pipe_bpp - 1); |
| 1918 | 1920 | |
| 1919 | 1921 | for (i = 0; i < ARRAY_SIZE(valid_dsc_bpp); i++) { |
| 1920 | − if (valid_dsc_bpp[i] < dsc_min_bpp || | |
| 1921 | − valid_dsc_bpp[i] > dsc_max_bpp) | |
| 1922 | + if (valid_dsc_bpp[i] < dsc_min_bpp) | |
| 1923 | + continue; | |
| 1924 | + if (valid_dsc_bpp[i] > dsc_max_bpp) | |
| 1922 | 1925 | break; |
| 1923 | 1926 | |
| 1924 | 1927 | ret = dsc_compute_link_config(intel_dp, |
| @@ -2399,6 +2402,16 @@ int intel_dp_config_required_rate(const struct intel_crtc_state *crtc_state) · 474 unmodified lines | ||
| 2399 | 2402 | return intel_dp_link_required(adjusted_mode->crtc_clock, bpp); |
| 2400 | 2403 | } |
| 2401 | 2404 | |
| 2405 | +bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, bool use_joiner) | |
| 2406 | +{ | |
| 2407 | + /* | |
| 2408 | + * Pipe joiner needs compression up to display 12 due to bandwidth | |
| 2409 | + * limitation. DG2 onwards pipe joiner can be enabled without | |
| 2410 | + * compression. | |
| 2411 | + */ | |
| 2412 | + return DISPLAY_VER(i915) < 13 && use_joiner; | |
| 2413 | +} | |
| 2414 | + | |
| 2402 | 2415 | static int |
| 2403 | 2416 | intel_dp_compute_link_config(struct intel_encoder *encoder, |
| 2404 | 2417 | struct intel_crtc_state *pipe_config, |
| @@ -2407,30 +2420,25 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, · 2 unmodified lines | ||
| 2407 | 2420 | { |
| 2408 | 2421 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 2409 | 2422 | struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); |
| 2410 | − const struct intel_connector *connector = | |
| 2423 | + struct intel_connector *connector = | |
| 2411 | 2424 | to_intel_connector(conn_state->connector); |
| 2412 | 2425 | const struct drm_display_mode *adjusted_mode = |
| 2413 | 2426 | &pipe_config->hw.adjusted_mode; |
| 2414 | 2427 | struct intel_dp *intel_dp = enc_to_intel_dp(encoder); |
| 2415 | 2428 | struct link_config_limits limits; |
| 2416 | − bool joiner_needs_dsc = false; | |
| 2417 | − bool dsc_needed; | |
| 2429 | + bool dsc_needed, joiner_needs_dsc; | |
| 2418 | 2430 | int ret = 0; |
| 2419 | 2431 | |
| 2420 | 2432 | if (pipe_config->fec_enable && |
| 2421 | 2433 | !intel_dp_supports_fec(intel_dp, connector, pipe_config)) |
| 2422 | 2434 | return -EINVAL; |
| 2423 | 2435 | |
| 2424 | − if (intel_dp_need_bigjoiner(intel_dp, adjusted_mode->crtc_hdisplay, | |
| 2436 | + if (intel_dp_need_bigjoiner(intel_dp, connector, | |
| 2437 | + adjusted_mode->crtc_hdisplay, | |
| 2425 | 2438 | adjusted_mode->crtc_clock)) |
| 2426 | 2439 | pipe_config->bigjoiner_pipes = GENMASK(crtc->pipe + 1, crtc->pipe); |
| 2427 | 2440 | |
| 2428 | − /* | |
| 2429 | − * Pipe joiner needs compression up to display 12 due to bandwidth | |
| 2430 | − * limitation. DG2 onwards pipe joiner can be enabled without | |
| 2431 | − * compression. | |
| 2432 | − */ | |
| 2433 | − joiner_needs_dsc = DISPLAY_VER(i915) < 13 && pipe_config->bigjoiner_pipes; | |
| 2441 | + joiner_needs_dsc = intel_dp_joiner_needs_dsc(i915, pipe_config->bigjoiner_pipes); | |
| 2434 | 2442 | |
| 2435 | 2443 | dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en || |
| 2436 | 2444 | !intel_dp_compute_config_limits(intel_dp, pipe_config, |
| @@ -2613,6 +2621,29 @@ static void intel_dp_compute_vsc_colorimetry(const struct intel_crtc_state *crtc · 176 unmodified lines | ||
| 2613 | 2621 | vsc->content_type = DP_CONTENT_TYPE_NOT_DEFINED; |
| 2614 | 2622 | } |
| 2615 | 2623 | |
| 2624 | +static void intel_dp_compute_as_sdp(struct intel_dp *intel_dp, | |
| 2625 | + struct intel_crtc_state *crtc_state) | |
| 2626 | +{ | |
| 2627 | + struct drm_dp_as_sdp *as_sdp = &crtc_state->infoframes.as_sdp; | |
| 2628 | + const struct drm_display_mode *adjusted_mode = | |
| 2629 | + &crtc_state->hw.adjusted_mode; | |
| 2630 | + | |
| 2631 | + if (!crtc_state->vrr.enable || | |
| 2632 | + !intel_dp_as_sdp_supported(intel_dp)) | |
| 2633 | + return; | |
| 2634 | + | |
| 2635 | + crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC); | |
| 2636 | + | |
| 2637 | + /* Currently only DP_AS_SDP_AVT_FIXED_VTOTAL mode supported */ | |
| 2638 | + as_sdp->sdp_type = DP_SDP_ADAPTIVE_SYNC; | |
| 2639 | + as_sdp->length = 0x9; | |
| 2640 | + as_sdp->mode = DP_AS_SDP_AVT_FIXED_VTOTAL; | |
| 2641 | + as_sdp->vtotal = adjusted_mode->vtotal; | |
| 2642 | + as_sdp->target_rr = 0; | |
| 2643 | + as_sdp->duration_incr_ms = 0; | |
| 2644 | + as_sdp->duration_incr_ms = 0; | |
| 2645 | +} | |
| 2646 | + | |
| 2616 | 2647 | static void intel_dp_compute_vsc_sdp(struct intel_dp *intel_dp, |
| 2617 | 2648 | struct intel_crtc_state *crtc_state, |
| 2618 | 2649 | const struct drm_connector_state *conn_state) |
| @@ -2723,7 +2754,11 @@ intel_dp_drrs_compute_config(struct intel_connector *connector, · 104 unmodified lines | ||
| 2723 | 2754 | intel_panel_downclock_mode(connector, &pipe_config->hw.adjusted_mode); |
| 2724 | 2755 | int pixel_clock; |
| 2725 | 2756 | |
| 2726 | − if (has_seamless_m_n(connector)) | |
| 2757 | + /* | |
| 2758 | + * FIXME all joined pipes share the same transcoder. | |
| 2759 | + * Need to account for that when updating M/N live. | |
| 2760 | + */ | |
| 2761 | + if (has_seamless_m_n(connector) && !pipe_config->bigjoiner_pipes) | |
| 2727 | 2762 | pipe_config->update_m_n = true; |
| 2728 | 2763 | |
| 2729 | 2764 | if (!can_enable_drrs(connector, pipe_config, downclock_mode)) { |
| @@ -2964,6 +2999,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, · 234 unmodified lines | ||
| 2964 | 2999 | g4x_dp_set_clock(encoder, pipe_config); |
| 2965 | 3000 | |
| 2966 | 3001 | intel_vrr_compute_config(pipe_config, conn_state); |
| 3002 | + intel_dp_compute_as_sdp(intel_dp, pipe_config); | |
| 2967 | 3003 | intel_psr_compute_config(intel_dp, pipe_config, conn_state); |
| 2968 | 3004 | intel_dp_drrs_compute_config(connector, pipe_config, link_bpp_x16); |
| 2969 | 3005 | intel_dp_compute_vsc_sdp(intel_dp, pipe_config, conn_state); |
| @@ -3356,6 +3392,14 @@ bool intel_dp_initial_fastset_check(struct intel_encoder *encoder, · 386 unmodified lines | ||
| 3356 | 3392 | fastset = false; |
| 3357 | 3393 | } |
| 3358 | 3394 | |
| 3395 | + if (CAN_PANEL_REPLAY(intel_dp)) { | |
| 3396 | + drm_dbg_kms(&i915->drm, | |
| 3397 | + "[ENCODER:%d:%s] Forcing full modeset to compute panel replay state\n", | |
| 3398 | + encoder->base.base.id, encoder->base.name); | |
| 3399 | + crtc_state->uapi.mode_changed = true; | |
| 3400 | + fastset = false; | |
| 3401 | + } | |
| 3402 | + | |
| 3359 | 3403 | return fastset; |
| 3360 | 3404 | } |
| 3361 | 3405 | |
| @@ -4039,39 +4083,84 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) · 677 unmodified lines | ||
| 4039 | 4083 | intel_dp->downstream_ports) == 0; |
| 4040 | 4084 | } |
| 4041 | 4085 | |
| 4042 | −static bool | |
| 4043 | −intel_dp_can_mst(struct intel_dp *intel_dp) | |
| 4086 | +static const char *intel_dp_mst_mode_str(enum drm_dp_mst_mode mst_mode) | |
| 4087 | +{ | |
| 4088 | + if (mst_mode == DRM_DP_MST) | |
| 4089 | + return "MST"; | |
| 4090 | + else if (mst_mode == DRM_DP_SST_SIDEBAND_MSG) | |
| 4091 | + return "SST w/ sideband messaging"; | |
| 4092 | + else | |
| 4093 | + return "SST"; | |
| 4094 | +} | |
| 4095 | + | |
| 4096 | +static enum drm_dp_mst_mode | |
| 4097 | +intel_dp_mst_mode_choose(struct intel_dp *intel_dp, | |
| 4098 | + enum drm_dp_mst_mode sink_mst_mode) | |
| 4044 | 4099 | { |
| 4045 | 4100 | struct drm_i915_private *i915 = dp_to_i915(intel_dp); |
| 4046 | 4101 | |
| 4047 | − return i915->display.params.enable_dp_mst && | |
| 4048 | − intel_dp_mst_source_support(intel_dp) && | |
| 4049 | − drm_dp_read_mst_cap(&intel_dp->aux, intel_dp->dpcd); | |
| 4102 | + if (!i915->display.params.enable_dp_mst) | |
| 4103 | + return DRM_DP_SST; | |
| 4104 | + | |
| 4105 | + if (!intel_dp_mst_source_support(intel_dp)) | |
| 4106 | + return DRM_DP_SST; | |
| 4107 | + | |
| 4108 | + if (sink_mst_mode == DRM_DP_SST_SIDEBAND_MSG && | |
| 4109 | + !(intel_dp->dpcd[DP_MAIN_LINK_CHANNEL_CODING] & DP_CAP_ANSI_128B132B)) | |
| 4110 | + return DRM_DP_SST; | |
| 4111 | + | |
| 4112 | + return sink_mst_mode; | |
| 4050 | 4113 | } |
| 4051 | 4114 | |
| 4052 | −static void | |
| 4053 | −intel_dp_configure_mst(struct intel_dp *intel_dp) | |
| 4115 | +static enum drm_dp_mst_mode | |
| 4116 | +intel_dp_mst_detect(struct intel_dp *intel_dp) | |
| 4054 | 4117 | { |
| 4055 | 4118 | struct drm_i915_private *i915 = dp_to_i915(intel_dp); |
| 4056 | − struct intel_encoder *encoder = | |
| 4057 | − &dp_to_dig_port(intel_dp)->base; | |
| 4058 | − bool sink_can_mst = drm_dp_read_mst_cap(&intel_dp->aux, intel_dp->dpcd); | |
| 4119 | + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; | |
| 4120 | + enum drm_dp_mst_mode sink_mst_mode; | |
| 4121 | + enum drm_dp_mst_mode mst_detect; | |
| 4122 | + | |
| 4123 | + sink_mst_mode = drm_dp_read_mst_cap(&intel_dp->aux, intel_dp->dpcd); | |
| 4124 | + | |
| 4125 | + mst_detect = intel_dp_mst_mode_choose(intel_dp, sink_mst_mode); | |
| 4059 | 4126 | |
| 4060 | 4127 | drm_dbg_kms(&i915->drm, |
| 4061 | − "[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n", | |
| 4128 | + "[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s -> enable: %s\n", | |
| 4062 | 4129 | encoder->base.base.id, encoder->base.name, |
| 4063 | 4130 | str_yes_no(intel_dp_mst_source_support(intel_dp)), |
| 4064 | − str_yes_no(sink_can_mst), | |
| 4065 | − str_yes_no(i915->display.params.enable_dp_mst)); | |
| 4131 | + intel_dp_mst_mode_str(sink_mst_mode), | |
| 4132 | + str_yes_no(i915->display.params.enable_dp_mst), | |
| 4133 | + intel_dp_mst_mode_str(mst_detect)); | |
| 4134 | + | |
| 4135 | + return mst_detect; | |
| 4136 | +} | |
| 4066 | 4137 | |
| 4138 | +static void | |
| 4139 | +intel_dp_mst_configure(struct intel_dp *intel_dp) | |
| 4140 | +{ | |
| 4067 | 4141 | if (!intel_dp_mst_source_support(intel_dp)) |
| 4068 | 4142 | return; |
| 4069 | 4143 | |
| 4070 | − intel_dp->is_mst = sink_can_mst && | |
| 4071 | − i915->display.params.enable_dp_mst; | |
| 4144 | + intel_dp->is_mst = intel_dp->mst_detect != DRM_DP_SST; | |
| 4145 | + | |
| 4146 | + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); | |
| 4147 | + | |
| 4148 | + /* Avoid stale info on the next detect cycle. */ | |
| 4149 | + intel_dp->mst_detect = DRM_DP_SST; | |
| 4150 | +} | |
| 4151 | + | |
| 4152 | +static void | |
| 4153 | +intel_dp_mst_disconnect(struct intel_dp *intel_dp) | |
| 4154 | +{ | |
| 4155 | + struct drm_i915_private *i915 = dp_to_i915(intel_dp); | |
| 4156 | + | |
| 4157 | + if (!intel_dp->is_mst) | |
| 4158 | + return; | |
| 4072 | 4159 | |
| 4073 | − drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, | |
| 4074 | − intel_dp->is_mst); | |
| 4160 | + drm_dbg_kms(&i915->drm, "MST device may have disappeared %d vs %d\n", | |
| 4161 | + intel_dp->is_mst, intel_dp->mst_mgr.mst_state); | |
| 4162 | + intel_dp->is_mst = false; | |
| 4163 | + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); | |
| 4075 | 4164 | } |
| 4076 | 4165 | |
| 4077 | 4166 | static bool |
| @@ -4119,6 +4208,32 @@ intel_dp_needs_vsc_sdp(const struct intel_crtc_state *crtc_state, · 41 unmodified lines | ||
| 4119 | 4208 | return false; |
| 4120 | 4209 | } |
| 4121 | 4210 | |
| 4211 | +static ssize_t intel_dp_as_sdp_pack(const struct drm_dp_as_sdp *as_sdp, | |
| 4212 | + struct dp_sdp *sdp, size_t size) | |
| 4213 | +{ | |
| 4214 | + size_t length = sizeof(struct dp_sdp); | |
| 4215 | + | |
| 4216 | + if (size < length) | |
| 4217 | + return -ENOSPC; | |
| 4218 | + | |
| 4219 | + memset(sdp, 0, size); | |
| 4220 | + | |
| 4221 | + /* Prepare AS (Adaptive Sync) SDP Header */ | |
| 4222 | + sdp->sdp_header.HB0 = 0; | |
| 4223 | + sdp->sdp_header.HB1 = as_sdp->sdp_type; | |
| 4224 | + sdp->sdp_header.HB2 = 0x02; | |
| 4225 | + sdp->sdp_header.HB3 = as_sdp->length; | |
| 4226 | + | |
| 4227 | + /* Fill AS (Adaptive Sync) SDP Payload */ | |
| 4228 | + sdp->db[0] = as_sdp->mode; | |
| 4229 | + sdp->db[1] = as_sdp->vtotal & 0xFF; | |
| 4230 | + sdp->db[2] = (as_sdp->vtotal >> 8) & 0xFF; | |
| 4231 | + sdp->db[3] = as_sdp->target_rr & 0xFF; | |
| 4232 | + sdp->db[4] = (as_sdp->target_rr >> 8) & 0x3; | |
| 4233 | + | |
| 4234 | + return length; | |
| 4235 | +} | |
| 4236 | + | |
| 4122 | 4237 | static ssize_t |
| 4123 | 4238 | intel_dp_hdr_metadata_infoframe_sdp_pack(struct drm_i915_private *i915, |
| 4124 | 4239 | const struct hdmi_drm_infoframe *drm_infoframe, |
| @@ -4218,6 +4333,10 @@ static void intel_write_dp_sdp(struct intel_encoder *encoder, · 93 unmodified lines | ||
| 4218 | 4333 | &crtc_state->infoframes.drm.drm, |
| 4219 | 4334 | &sdp, sizeof(sdp)); |
| 4220 | 4335 | break; |
| 4336 | + case DP_SDP_ADAPTIVE_SYNC: | |
| 4337 | + len = intel_dp_as_sdp_pack(&crtc_state->infoframes.as_sdp, &sdp, | |
| 4338 | + sizeof(sdp)); | |
| 4339 | + break; | |
| 4221 | 4340 | default: |
| 4222 | 4341 | MISSING_CASE(type); |
| 4223 | 4342 | return; |
| @@ -4239,6 +4358,10 @@ void intel_dp_set_infoframes(struct intel_encoder *encoder, · 15 unmodified lines | ||
| 4239 | 4358 | u32 dip_enable = VIDEO_DIP_ENABLE_AVI_HSW | VIDEO_DIP_ENABLE_GCP_HSW | |
| 4240 | 4359 | VIDEO_DIP_ENABLE_VS_HSW | VIDEO_DIP_ENABLE_GMP_HSW | |
| 4241 | 4360 | VIDEO_DIP_ENABLE_SPD_HSW | VIDEO_DIP_ENABLE_DRM_GLK; |
| 4361 | + | |
| 4362 | + if (HAS_AS_SDP(dev_priv)) | |
| 4363 | + dip_enable |= VIDEO_DIP_ENABLE_AS_ADL; | |
| 4364 | + | |
| 4242 | 4365 | u32 val = intel_de_read(dev_priv, reg) & ~dip_enable; |
| 4243 | 4366 | |
| 4244 | 4367 | /* TODO: Sanitize DSC enabling wrt. intel_dsc_dp_pps_write(). */ |
| @@ -4256,10 +4379,42 @@ void intel_dp_set_infoframes(struct intel_encoder *encoder, · 11 unmodified lines | ||
| 4256 | 4379 | return; |
| 4257 | 4380 | |
| 4258 | 4381 | intel_write_dp_sdp(encoder, crtc_state, DP_SDP_VSC); |
| 4382 | + intel_write_dp_sdp(encoder, crtc_state, DP_SDP_ADAPTIVE_SYNC); | |
| 4259 | 4383 | |
| 4260 | 4384 | intel_write_dp_sdp(encoder, crtc_state, HDMI_PACKET_TYPE_GAMUT_METADATA); |
| 4261 | 4385 | } |
| 4262 | 4386 | |
| 4387 | +static | |
| 4388 | +int intel_dp_as_sdp_unpack(struct drm_dp_as_sdp *as_sdp, | |
| 4389 | + const void *buffer, size_t size) | |
| 4390 | +{ | |
| 4391 | + const struct dp_sdp *sdp = buffer; | |
| 4392 | + | |
| 4393 | + if (size < sizeof(struct dp_sdp)) | |
| 4394 | + return -EINVAL; | |
| 4395 | + | |
| 4396 | + memset(as_sdp, 0, sizeof(*as_sdp)); | |
| 4397 | + | |
| 4398 | + if (sdp->sdp_header.HB0 != 0) | |
| 4399 | + return -EINVAL; | |
| 4400 | + | |
| 4401 | + if (sdp->sdp_header.HB1 != DP_SDP_ADAPTIVE_SYNC) | |
| 4402 | + return -EINVAL; | |
| 4403 | + | |
| 4404 | + if (sdp->sdp_header.HB2 != 0x02) | |
| 4405 | + return -EINVAL; | |
| 4406 | + | |
| 4407 | + if ((sdp->sdp_header.HB3 & 0x3F) != 9) | |
| 4408 | + return -EINVAL; | |
| 4409 | + | |
| 4410 | + as_sdp->length = sdp->sdp_header.HB3 & DP_ADAPTIVE_SYNC_SDP_LENGTH; | |
| 4411 | + as_sdp->mode = sdp->db[0] & DP_ADAPTIVE_SYNC_SDP_OPERATION_MODE; | |
| 4412 | + as_sdp->vtotal = (sdp->db[2] << 8) | sdp->db[1]; | |
| 4413 | + as_sdp->target_rr = (u64)sdp->db[3] | ((u64)sdp->db[4] & 0x3); | |
| 4414 | + | |
| 4415 | + return 0; | |
| 4416 | +} | |
| 4417 | + | |
| 4263 | 4418 | static int intel_dp_vsc_sdp_unpack(struct drm_dp_vsc_sdp *vsc, |
| 4264 | 4419 | const void *buffer, size_t size) |
| 4265 | 4420 | { |
| @@ -4330,6 +4485,29 @@ static int intel_dp_vsc_sdp_unpack(struct drm_dp_vsc_sdp *vsc, · 64 unmodified lines | ||
| 4330 | 4485 | return 0; |
| 4331 | 4486 | } |
| 4332 | 4487 | |
| 4488 | +static void | |
| 4489 | +intel_read_dp_as_sdp(struct intel_encoder *encoder, | |
| 4490 | + struct intel_crtc_state *crtc_state, | |
| 4491 | + struct drm_dp_as_sdp *as_sdp) | |
| 4492 | +{ | |
| 4493 | + struct intel_digital_port *dig_port = enc_to_dig_port(encoder); | |
| 4494 | + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); | |
| 4495 | + unsigned int type = DP_SDP_ADAPTIVE_SYNC; | |
| 4496 | + struct dp_sdp sdp = {}; | |
| 4497 | + int ret; | |
| 4498 | + | |
| 4499 | + if ((crtc_state->infoframes.enable & | |
| 4500 | + intel_hdmi_infoframe_enable(type)) == 0) | |
| 4501 | + return; | |
| 4502 | + | |
| 4503 | + dig_port->read_infoframe(encoder, crtc_state, type, &sdp, | |
| 4504 | + sizeof(sdp)); | |
| 4505 | + | |
| 4506 | + ret = intel_dp_as_sdp_unpack(as_sdp, &sdp, sizeof(sdp)); | |
| 4507 | + if (ret) | |
| 4508 | + drm_dbg_kms(&dev_priv->drm, "Failed to unpack DP AS SDP\n"); | |
| 4509 | +} | |
| 4510 | + | |
| 4333 | 4511 | static int |
| 4334 | 4512 | intel_dp_hdr_metadata_infoframe_sdp_unpack(struct hdmi_drm_infoframe *drm_infoframe, |
| 4335 | 4513 | const void *buffer, size_t size) |
| @@ -4436,6 +4614,10 @@ void intel_read_dp_sdp(struct intel_encoder *encoder, · 100 unmodified lines | ||
| 4436 | 4614 | intel_read_dp_hdr_metadata_infoframe_sdp(encoder, crtc_state, |
| 4437 | 4615 | &crtc_state->infoframes.drm.drm); |
| 4438 | 4616 | break; |
| 4617 | + case DP_SDP_ADAPTIVE_SYNC: | |
| 4618 | + intel_read_dp_as_sdp(encoder, crtc_state, | |
| 4619 | + &crtc_state->infoframes.as_sdp); | |
| 4620 | + break; | |
| 4439 | 4621 | default: |
| 4440 | 4622 | MISSING_CASE(type); |
| 4441 | 4623 | break; |
| @@ -5363,6 +5545,8 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) · 921 unmodified lines | ||
| 5363 | 5545 | if (!intel_dp_get_dpcd(intel_dp)) |
| 5364 | 5546 | return connector_status_disconnected; |
| 5365 | 5547 | |
| 5548 | + intel_dp->mst_detect = intel_dp_mst_detect(intel_dp); | |
| 5549 | + | |
| 5366 | 5550 | /* if there's no downstream port, we're done */ |
| 5367 | 5551 | if (!drm_dp_is_branch(dpcd)) |
| 5368 | 5552 | return connector_status_connected; |
| @@ -5374,7 +5558,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) · 5 unmodified lines | ||
| 5374 | 5558 | connector_status_connected : connector_status_disconnected; |
| 5375 | 5559 | } |
| 5376 | 5560 | |
| 5377 | − if (intel_dp_can_mst(intel_dp)) | |
| 5561 | + if (intel_dp->mst_detect == DRM_DP_MST) | |
| 5378 | 5562 | return connector_status_connected; |
| 5379 | 5563 | |
| 5380 | 5564 | /* If no HPD, poke DDC gently */ |
| @@ -5679,15 +5863,7 @@ intel_dp_detect(struct drm_connector *connector, · 298 unmodified lines | ||
| 5679 | 5863 | memset(intel_connector->dp.dsc_dpcd, 0, sizeof(intel_connector->dp.dsc_dpcd)); |
| 5680 | 5864 | intel_dp->psr.sink_panel_replay_support = false; |
| 5681 | 5865 | |
| 5682 | − if (intel_dp->is_mst) { | |
| 5683 | − drm_dbg_kms(&dev_priv->drm, | |
| 5684 | − "MST device may have disappeared %d vs %d\n", | |
| 5685 | − intel_dp->is_mst, | |
| 5686 | − intel_dp->mst_mgr.mst_state); | |
| 5687 | − intel_dp->is_mst = false; | |
| 5688 | − drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, | |
| 5689 | − intel_dp->is_mst); | |
| 5690 | − } | |
| 5866 | + intel_dp_mst_disconnect(intel_dp); | |
| 5691 | 5867 | |
| 5692 | 5868 | intel_dp_tunnel_disconnect(intel_dp); |
| 5693 | 5869 | |
| @@ -5706,7 +5882,7 @@ intel_dp_detect(struct drm_connector *connector, · 12 unmodified lines | ||
| 5706 | 5882 | |
| 5707 | 5883 | intel_dp_detect_dsc_caps(intel_dp, intel_connector); |
| 5708 | 5884 | |
| 5709 | − intel_dp_configure_mst(intel_dp); | |
| 5885 | + intel_dp_mst_configure(intel_dp); | |
| 5710 | 5886 | |
| 5711 | 5887 | /* |
| 5712 | 5888 | * TODO: Reset link params when switching to MST mode, until MST |
| @@ -6489,7 +6665,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, · 776 unmodified lines | ||
| 6489 | 6665 | struct drm_device *dev = intel_encoder->base.dev; |
| 6490 | 6666 | struct drm_i915_private *dev_priv = to_i915(dev); |
| 6491 | 6667 | enum port port = intel_encoder->port; |
| 6492 | − enum phy phy = intel_port_to_phy(dev_priv, port); | |
| 6493 | 6668 | int type; |
| 6494 | 6669 | |
| 6495 | 6670 | /* Initialize the work for modeset in case of link train failure */ |
| @@ -6514,7 +6689,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, · 18 unmodified lines | ||
| 6514 | 6689 | * Currently we don't support eDP on TypeC ports, although in |
| 6515 | 6690 | * theory it could work on TypeC legacy ports. |
| 6516 | 6691 | */ |
| 6517 | − drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy)); | |
| 6692 | + drm_WARN_ON(dev, intel_encoder_is_tc(intel_encoder)); | |
| 6518 | 6693 | type = DRM_MODE_CONNECTOR_eDP; |
| 6519 | 6694 | intel_encoder->type = INTEL_OUTPUT_EDP; |
| 6520 | 6695 | |
| @@ -6557,6 +6732,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, · 36 unmodified lines | ||
| 6557 | 6732 | intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; |
| 6558 | 6733 | else |
| 6559 | 6734 | intel_connector->get_hw_state = intel_connector_get_hw_state; |
| 6735 | + intel_connector->sync_state = intel_dp_connector_sync_state; | |
| 6560 | 6736 | |
| 6561 | 6737 | if (!intel_edp_init_connector(intel_dp, intel_connector)) { |
| 6562 | 6738 | intel_dp_aux_fini(intel_dp); |
| @@ -88,6 +88,7 @@ void intel_dp_audio_compute_config(struct intel_encoder *encoder, · 87 unmodified lines | ||
| 88 | 88 | struct drm_connector_state *conn_state); |
| 89 | 89 | bool intel_dp_has_hdmi_sink(struct intel_dp *intel_dp); |
| 90 | 90 | bool intel_dp_is_edp(struct intel_dp *intel_dp); |
| 91 | +bool intel_dp_as_sdp_supported(struct intel_dp *intel_dp); | |
| 91 | 92 | bool intel_dp_is_uhbr(const struct intel_crtc_state *crtc_state); |
| 92 | 93 | int intel_dp_link_symbol_size(int rate); |
| 93 | 94 | int intel_dp_link_symbol_clock(int rate); |
| @@ -119,7 +120,8 @@ int intel_dp_effective_data_rate(int pixel_clock, int bpp_x16, · 25 unmodified lines | ||
| 119 | 120 | int bw_overhead); |
| 120 | 121 | int intel_dp_max_link_data_rate(struct intel_dp *intel_dp, |
| 121 | 122 | int max_dprx_rate, int max_dprx_lanes); |
| 122 | −bool intel_dp_can_bigjoiner(struct intel_dp *intel_dp); | |
| 123 | +bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, bool use_joiner); | |
| 124 | +bool intel_dp_has_bigjoiner(struct intel_dp *intel_dp); | |
| 123 | 125 | bool intel_dp_needs_vsc_sdp(const struct intel_crtc_state *crtc_state, |
| 124 | 126 | const struct drm_connector_state *conn_state); |
| 125 | 127 | void intel_dp_set_infoframes(struct intel_encoder *encoder, bool enable, |
| @@ -149,6 +151,7 @@ u8 intel_dp_dsc_get_slice_count(const struct intel_connector *connector, · 23 unmodified lines | ||
| 149 | 151 | int mode_clock, int mode_hdisplay, |
| 150 | 152 | bool bigjoiner); |
| 151 | 153 | bool intel_dp_need_bigjoiner(struct intel_dp *intel_dp, |
| 154 | + struct intel_connector *connector, | |
| 152 | 155 | int hdisplay, int clock); |
| 153 | 156 | |
| 154 | 157 | static inline unsigned int intel_dp_unused_lane_mask(int lane_count) |
| @@ -61,9 +61,8 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) · 60 unmodified lines | ||
| 61 | 61 | u32 status; |
| 62 | 62 | int ret; |
| 63 | 63 | |
| 64 | − ret = __intel_de_wait_for_register(i915, ch_ctl, | |
| 65 | − DP_AUX_CH_CTL_SEND_BUSY, 0, | |
| 66 | − 2, timeout_ms, &status); | |
| 64 | + ret = intel_de_wait_custom(i915, ch_ctl, DP_AUX_CH_CTL_SEND_BUSY, 0, | |
| 65 | + 2, timeout_ms, &status); | |
| 67 | 66 | |
| 68 | 67 | if (ret == -ETIMEDOUT) |
| 69 | 68 | drm_err(&i915->drm, |
| @@ -143,9 +142,15 @@ static int intel_dp_aux_sync_len(void) · 73 unmodified lines | ||
| 143 | 142 | return precharge + preamble; |
| 144 | 143 | } |
| 145 | 144 | |
| 146 | −static int intel_dp_aux_fw_sync_len(void) | |
| 145 | +int intel_dp_aux_fw_sync_len(void) | |
| 147 | 146 | { |
| 148 | − int precharge = 10; /* 10-16 */ | |
| 147 | + /* | |
| 148 | + * We faced some glitches on Dell Precision 5490 MTL laptop with panel: | |
| 149 | + * "Manufacturer: AUO, Model: 63898" when using HW default 18. Using 20 | |
| 150 | + * is fixing these problems with the panel. It is still within range | |
| 151 | + * mentioned in eDP specification. | |
| 152 | + */ | |
| 153 | + int precharge = 12; /* 10-16 */ | |
| 149 | 154 | int preamble = 8; |
| 150 | 155 | |
| 151 | 156 | return precharge + preamble; |
| @@ -20,5 +20,6 @@ enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder); · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | void intel_dp_aux_irq_handler(struct drm_i915_private *i915); |
| 22 | 22 | u32 intel_dp_aux_pack(const u8 *src, int src_bytes); |
| 23 | +int intel_dp_aux_fw_sync_len(void); | |
| 23 | 24 | |
| 24 | 25 | #endif /* __INTEL_DP_AUX_H__ */ |
| @@ -691,12 +691,15 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector, · 690 unmodified lines | ||
| 691 | 691 | u8 bcaps; |
| 692 | 692 | int ret; |
| 693 | 693 | |
| 694 | + *hdcp_capable = false; | |
| 695 | + *hdcp2_capable = false; | |
| 694 | 696 | if (!intel_encoder_is_mst(connector->encoder)) |
| 695 | 697 | return -EINVAL; |
| 696 | 698 | |
| 697 | 699 | ret = _intel_dp_hdcp2_get_capability(aux, hdcp2_capable); |
| 698 | 700 | if (ret) |
| 699 | − return ret; | |
| 701 | + drm_dbg_kms(&i915->drm, | |
| 702 | + "HDCP2 DPCD capability read failed err: %d\n", ret); | |
| 700 | 703 | |
| 701 | 704 | ret = intel_dp_hdcp_read_bcaps(aux, i915, &bcaps); |
| 702 | 705 | if (ret) |
| @@ -766,11 +769,9 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector, · 63 unmodified lines | ||
| 766 | 769 | return -EINVAL; |
| 767 | 770 | |
| 768 | 771 | /* Wait for encryption confirmation */ |
| 769 | − if (intel_de_wait_for_register(i915, | |
| 770 | − HDCP_STATUS(i915, cpu_transcoder, port), | |
| 771 | − stream_enc_status, | |
| 772 | − enable ? stream_enc_status : 0, | |
| 773 | − HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { | |
| 772 | + if (intel_de_wait(i915, HDCP_STATUS(i915, cpu_transcoder, port), | |
| 773 | + stream_enc_status, enable ? stream_enc_status : 0, | |
| 774 | + HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { | |
| 774 | 775 | drm_err(&i915->drm, "Timed out waiting for transcoder: %s stream encryption %s\n", |
| 775 | 776 | transcoder_name(cpu_transcoder), enable ? "enabled" : "disabled"); |
| 776 | 777 | return -ETIMEDOUT; |
| @@ -801,11 +802,10 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, · 24 unmodified lines | ||
| 801 | 802 | return ret; |
| 802 | 803 | |
| 803 | 804 | /* Wait for encryption confirmation */ |
| 804 | − if (intel_de_wait_for_register(i915, | |
| 805 | − HDCP2_STREAM_STATUS(i915, cpu_transcoder, pipe), | |
| 806 | − STREAM_ENCRYPTION_STATUS, | |
| 807 | − enable ? STREAM_ENCRYPTION_STATUS : 0, | |
| 808 | − HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { | |
| 805 | + if (intel_de_wait(i915, HDCP2_STREAM_STATUS(i915, cpu_transcoder, pipe), | |
| 806 | + STREAM_ENCRYPTION_STATUS, | |
| 807 | + enable ? STREAM_ENCRYPTION_STATUS : 0, | |
| 808 | + HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { | |
| 809 | 809 | drm_err(&i915->drm, "Timed out waiting for transcoder: %s stream encryption %s\n", |
| 810 | 810 | transcoder_name(cpu_transcoder), enable ? "enabled" : "disabled"); |
| 811 | 811 | return -ETIMEDOUT; |
| @@ -88,11 +88,10 @@ static int intel_dp_mst_bw_overhead(const struct intel_crtc_state *crtc_state, · 87 unmodified lines | ||
| 88 | 88 | |
| 89 | 89 | if (dsc) { |
| 90 | 90 | flags |= DRM_DP_BW_OVERHEAD_DSC; |
| 91 | − /* TODO: add support for bigjoiner */ | |
| 92 | 91 | dsc_slice_count = intel_dp_dsc_get_slice_count(connector, |
| 93 | 92 | adjusted_mode->clock, |
| 94 | 93 | adjusted_mode->hdisplay, |
| 95 | − false); | |
| 94 | + crtc_state->bigjoiner_pipes); | |
| 96 | 95 | } |
| 97 | 96 | |
| 98 | 97 | overhead = drm_dp_bw_overhead(crtc_state->lane_count, |
| @@ -525,14 +524,15 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, · 426 unmodified lines | ||
| 525 | 524 | { |
| 526 | 525 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 527 | 526 | struct intel_atomic_state *state = to_intel_atomic_state(conn_state->state); |
| 527 | + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); | |
| 528 | 528 | struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder); |
| 529 | 529 | struct intel_dp *intel_dp = &intel_mst->primary->dp; |
| 530 | − const struct intel_connector *connector = | |
| 530 | + struct intel_connector *connector = | |
| 531 | 531 | to_intel_connector(conn_state->connector); |
| 532 | 532 | const struct drm_display_mode *adjusted_mode = |
| 533 | 533 | &pipe_config->hw.adjusted_mode; |
| 534 | 534 | struct link_config_limits limits; |
| 535 | − bool dsc_needed; | |
| 535 | + bool dsc_needed, joiner_needs_dsc; | |
| 536 | 536 | int ret = 0; |
| 537 | 537 | |
| 538 | 538 | if (pipe_config->fec_enable && |
| @@ -542,11 +542,18 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, · 3 unmodified lines | ||
| 542 | 542 | if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) |
| 543 | 543 | return -EINVAL; |
| 544 | 544 | |
| 545 | + if (intel_dp_need_bigjoiner(intel_dp, connector, | |
| 546 | + adjusted_mode->crtc_hdisplay, | |
| 547 | + adjusted_mode->crtc_clock)) | |
| 548 | + pipe_config->bigjoiner_pipes = GENMASK(crtc->pipe + 1, crtc->pipe); | |
| 549 | + | |
| 545 | 550 | pipe_config->sink_format = INTEL_OUTPUT_FORMAT_RGB; |
| 546 | 551 | pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; |
| 547 | 552 | pipe_config->has_pch_encoder = false; |
| 548 | 553 | |
| 549 | − dsc_needed = intel_dp->force_dsc_en || | |
| 554 | + joiner_needs_dsc = intel_dp_joiner_needs_dsc(dev_priv, pipe_config->bigjoiner_pipes); | |
| 555 | + | |
| 556 | + dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en || | |
| 550 | 557 | !intel_dp_mst_compute_config_limits(intel_dp, |
| 551 | 558 | connector, |
| 552 | 559 | pipe_config, |
| @@ -566,8 +573,8 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, · 13 unmodified lines | ||
| 566 | 573 | |
| 567 | 574 | /* enable compression if the mode doesn't fit available BW */ |
| 568 | 575 | if (dsc_needed) { |
| 569 | − drm_dbg_kms(&dev_priv->drm, "Try DSC (fallback=%s, force=%s)\n", | |
| 570 | − str_yes_no(ret), | |
| 576 | + drm_dbg_kms(&dev_priv->drm, "Try DSC (fallback=%s, joiner=%s, force=%s)\n", | |
| 577 | + str_yes_no(ret), str_yes_no(joiner_needs_dsc), | |
| 571 | 578 | str_yes_no(intel_dp->force_dsc_en)); |
| 572 | 579 | |
| 573 | 580 | if (!intel_dp_mst_dsc_source_support(pipe_config)) |
| @@ -954,6 +961,7 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state, · 380 unmodified lines | ||
| 954 | 961 | struct drm_dp_mst_atomic_payload *new_payload = |
| 955 | 962 | drm_atomic_get_mst_payload_state(new_mst_state, connector->port); |
| 956 | 963 | struct drm_i915_private *dev_priv = to_i915(connector->base.dev); |
| 964 | + struct intel_crtc *pipe_crtc; | |
| 957 | 965 | bool last_mst_stream; |
| 958 | 966 | |
| 959 | 967 | intel_dp->active_mst_links--; |
| @@ -962,7 +970,13 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state, · 2 unmodified lines | ||
| 962 | 970 | DISPLAY_VER(dev_priv) >= 12 && last_mst_stream && |
| 963 | 971 | !intel_dp_mst_is_master_trans(old_crtc_state)); |
| 964 | 972 | |
| 965 | − intel_crtc_vblank_off(old_crtc_state); | |
| 973 | + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, | |
| 974 | + intel_crtc_joined_pipe_mask(old_crtc_state)) { | |
| 975 | + const struct intel_crtc_state *old_pipe_crtc_state = | |
| 976 | + intel_atomic_get_old_crtc_state(state, pipe_crtc); | |
| 977 | + | |
| 978 | + intel_crtc_vblank_off(old_pipe_crtc_state); | |
| 979 | + } | |
| 966 | 980 | |
| 967 | 981 | intel_disable_transcoder(old_crtc_state); |
| 968 | 982 | |
| @@ -980,12 +994,18 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state, · 11 unmodified lines | ||
| 980 | 994 | |
| 981 | 995 | intel_ddi_disable_transcoder_func(old_crtc_state); |
| 982 | 996 | |
| 983 | − intel_dsc_disable(old_crtc_state); | |
| 997 | + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, | |
| 998 | + intel_crtc_joined_pipe_mask(old_crtc_state)) { | |
| 999 | + const struct intel_crtc_state *old_pipe_crtc_state = | |
| 1000 | + intel_atomic_get_old_crtc_state(state, pipe_crtc); | |
| 984 | 1001 | |
| 985 | − if (DISPLAY_VER(dev_priv) >= 9) | |
| 986 | − skl_scaler_disable(old_crtc_state); | |
| 987 | − else | |
| 988 | − ilk_pfit_disable(old_crtc_state); | |
| 1002 | + intel_dsc_disable(old_pipe_crtc_state); | |
| 1003 | + | |
| 1004 | + if (DISPLAY_VER(dev_priv) >= 9) | |
| 1005 | + skl_scaler_disable(old_pipe_crtc_state); | |
| 1006 | + else | |
| 1007 | + ilk_pfit_disable(old_pipe_crtc_state); | |
| 1008 | + } | |
| 989 | 1009 | |
| 990 | 1010 | /* |
| 991 | 1011 | * Power down mst path before disabling the port, otherwise we end |
| @@ -1117,6 +1137,39 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, · 125 unmodified lines | ||
| 1117 | 1137 | intel_ddi_set_dp_msa(pipe_config, conn_state); |
| 1118 | 1138 | } |
| 1119 | 1139 | |
| 1140 | +static void enable_bs_jitter_was(const struct intel_crtc_state *crtc_state) | |
| 1141 | +{ | |
| 1142 | + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); | |
| 1143 | + u32 clear = 0; | |
| 1144 | + u32 set = 0; | |
| 1145 | + | |
| 1146 | + if (!IS_ALDERLAKE_P(i915)) | |
| 1147 | + return; | |
| 1148 | + | |
| 1149 | + if (!IS_DISPLAY_STEP(i915, STEP_D0, STEP_FOREVER)) | |
| 1150 | + return; | |
| 1151 | + | |
| 1152 | + /* Wa_14013163432:adlp */ | |
| 1153 | + if (crtc_state->fec_enable || intel_dp_is_uhbr(crtc_state)) | |
| 1154 | + set |= DP_MST_FEC_BS_JITTER_WA(crtc_state->cpu_transcoder); | |
| 1155 | + | |
| 1156 | + /* Wa_14014143976:adlp */ | |
| 1157 | + if (IS_DISPLAY_STEP(i915, STEP_E0, STEP_FOREVER)) { | |
| 1158 | + if (intel_dp_is_uhbr(crtc_state)) | |
| 1159 | + set |= DP_MST_SHORT_HBLANK_WA(crtc_state->cpu_transcoder); | |
| 1160 | + else if (crtc_state->fec_enable) | |
| 1161 | + clear |= DP_MST_SHORT_HBLANK_WA(crtc_state->cpu_transcoder); | |
| 1162 | + | |
| 1163 | + if (crtc_state->fec_enable || intel_dp_is_uhbr(crtc_state)) | |
| 1164 | + set |= DP_MST_DPT_DPTP_ALIGN_WA(crtc_state->cpu_transcoder); | |
| 1165 | + } | |
| 1166 | + | |
| 1167 | + if (!clear && !set) | |
| 1168 | + return; | |
| 1169 | + | |
| 1170 | + intel_de_rmw(i915, CHICKEN_MISC_3, clear, set); | |
| 1171 | +} | |
| 1172 | + | |
| 1120 | 1173 | static void intel_mst_enable_dp(struct intel_atomic_state *state, |
| 1121 | 1174 | struct intel_encoder *encoder, |
| 1122 | 1175 | const struct intel_crtc_state *pipe_config, |
| @@ -1131,6 +1184,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, · 8 unmodified lines | ||
| 1131 | 1184 | drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr); |
| 1132 | 1185 | enum transcoder trans = pipe_config->cpu_transcoder; |
| 1133 | 1186 | bool first_mst_stream = intel_dp->active_mst_links == 1; |
| 1187 | + struct intel_crtc *pipe_crtc; | |
| 1134 | 1188 | |
| 1135 | 1189 | drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder); |
| 1136 | 1190 | |
| @@ -1145,6 +1199,8 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, · 8 unmodified lines | ||
| 1145 | 1199 | TRANS_DP2_VFREQ_PIXEL_CLOCK(crtc_clock_hz & 0xffffff)); |
| 1146 | 1200 | } |
| 1147 | 1201 | |
| 1202 | + enable_bs_jitter_was(pipe_config); | |
| 1203 | + | |
| 1148 | 1204 | intel_ddi_enable_transcoder_func(encoder, pipe_config); |
| 1149 | 1205 | |
| 1150 | 1206 | clear_act_sent(encoder, pipe_config); |
| @@ -1172,7 +1228,13 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, · 21 unmodified lines | ||
| 1172 | 1228 | |
| 1173 | 1229 | intel_enable_transcoder(pipe_config); |
| 1174 | 1230 | |
| 1175 | − intel_crtc_vblank_on(pipe_config); | |
| 1231 | + for_each_intel_crtc_in_pipe_mask_reverse(&dev_priv->drm, pipe_crtc, | |
| 1232 | + intel_crtc_joined_pipe_mask(pipe_config)) { | |
| 1233 | + const struct intel_crtc_state *pipe_crtc_state = | |
| 1234 | + intel_atomic_get_new_crtc_state(state, pipe_crtc); | |
| 1235 | + | |
| 1236 | + intel_crtc_vblank_on(pipe_crtc_state); | |
| 1237 | + } | |
| 1176 | 1238 | |
| 1177 | 1239 | intel_hdcp_enable(state, encoder, pipe_config, conn_state); |
| 1178 | 1240 | } |
| @@ -1285,7 +1347,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, · 106 unmodified lines | ||
| 1285 | 1347 | struct drm_dp_mst_topology_mgr *mgr = &intel_dp->mst_mgr; |
| 1286 | 1348 | struct drm_dp_mst_port *port = intel_connector->port; |
| 1287 | 1349 | const int min_bpp = 18; |
| 1288 | − int max_dotclk = to_i915(connector->dev)->max_dotclk_freq; | |
| 1350 | + int max_dotclk = to_i915(connector->dev)->display.cdclk.max_dotclk_freq; | |
| 1289 | 1351 | int max_rate, mode_rate, max_lanes, max_link_clock; |
| 1290 | 1352 | int ret; |
| 1291 | 1353 | bool dsc = false, bigjoiner = false; |
| @@ -1302,8 +1364,13 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, · 10 unmodified lines | ||
| 1302 | 1364 | if (*status != MODE_OK) |
| 1303 | 1365 | return 0; |
| 1304 | 1366 | |
| 1305 | − if (mode->flags & DRM_MODE_FLAG_DBLSCAN) { | |
| 1306 | − *status = MODE_NO_DBLESCAN; | |
| 1367 | + if (mode->flags & DRM_MODE_FLAG_DBLCLK) { | |
| 1368 | + *status = MODE_H_ILLEGAL; | |
| 1369 | + return 0; | |
| 1370 | + } | |
| 1371 | + | |
| 1372 | + if (mode->clock < 10000) { | |
| 1373 | + *status = MODE_CLOCK_LOW; | |
| 1307 | 1374 | return 0; |
| 1308 | 1375 | } |
| 1309 | 1376 | |
| @@ -1314,10 +1381,6 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, · 4 unmodified lines | ||
| 1314 | 1381 | max_link_clock, max_lanes); |
| 1315 | 1382 | mode_rate = intel_dp_link_required(mode->clock, min_bpp); |
| 1316 | 1383 | |
| 1317 | − ret = drm_modeset_lock(&mgr->base.lock, ctx); | |
| 1318 | − if (ret) | |
| 1319 | − return ret; | |
| 1320 | − | |
| 1321 | 1384 | /* |
| 1322 | 1385 | * TODO: |
| 1323 | 1386 | * - Also check if compression would allow for the mode |
| @@ -1330,32 +1393,23 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, · 6 unmodified lines | ||
| 1330 | 1393 | * corresponding link capabilities of the sink) in case the |
| 1331 | 1394 | * stream is uncompressed for it by the last branch device. |
| 1332 | 1395 | */ |
| 1333 | − if (mode_rate > max_rate || mode->clock > max_dotclk || | |
| 1334 | − drm_dp_calc_pbn_mode(mode->clock, min_bpp << 4) > port->full_pbn) { | |
| 1335 | − *status = MODE_CLOCK_HIGH; | |
| 1336 | − return 0; | |
| 1337 | − } | |
| 1338 | − | |
| 1339 | − if (mode->clock < 10000) { | |
| 1340 | − *status = MODE_CLOCK_LOW; | |
| 1341 | − return 0; | |
| 1342 | − } | |
| 1343 | − | |
| 1344 | − if (mode->flags & DRM_MODE_FLAG_DBLCLK) { | |
| 1345 | − *status = MODE_H_ILLEGAL; | |
| 1346 | − return 0; | |
| 1347 | − } | |
| 1348 | − | |
| 1349 | − if (intel_dp_need_bigjoiner(intel_dp, mode->hdisplay, target_clock)) { | |
| 1396 | + if (intel_dp_need_bigjoiner(intel_dp, intel_connector, | |
| 1397 | + mode->hdisplay, target_clock)) { | |
| 1350 | 1398 | bigjoiner = true; |
| 1351 | 1399 | max_dotclk *= 2; |
| 1400 | + } | |
| 1352 | 1401 | |
| 1353 | − /* TODO: add support for bigjoiner */ | |
| 1402 | + ret = drm_modeset_lock(&mgr->base.lock, ctx); | |
| 1403 | + if (ret) | |
| 1404 | + return ret; | |
| 1405 | + | |
| 1406 | + if (mode_rate > max_rate || mode->clock > max_dotclk || | |
| 1407 | + drm_dp_calc_pbn_mode(mode->clock, min_bpp << 4) > port->full_pbn) { | |
| 1354 | 1408 | *status = MODE_CLOCK_HIGH; |
| 1355 | 1409 | return 0; |
| 1356 | 1410 | } |
| 1357 | 1411 | |
| 1358 | − if (DISPLAY_VER(dev_priv) >= 10 && | |
| 1412 | + if (HAS_DSC_MST(dev_priv) && | |
| 1359 | 1413 | drm_dp_sink_supports_dsc(intel_connector->dp.dsc_dpcd)) { |
| 1360 | 1414 | /* |
| 1361 | 1415 | * TBD pass the connector BPC, |
| @@ -1383,11 +1437,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, · 21 unmodified lines | ||
| 1383 | 1437 | dsc = dsc_max_compressed_bpp && dsc_slice_count; |
| 1384 | 1438 | } |
| 1385 | 1439 | |
| 1386 | − /* | |
| 1387 | − * Big joiner configuration needs DSC for TGL which is not true for | |
| 1388 | − * XE_LPD where uncompressed joiner is supported. | |
| 1389 | − */ | |
| 1390 | − if (DISPLAY_VER(dev_priv) < 13 && bigjoiner && !dsc) { | |
| 1440 | + if (intel_dp_joiner_needs_dsc(dev_priv, bigjoiner) && !dsc) { | |
| 1391 | 1441 | *status = MODE_CLOCK_HIGH; |
| 1392 | 1442 | return 0; |
| 1393 | 1443 | } |
| @@ -1397,7 +1447,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, · 3 unmodified lines | ||
| 1397 | 1447 | return 0; |
| 1398 | 1448 | } |
| 1399 | 1449 | |
| 1400 | − *status = intel_mode_valid_max_plane_size(dev_priv, mode, false); | |
| 1450 | + *status = intel_mode_valid_max_plane_size(dev_priv, mode, bigjoiner); | |
| 1401 | 1451 | return 0; |
| 1402 | 1452 | } |
| 1403 | 1453 | |
| @@ -348,7 +348,7 @@ void intel_dp_tunnel_resume(struct intel_dp *intel_dp, · 347 unmodified lines | ||
| 348 | 348 | |
| 349 | 349 | out_err: |
| 350 | 350 | drm_dbg_kms(&i915->drm, |
| 351 | − "[DPTUN %s][CONNECTOR:%d:%s][ENCODER:%d:%s] Tunnel can't be resumed, will drop and redect it (err %pe)\n", | |
| 351 | + "[DPTUN %s][CONNECTOR:%d:%s][ENCODER:%d:%s] Tunnel can't be resumed, will drop and reject it (err %pe)\n", | |
| 352 | 352 | drm_dp_tunnel_name(intel_dp->tunnel), |
| 353 | 353 | connector->base.base.id, connector->base.name, |
| 354 | 354 | encoder->base.base.id, encoder->base.name, |
| @@ -399,11 +399,8 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv, · 398 unmodified lines | ||
| 399 | 399 | * The flag should get set in 100us according to the HW team, but |
| 400 | 400 | * use 1ms due to occasional timeouts observed with that. |
| 401 | 401 | */ |
| 402 | − if (intel_wait_for_register_fw(&dev_priv->uncore, | |
| 403 | − BXT_PORT_CL1CM_DW0(phy), | |
| 404 | − PHY_RESERVED | PHY_POWER_GOOD, | |
| 405 | − PHY_POWER_GOOD, | |
| 406 | − 1)) | |
| 402 | + if (intel_de_wait_fw(dev_priv, BXT_PORT_CL1CM_DW0(phy), | |
| 403 | + PHY_RESERVED | PHY_POWER_GOOD, PHY_POWER_GOOD, 1)) | |
| 407 | 404 | drm_err(&dev_priv->drm, "timeout during PHY%d power on\n", |
| 408 | 405 | phy); |
| 409 | 406 | |
| @@ -107,7 +107,7 @@ struct intel_dpll_mgr { · 106 unmodified lines | ||
| 107 | 107 | struct intel_crtc *crtc, |
| 108 | 108 | struct intel_encoder *encoder); |
| 109 | 109 | void (*update_ref_clks)(struct drm_i915_private *i915); |
| 110 | − void (*dump_hw_state)(struct drm_i915_private *i915, | |
| 110 | + void (*dump_hw_state)(struct drm_printer *p, | |
| 111 | 111 | const struct intel_dpll_hw_state *hw_state); |
| 112 | 112 | bool (*compare_hw_state)(const struct intel_dpll_hw_state *a, |
| 113 | 113 | const struct intel_dpll_hw_state *b); |
| @@ -634,16 +634,15 @@ static int ibx_get_dpll(struct intel_atomic_state *state, · 520 unmodified lines | ||
| 634 | 634 | return 0; |
| 635 | 635 | } |
| 636 | 636 | |
| 637 | −static void ibx_dump_hw_state(struct drm_i915_private *i915, | |
| 637 | +static void ibx_dump_hw_state(struct drm_printer *p, | |
| 638 | 638 | const struct intel_dpll_hw_state *hw_state) |
| 639 | 639 | { |
| 640 | − drm_dbg_kms(&i915->drm, | |
| 641 | − "dpll_hw_state: dpll: 0x%x, dpll_md: 0x%x, " | |
| 642 | − "fp0: 0x%x, fp1: 0x%x\n", | |
| 643 | − hw_state->dpll, | |
| 644 | − hw_state->dpll_md, | |
| 645 | − hw_state->fp0, | |
| 646 | − hw_state->fp1); | |
| 640 | + drm_printf(p, "dpll_hw_state: dpll: 0x%x, dpll_md: 0x%x, " | |
| 641 | + "fp0: 0x%x, fp1: 0x%x\n", | |
| 642 | + hw_state->dpll, | |
| 643 | + hw_state->dpll_md, | |
| 644 | + hw_state->fp0, | |
| 645 | + hw_state->fp1); | |
| 647 | 646 | } |
| 648 | 647 | |
| 649 | 648 | static bool ibx_compare_hw_state(const struct intel_dpll_hw_state *a, |
| @@ -1225,11 +1224,11 @@ static void hsw_update_dpll_ref_clks(struct drm_i915_private *i915) · 575 unmodified lines | ||
| 1225 | 1224 | i915->display.dpll.ref_clks.nssc = 135000; |
| 1226 | 1225 | } |
| 1227 | 1226 | |
| 1228 | −static void hsw_dump_hw_state(struct drm_i915_private *i915, | |
| 1227 | +static void hsw_dump_hw_state(struct drm_printer *p, | |
| 1229 | 1228 | const struct intel_dpll_hw_state *hw_state) |
| 1230 | 1229 | { |
| 1231 | − drm_dbg_kms(&i915->drm, "dpll_hw_state: wrpll: 0x%x spll: 0x%x\n", | |
| 1232 | − hw_state->wrpll, hw_state->spll); | |
| 1230 | + drm_printf(p, "dpll_hw_state: wrpll: 0x%x spll: 0x%x\n", | |
| 1231 | + hw_state->wrpll, hw_state->spll); | |
| 1233 | 1232 | } |
| 1234 | 1233 | |
| 1235 | 1234 | static bool hsw_compare_hw_state(const struct intel_dpll_hw_state *a, |
| @@ -1939,14 +1938,11 @@ static void skl_update_dpll_ref_clks(struct drm_i915_private *i915) · 703 unmodified lines | ||
| 1939 | 1938 | i915->display.dpll.ref_clks.nssc = i915->display.cdclk.hw.ref; |
| 1940 | 1939 | } |
| 1941 | 1940 | |
| 1942 | −static void skl_dump_hw_state(struct drm_i915_private *i915, | |
| 1941 | +static void skl_dump_hw_state(struct drm_printer *p, | |
| 1943 | 1942 | const struct intel_dpll_hw_state *hw_state) |
| 1944 | 1943 | { |
| 1945 | − drm_dbg_kms(&i915->drm, "dpll_hw_state: " | |
| 1946 | − "ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n", | |
| 1947 | − hw_state->ctrl1, | |
| 1948 | − hw_state->cfgcr1, | |
| 1949 | − hw_state->cfgcr2); | |
| 1944 | + drm_printf(p, "dpll_hw_state: ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n", | |
| 1945 | + hw_state->ctrl1, hw_state->cfgcr1, hw_state->cfgcr2); | |
| 1950 | 1946 | } |
| 1951 | 1947 | |
| 1952 | 1948 | static bool skl_compare_hw_state(const struct intel_dpll_hw_state *a, |
| @@ -2402,23 +2398,16 @@ static void bxt_update_dpll_ref_clks(struct drm_i915_private *i915) · 449 unmodified lines | ||
| 2402 | 2398 | /* DSI non-SSC ref 19.2MHz */ |
| 2403 | 2399 | } |
| 2404 | 2400 | |
| 2405 | −static void bxt_dump_hw_state(struct drm_i915_private *i915, | |
| 2401 | +static void bxt_dump_hw_state(struct drm_printer *p, | |
| 2406 | 2402 | const struct intel_dpll_hw_state *hw_state) |
| 2407 | 2403 | { |
| 2408 | − drm_dbg_kms(&i915->drm, "dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x," | |
| 2409 | − "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, " | |
| 2410 | − "pll6: 0x%x, pll8: 0x%x, pll9: 0x%x, pll10: 0x%x, pcsdw12: 0x%x\n", | |
| 2411 | − hw_state->ebb0, | |
| 2412 | − hw_state->ebb4, | |
| 2413 | − hw_state->pll0, | |
| 2414 | − hw_state->pll1, | |
| 2415 | − hw_state->pll2, | |
| 2416 | − hw_state->pll3, | |
| 2417 | − hw_state->pll6, | |
| 2418 | − hw_state->pll8, | |
| 2419 | − hw_state->pll9, | |
| 2420 | − hw_state->pll10, | |
| 2421 | − hw_state->pcsdw12); | |
| 2404 | + drm_printf(p, "dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x," | |
| 2405 | + "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, " | |
| 2406 | + "pll6: 0x%x, pll8: 0x%x, pll9: 0x%x, pll10: 0x%x, pcsdw12: 0x%x\n", | |
| 2407 | + hw_state->ebb0, hw_state->ebb4, | |
| 2408 | + hw_state->pll0, hw_state->pll1, hw_state->pll2, hw_state->pll3, | |
| 2409 | + hw_state->pll6, hw_state->pll8, hw_state->pll9, hw_state->pll10, | |
| 2410 | + hw_state->pcsdw12); | |
| 2422 | 2411 | } |
| 2423 | 2412 | |
| 2424 | 2413 | static bool bxt_compare_hw_state(const struct intel_dpll_hw_state *a, |
| @@ -3389,7 +3378,6 @@ static int icl_get_tc_phy_dplls(struct intel_atomic_state *state, · 964 unmodified lines | ||
| 3389 | 3378 | struct intel_crtc *crtc, |
| 3390 | 3379 | struct intel_encoder *encoder) |
| 3391 | 3380 | { |
| 3392 | − struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3393 | 3381 | struct intel_crtc_state *crtc_state = |
| 3394 | 3382 | intel_atomic_get_new_crtc_state(state, crtc); |
| 3395 | 3383 | struct icl_port_dpll *port_dpll = |
| @@ -3408,8 +3396,7 @@ static int icl_get_tc_phy_dplls(struct intel_atomic_state *state, · 12 unmodified lines | ||
| 3408 | 3396 | |
| 3409 | 3397 | |
| 3410 | 3398 | port_dpll = &crtc_state->icl_port_dplls[ICL_PORT_DPLL_MG_PHY]; |
| 3411 | − dpll_id = icl_tc_port_to_pll_id(intel_port_to_tc(i915, | |
| 3412 | − encoder->port)); | |
| 3399 | + dpll_id = icl_tc_port_to_pll_id(intel_encoder_to_tc(encoder)); | |
| 3413 | 3400 | port_dpll->pll = intel_find_shared_dpll(state, crtc, |
| 3414 | 3401 | &port_dpll->hw_state, |
| 3415 | 3402 | BIT(dpll_id)); |
| @@ -3435,15 +3422,12 @@ static int icl_compute_dplls(struct intel_atomic_state *state, · 19 unmodified lines | ||
| 3435 | 3422 | struct intel_crtc *crtc, |
| 3436 | 3423 | struct intel_encoder *encoder) |
| 3437 | 3424 | { |
| 3438 | − struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3439 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 3440 | − | |
| 3441 | − if (intel_phy_is_combo(i915, phy)) | |
| 3425 | + if (intel_encoder_is_combo(encoder)) | |
| 3442 | 3426 | return icl_compute_combo_phy_dpll(state, crtc); |
| 3443 | − else if (intel_phy_is_tc(i915, phy)) | |
| 3427 | + else if (intel_encoder_is_tc(encoder)) | |
| 3444 | 3428 | return icl_compute_tc_phy_dplls(state, crtc); |
| 3445 | 3429 | |
| 3446 | − MISSING_CASE(phy); | |
| 3430 | + MISSING_CASE(encoder->port); | |
| 3447 | 3431 | |
| 3448 | 3432 | return 0; |
| 3449 | 3433 | } |
| @@ -3452,15 +3436,12 @@ static int icl_get_dplls(struct intel_atomic_state *state, · 2 unmodified lines | ||
| 3452 | 3436 | struct intel_crtc *crtc, |
| 3453 | 3437 | struct intel_encoder *encoder) |
| 3454 | 3438 | { |
| 3455 | − struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3456 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 3457 | − | |
| 3458 | − if (intel_phy_is_combo(i915, phy)) | |
| 3439 | + if (intel_encoder_is_combo(encoder)) | |
| 3459 | 3440 | return icl_get_combo_phy_dpll(state, crtc, encoder); |
| 3460 | − else if (intel_phy_is_tc(i915, phy)) | |
| 3441 | + else if (intel_encoder_is_tc(encoder)) | |
| 3461 | 3442 | return icl_get_tc_phy_dplls(state, crtc, encoder); |
| 3462 | 3443 | |
| 3463 | − MISSING_CASE(phy); | |
| 3444 | + MISSING_CASE(encoder->port); | |
| 3464 | 3445 | |
| 3465 | 3446 | return -EINVAL; |
| 3466 | 3447 | } |
| @@ -4026,28 +4007,26 @@ static void icl_update_dpll_ref_clks(struct drm_i915_private *i915) · 559 unmodified lines | ||
| 4026 | 4007 | i915->display.dpll.ref_clks.nssc = i915->display.cdclk.hw.ref; |
| 4027 | 4008 | } |
| 4028 | 4009 | |
| 4029 | −static void icl_dump_hw_state(struct drm_i915_private *i915, | |
| 4010 | +static void icl_dump_hw_state(struct drm_printer *p, | |
| 4030 | 4011 | const struct intel_dpll_hw_state *hw_state) |
| 4031 | 4012 | { |
| 4032 | − drm_dbg_kms(&i915->drm, | |
| 4033 | − "dpll_hw_state: cfgcr0: 0x%x, cfgcr1: 0x%x, div0: 0x%x, " | |
| 4034 | − "mg_refclkin_ctl: 0x%x, hg_clktop2_coreclkctl1: 0x%x, " | |
| 4035 | − "mg_clktop2_hsclkctl: 0x%x, mg_pll_div0: 0x%x, " | |
| 4036 | − "mg_pll_div2: 0x%x, mg_pll_lf: 0x%x, " | |
| 4037 | − "mg_pll_frac_lock: 0x%x, mg_pll_ssc: 0x%x, " | |
| 4038 | − "mg_pll_bias: 0x%x, mg_pll_tdc_coldst_bias: 0x%x\n", | |
| 4039 | − hw_state->cfgcr0, hw_state->cfgcr1, | |
| 4040 | − hw_state->div0, | |
| 4041 | − hw_state->mg_refclkin_ctl, | |
| 4042 | − hw_state->mg_clktop2_coreclkctl1, | |
| 4043 | − hw_state->mg_clktop2_hsclkctl, | |
| 4044 | − hw_state->mg_pll_div0, | |
| 4045 | − hw_state->mg_pll_div1, | |
| 4046 | − hw_state->mg_pll_lf, | |
| 4047 | − hw_state->mg_pll_frac_lock, | |
| 4048 | − hw_state->mg_pll_ssc, | |
| 4049 | − hw_state->mg_pll_bias, | |
| 4050 | − hw_state->mg_pll_tdc_coldst_bias); | |
| 4013 | + drm_printf(p, "dpll_hw_state: cfgcr0: 0x%x, cfgcr1: 0x%x, div0: 0x%x, " | |
| 4014 | + "mg_refclkin_ctl: 0x%x, hg_clktop2_coreclkctl1: 0x%x, " | |
| 4015 | + "mg_clktop2_hsclkctl: 0x%x, mg_pll_div0: 0x%x, " | |
| 4016 | + "mg_pll_div2: 0x%x, mg_pll_lf: 0x%x, " | |
| 4017 | + "mg_pll_frac_lock: 0x%x, mg_pll_ssc: 0x%x, " | |
| 4018 | + "mg_pll_bias: 0x%x, mg_pll_tdc_coldst_bias: 0x%x\n", | |
| 4019 | + hw_state->cfgcr0, hw_state->cfgcr1, hw_state->div0, | |
| 4020 | + hw_state->mg_refclkin_ctl, | |
| 4021 | + hw_state->mg_clktop2_coreclkctl1, | |
| 4022 | + hw_state->mg_clktop2_hsclkctl, | |
| 4023 | + hw_state->mg_pll_div0, | |
| 4024 | + hw_state->mg_pll_div1, | |
| 4025 | + hw_state->mg_pll_lf, | |
| 4026 | + hw_state->mg_pll_frac_lock, | |
| 4027 | + hw_state->mg_pll_ssc, | |
| 4028 | + hw_state->mg_pll_bias, | |
| 4029 | + hw_state->mg_pll_tdc_coldst_bias); | |
| 4051 | 4030 | } |
| 4052 | 4031 | |
| 4053 | 4032 | static bool icl_compare_hw_state(const struct intel_dpll_hw_state *a, |
| @@ -4514,22 +4493,24 @@ void intel_dpll_sanitize_state(struct drm_i915_private *i915) · 460 unmodified lines | ||
| 4514 | 4493 | } |
| 4515 | 4494 | |
| 4516 | 4495 | /** |
| 4517 | − * intel_dpll_dump_hw_state - write hw_state to dmesg | |
| 4496 | + * intel_dpll_dump_hw_state - dump hw_state | |
| 4518 | 4497 | * @i915: i915 drm device |
| 4519 | − * @hw_state: hw state to be written to the log | |
| 4498 | + * @p: where to print the state to | |
| 4499 | + * @hw_state: hw state to be dumped | |
| 4520 | 4500 | * |
| 4521 | − * Write the relevant values in @hw_state to dmesg using drm_dbg_kms. | |
| 4501 | + * Dumo out the relevant values in @hw_state. | |
| 4522 | 4502 | */ |
| 4523 | 4503 | void intel_dpll_dump_hw_state(struct drm_i915_private *i915, |
| 4504 | + struct drm_printer *p, | |
| 4524 | 4505 | const struct intel_dpll_hw_state *hw_state) |
| 4525 | 4506 | { |
| 4526 | 4507 | if (i915->display.dpll.mgr) { |
| 4527 | − i915->display.dpll.mgr->dump_hw_state(i915, hw_state); | |
| 4508 | + i915->display.dpll.mgr->dump_hw_state(p, hw_state); | |
| 4528 | 4509 | } else { |
| 4529 | 4510 | /* fallback for platforms that don't use the shared dpll |
| 4530 | 4511 | * infrastructure |
| 4531 | 4512 | */ |
| 4532 | − ibx_dump_hw_state(i915, hw_state); | |
| 4513 | + ibx_dump_hw_state(p, hw_state); | |
| 4533 | 4514 | } |
| 4534 | 4515 | } |
| 4535 | 4516 | |
| @@ -36,6 +36,7 @@ · 35 unmodified lines | ||
| 36 | 36 | |
| 37 | 37 | enum tc_port; |
| 38 | 38 | struct drm_i915_private; |
| 39 | +struct drm_printer; | |
| 39 | 40 | struct intel_atomic_state; |
| 40 | 41 | struct intel_crtc; |
| 41 | 42 | struct intel_crtc_state; |
| @@ -377,6 +378,7 @@ void intel_dpll_readout_hw_state(struct drm_i915_private *i915); · 335 unmodified lines | ||
| 377 | 378 | void intel_dpll_sanitize_state(struct drm_i915_private *i915); |
| 378 | 379 | |
| 379 | 380 | void intel_dpll_dump_hw_state(struct drm_i915_private *i915, |
| 381 | + struct drm_printer *p, | |
| 380 | 382 | const struct intel_dpll_hw_state *hw_state); |
| 381 | 383 | bool intel_dpll_compare_hw_state(struct drm_i915_private *i915, |
| 382 | 384 | const struct intel_dpll_hw_state *a, |
| @@ -343,12 +343,13 @@ static int intel_dsb_dewake_scanline(const struct intel_crtc_state *crtc_state) · 342 unmodified lines | ||
| 343 | 343 | static u32 dsb_chicken(struct intel_crtc *crtc) |
| 344 | 344 | { |
| 345 | 345 | if (crtc->mode_flags & I915_MODE_FLAG_VRR) |
| 346 | − return DSB_CTRL_WAIT_SAFE_WINDOW | | |
| 346 | + return DSB_SKIP_WAITS_EN | | |
| 347 | + DSB_CTRL_WAIT_SAFE_WINDOW | | |
| 347 | 348 | DSB_CTRL_NO_WAIT_VBLANK | |
| 348 | 349 | DSB_INST_WAIT_SAFE_WINDOW | |
| 349 | 350 | DSB_INST_NO_WAIT_VBLANK; |
| 350 | 351 | else |
| 351 | − return 0; | |
| 352 | + return DSB_SKIP_WAITS_EN; | |
| 352 | 353 | } |
| 353 | 354 | |
| 354 | 355 | static void _intel_dsb_commit(struct intel_dsb *dsb, u32 ctrl, |
| @@ -64,14 +64,11 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector, · 63 unmodified lines | ||
| 64 | 64 | struct intel_connector *intel_connector = to_intel_connector(connector); |
| 65 | 65 | const struct drm_display_mode *fixed_mode = |
| 66 | 66 | intel_panel_fixed_mode(intel_connector, mode); |
| 67 | − int max_dotclk = to_i915(connector->dev)->max_dotclk_freq; | |
| 67 | + int max_dotclk = to_i915(connector->dev)->display.cdclk.max_dotclk_freq; | |
| 68 | 68 | enum drm_mode_status status; |
| 69 | 69 | |
| 70 | 70 | drm_dbg_kms(&dev_priv->drm, "\n"); |
| 71 | 71 | |
| 72 | − if (mode->flags & DRM_MODE_FLAG_DBLSCAN) | |
| 73 | − return MODE_NO_DBLESCAN; | |
| 74 | − | |
| 75 | 72 | status = intel_panel_mode_valid(intel_connector, mode); |
| 76 | 73 | if (status != MODE_OK) |
| 77 | 74 | return status; |
| @@ -223,7 +223,7 @@ intel_dvo_mode_valid(struct drm_connector *_connector, · 222 unmodified lines | ||
| 223 | 223 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
| 224 | 224 | const struct drm_display_mode *fixed_mode = |
| 225 | 225 | intel_panel_fixed_mode(connector, mode); |
| 226 | − int max_dotclk = to_i915(connector->base.dev)->max_dotclk_freq; | |
| 226 | + int max_dotclk = to_i915(connector->base.dev)->display.cdclk.max_dotclk_freq; | |
| 227 | 227 | int target_clock = mode->clock; |
| 228 | 228 | enum drm_mode_status status; |
| 229 | 229 | |
| @@ -231,9 +231,6 @@ intel_dvo_mode_valid(struct drm_connector *_connector, · 1 unmodified line | ||
| 231 | 231 | if (status != MODE_OK) |
| 232 | 232 | return status; |
| 233 | 233 | |
| 234 | − if (mode->flags & DRM_MODE_FLAG_DBLSCAN) | |
| 235 | − return MODE_NO_DBLESCAN; | |
| 236 | − | |
| 237 | 234 | /* XXX: Validate clock range */ |
| 238 | 235 | |
| 239 | 236 | if (fixed_mode) { |
| @@ -1106,7 +1106,7 @@ static int intel_fb_offset_to_xy(int *x, int *y, · 1105 unmodified lines | ||
| 1106 | 1106 | { |
| 1107 | 1107 | struct drm_i915_private *i915 = to_i915(fb->dev); |
| 1108 | 1108 | unsigned int height; |
| 1109 | − u32 alignment; | |
| 1109 | + u32 alignment, unused; | |
| 1110 | 1110 | |
| 1111 | 1111 | if (DISPLAY_VER(i915) >= 12 && |
| 1112 | 1112 | !intel_fb_needs_pot_stride_remap(to_intel_framebuffer(fb)) && |
| @@ -1128,8 +1128,8 @@ static int intel_fb_offset_to_xy(int *x, int *y, · 15 unmodified lines | ||
| 1128 | 1128 | height = ALIGN(height, intel_tile_height(fb, color_plane)); |
| 1129 | 1129 | |
| 1130 | 1130 | /* Catch potential overflows early */ |
| 1131 | − if (add_overflows_t(u32, mul_u32_u32(height, fb->pitches[color_plane]), | |
| 1132 | − fb->offsets[color_plane])) { | |
| 1131 | + if (check_add_overflow(mul_u32_u32(height, fb->pitches[color_plane]), | |
| 1132 | + fb->offsets[color_plane], &unused)) { | |
| 1133 | 1133 | drm_dbg_kms(&i915->drm, |
| 1134 | 1134 | "Bad offset 0x%08x or pitch %d for color plane %d\n", |
| 1135 | 1135 | fb->offsets[color_plane], fb->pitches[color_plane], |
| @@ -826,10 +826,36 @@ static void intel_fbc_program_cfb(struct intel_fbc *fbc) · 825 unmodified lines | ||
| 826 | 826 | |
| 827 | 827 | static void intel_fbc_program_workarounds(struct intel_fbc *fbc) |
| 828 | 828 | { |
| 829 | + struct drm_i915_private *i915 = fbc->i915; | |
| 830 | + | |
| 831 | + if (IS_SKYLAKE(i915) || IS_BROXTON(i915)) { | |
| 832 | + /* | |
| 833 | + * WaFbcHighMemBwCorruptionAvoidance:skl,bxt | |
| 834 | + * Display WA #0883: skl,bxt | |
| 835 | + */ | |
| 836 | + intel_de_rmw(i915, ILK_DPFC_CHICKEN(fbc->id), | |
| 837 | + 0, DPFC_DISABLE_DUMMY0); | |
| 838 | + } | |
| 839 | + | |
| 840 | + if (IS_SKYLAKE(i915) || IS_KABYLAKE(i915) || | |
| 841 | + IS_COFFEELAKE(i915) || IS_COMETLAKE(i915)) { | |
| 842 | + /* | |
| 843 | + * WaFbcNukeOnHostModify:skl,kbl,cfl | |
| 844 | + * Display WA #0873: skl,kbl,cfl | |
| 845 | + */ | |
| 846 | + intel_de_rmw(i915, ILK_DPFC_CHICKEN(fbc->id), | |
| 847 | + 0, DPFC_NUKE_ON_ANY_MODIFICATION); | |
| 848 | + } | |
| 849 | + | |
| 850 | + /* Wa_1409120013:icl,jsl,tgl,dg1 */ | |
| 851 | + if (IS_DISPLAY_VER(i915, 11, 12)) | |
| 852 | + intel_de_rmw(i915, ILK_DPFC_CHICKEN(fbc->id), | |
| 853 | + 0, DPFC_CHICKEN_COMP_DUMMY_PIXEL); | |
| 854 | + | |
| 829 | 855 | /* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,adlp,mtl */ |
| 830 | − if (DISPLAY_VER(fbc->i915) >= 11 && !IS_DG2(fbc->i915)) | |
| 831 | − intel_de_rmw(fbc->i915, ILK_DPFC_CHICKEN(fbc->id), 0, | |
| 832 | − DPFC_CHICKEN_FORCE_SLB_INVALIDATION); | |
| 856 | + if (DISPLAY_VER(i915) >= 11 && !IS_DG2(i915)) | |
| 857 | + intel_de_rmw(i915, ILK_DPFC_CHICKEN(fbc->id), | |
| 858 | + 0, DPFC_CHICKEN_FORCE_SLB_INVALIDATION); | |
| 833 | 859 | } |
| 834 | 860 | |
| 835 | 861 | static void __intel_fbc_cleanup_cfb(struct intel_fbc *fbc) |
| @@ -135,6 +135,9 @@ static int intel_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma) · 134 unmodified lines | ||
| 135 | 135 | return i915_gem_fb_mmap(obj, vma); |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | +__diag_push(); | |
| 139 | +__diag_ignore_all("-Woverride-init", "Allow field initialization overrides for fb ops"); | |
| 140 | + | |
| 138 | 141 | static const struct fb_ops intelfb_ops = { |
| 139 | 142 | .owner = THIS_MODULE, |
| 140 | 143 | __FB_DEFAULT_DEFERRED_OPS_RDWR(intel_fbdev), |
| @@ -146,6 +149,8 @@ static const struct fb_ops intelfb_ops = { · 5 unmodified lines | ||
| 146 | 149 | .fb_mmap = intel_fbdev_mmap, |
| 147 | 150 | }; |
| 148 | 151 | |
| 152 | +__diag_pop(); | |
| 153 | + | |
| 149 | 154 | static int intelfb_create(struct drm_fb_helper *helper, |
| 150 | 155 | struct drm_fb_helper_surface_size *sizes) |
| 151 | 156 | { |
File renamed without changes.
| @@ -411,7 +411,7 @@ gmbus_wait_idle(struct drm_i915_private *i915) · 410 unmodified lines | ||
| 411 | 411 | add_wait_queue(&i915->display.gmbus.wait_queue, &wait); |
| 412 | 412 | intel_de_write_fw(i915, GMBUS4(i915), irq_enable); |
| 413 | 413 | |
| 414 | − ret = intel_de_wait_for_register_fw(i915, GMBUS2(i915), GMBUS_ACTIVE, 0, 10); | |
| 414 | + ret = intel_de_wait_fw(i915, GMBUS2(i915), GMBUS_ACTIVE, 0, 10); | |
| 415 | 415 | |
| 416 | 416 | intel_de_write_fw(i915, GMBUS4(i915), 0); |
| 417 | 417 | remove_wait_queue(&i915->display.gmbus.wait_queue, &wait); |
| @@ -369,9 +369,9 @@ static int intel_hdcp_load_keys(struct drm_i915_private *i915) · 368 unmodified lines | ||
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | /* Wait for the keys to load (500us) */ |
| 372 | − ret = __intel_wait_for_register(&i915->uncore, HDCP_KEY_STATUS, | |
| 373 | − HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE, | |
| 374 | − 10, 1, &val); | |
| 372 | + ret = intel_de_wait_custom(i915, HDCP_KEY_STATUS, | |
| 373 | + HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE, | |
| 374 | + 10, 1, &val); | |
| 375 | 375 | if (ret) |
| 376 | 376 | return ret; |
| 377 | 377 | else if (!(val & HDCP_KEY_LOAD_STATUS)) |
| @@ -114,6 +114,8 @@ static u32 g4x_infoframe_enable(unsigned int type) · 113 unmodified lines | ||
| 114 | 114 | return VIDEO_DIP_ENABLE_GAMUT; |
| 115 | 115 | case DP_SDP_VSC: |
| 116 | 116 | return 0; |
| 117 | + case DP_SDP_ADAPTIVE_SYNC: | |
| 118 | + return 0; | |
| 117 | 119 | case HDMI_INFOFRAME_TYPE_AVI: |
| 118 | 120 | return VIDEO_DIP_ENABLE_AVI; |
| 119 | 121 | case HDMI_INFOFRAME_TYPE_SPD: |
| @@ -137,6 +139,8 @@ static u32 hsw_infoframe_enable(unsigned int type) · 17 unmodified lines | ||
| 137 | 139 | return VIDEO_DIP_ENABLE_GMP_HSW; |
| 138 | 140 | case DP_SDP_VSC: |
| 139 | 141 | return VIDEO_DIP_ENABLE_VSC_HSW; |
| 142 | + case DP_SDP_ADAPTIVE_SYNC: | |
| 143 | + return VIDEO_DIP_ENABLE_AS_ADL; | |
| 140 | 144 | case DP_SDP_PPS: |
| 141 | 145 | return VDIP_ENABLE_PPS; |
| 142 | 146 | case HDMI_INFOFRAME_TYPE_AVI: |
| @@ -164,6 +168,8 @@ hsw_dip_data_reg(struct drm_i915_private *dev_priv, · 21 unmodified lines | ||
| 164 | 168 | return HSW_TVIDEO_DIP_GMP_DATA(cpu_transcoder, i); |
| 165 | 169 | case DP_SDP_VSC: |
| 166 | 170 | return HSW_TVIDEO_DIP_VSC_DATA(cpu_transcoder, i); |
| 171 | + case DP_SDP_ADAPTIVE_SYNC: | |
| 172 | + return ADL_TVIDEO_DIP_AS_SDP_DATA(cpu_transcoder, i); | |
| 167 | 173 | case DP_SDP_PPS: |
| 168 | 174 | return ICL_VIDEO_DIP_PPS_DATA(cpu_transcoder, i); |
| 169 | 175 | case HDMI_INFOFRAME_TYPE_AVI: |
| @@ -186,6 +192,8 @@ static int hsw_dip_data_size(struct drm_i915_private *dev_priv, · 16 unmodified lines | ||
| 186 | 192 | switch (type) { |
| 187 | 193 | case DP_SDP_VSC: |
| 188 | 194 | return VIDEO_DIP_VSC_DATA_SIZE; |
| 195 | + case DP_SDP_ADAPTIVE_SYNC: | |
| 196 | + return VIDEO_DIP_ASYNC_DATA_SIZE; | |
| 189 | 197 | case DP_SDP_PPS: |
| 190 | 198 | return VIDEO_DIP_PPS_DATA_SIZE; |
| 191 | 199 | case HDMI_PACKET_TYPE_GAMUT_METADATA: |
| @@ -563,6 +571,9 @@ static u32 hsw_infoframes_enabled(struct intel_encoder *encoder, · 371 unmodified lines | ||
| 563 | 571 | if (DISPLAY_VER(dev_priv) >= 10) |
| 564 | 572 | mask |= VIDEO_DIP_ENABLE_DRM_GLK; |
| 565 | 573 | |
| 574 | + if (HAS_AS_SDP(dev_priv)) | |
| 575 | + mask |= VIDEO_DIP_ENABLE_AS_ADL; | |
| 576 | + | |
| 566 | 577 | return val & mask; |
| 567 | 578 | } |
| 568 | 579 | |
| @@ -570,6 +581,7 @@ static const u8 infoframe_type_to_idx[] = { · 1 unmodified line | ||
| 570 | 581 | HDMI_PACKET_TYPE_GENERAL_CONTROL, |
| 571 | 582 | HDMI_PACKET_TYPE_GAMUT_METADATA, |
| 572 | 583 | DP_SDP_VSC, |
| 584 | + DP_SDP_ADAPTIVE_SYNC, | |
| 573 | 585 | HDMI_INFOFRAME_TYPE_AVI, |
| 574 | 586 | HDMI_INFOFRAME_TYPE_SPD, |
| 575 | 587 | HDMI_INFOFRAME_TYPE_VENDOR, |
| @@ -1212,7 +1224,7 @@ static void hsw_set_infoframes(struct intel_encoder *encoder, · 636 unmodified lines | ||
| 1212 | 1224 | val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW | |
| 1213 | 1225 | VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW | |
| 1214 | 1226 | VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW | |
| 1215 | − VIDEO_DIP_ENABLE_DRM_GLK); | |
| 1227 | + VIDEO_DIP_ENABLE_DRM_GLK | VIDEO_DIP_ENABLE_AS_ADL); | |
| 1216 | 1228 | |
| 1217 | 1229 | if (!enable) { |
| 1218 | 1230 | intel_de_write(dev_priv, reg, val); |
| @@ -1832,7 +1844,7 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, · 613 unmodified lines | ||
| 1832 | 1844 | bool has_hdmi_sink) |
| 1833 | 1845 | { |
| 1834 | 1846 | struct drm_i915_private *dev_priv = intel_hdmi_to_i915(hdmi); |
| 1835 | − enum phy phy = intel_port_to_phy(dev_priv, hdmi_to_dig_port(hdmi)->base.port); | |
| 1847 | + struct intel_encoder *encoder = &hdmi_to_dig_port(hdmi)->base; | |
| 1836 | 1848 | |
| 1837 | 1849 | if (clock < 25000) |
| 1838 | 1850 | return MODE_CLOCK_LOW; |
| @@ -1854,11 +1866,11 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, · 15 unmodified lines | ||
| 1854 | 1866 | return MODE_CLOCK_RANGE; |
| 1855 | 1867 | |
| 1856 | 1868 | /* ICL+ combo PHY PLL can't generate 500-533.2 MHz */ |
| 1857 | − if (intel_phy_is_combo(dev_priv, phy) && clock > 500000 && clock < 533200) | |
| 1869 | + if (intel_encoder_is_combo(encoder) && clock > 500000 && clock < 533200) | |
| 1858 | 1870 | return MODE_CLOCK_RANGE; |
| 1859 | 1871 | |
| 1860 | 1872 | /* ICL+ TC PHY PLL can't generate 500-532.8 MHz */ |
| 1861 | − if (intel_phy_is_tc(dev_priv, phy) && clock > 500000 && clock < 532800) | |
| 1873 | + if (intel_encoder_is_tc(encoder) && clock > 500000 && clock < 532800) | |
| 1862 | 1874 | return MODE_CLOCK_RANGE; |
| 1863 | 1875 | |
| 1864 | 1876 | /* |
| @@ -1981,7 +1993,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector, · 116 unmodified lines | ||
| 1981 | 1993 | struct drm_i915_private *dev_priv = intel_hdmi_to_i915(hdmi); |
| 1982 | 1994 | enum drm_mode_status status; |
| 1983 | 1995 | int clock = mode->clock; |
| 1984 | − int max_dotclk = to_i915(connector->dev)->max_dotclk_freq; | |
| 1996 | + int max_dotclk = to_i915(connector->dev)->display.cdclk.max_dotclk_freq; | |
| 1985 | 1997 | bool has_hdmi_sink = intel_has_hdmi_sink(hdmi, connector->state); |
| 1986 | 1998 | bool ycbcr_420_only; |
| 1987 | 1999 | enum intel_output_format sink_format; |
| @@ -2664,8 +2676,9 @@ bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder, · 676 unmodified lines | ||
| 2664 | 2676 | drm_scdc_set_scrambling(connector, scrambling); |
| 2665 | 2677 | } |
| 2666 | 2678 | |
| 2667 | −static u8 chv_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) | |
| 2679 | +static u8 chv_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2668 | 2680 | { |
| 2681 | + enum port port = encoder->port; | |
| 2669 | 2682 | u8 ddc_pin; |
| 2670 | 2683 | |
| 2671 | 2684 | switch (port) { |
| @@ -2686,8 +2699,9 @@ static u8 chv_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) · 14 unmodified lines | ||
| 2686 | 2699 | return ddc_pin; |
| 2687 | 2700 | } |
| 2688 | 2701 | |
| 2689 | −static u8 bxt_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) | |
| 2702 | +static u8 bxt_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2690 | 2703 | { |
| 2704 | + enum port port = encoder->port; | |
| 2691 | 2705 | u8 ddc_pin; |
| 2692 | 2706 | |
| 2693 | 2707 | switch (port) { |
| @@ -2705,9 +2719,9 @@ static u8 bxt_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) · 11 unmodified lines | ||
| 2705 | 2719 | return ddc_pin; |
| 2706 | 2720 | } |
| 2707 | 2721 | |
| 2708 | −static u8 cnp_port_to_ddc_pin(struct drm_i915_private *dev_priv, | |
| 2709 | − enum port port) | |
| 2722 | +static u8 cnp_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2710 | 2723 | { |
| 2724 | + enum port port = encoder->port; | |
| 2711 | 2725 | u8 ddc_pin; |
| 2712 | 2726 | |
| 2713 | 2727 | switch (port) { |
| @@ -2731,22 +2745,23 @@ static u8 cnp_port_to_ddc_pin(struct drm_i915_private *dev_priv, · 17 unmodified lines | ||
| 2731 | 2745 | return ddc_pin; |
| 2732 | 2746 | } |
| 2733 | 2747 | |
| 2734 | −static u8 icl_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) | |
| 2748 | +static u8 icl_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2735 | 2749 | { |
| 2736 | − enum phy phy = intel_port_to_phy(dev_priv, port); | |
| 2750 | + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); | |
| 2751 | + enum port port = encoder->port; | |
| 2737 | 2752 | |
| 2738 | − if (intel_phy_is_combo(dev_priv, phy)) | |
| 2753 | + if (intel_encoder_is_combo(encoder)) | |
| 2739 | 2754 | return GMBUS_PIN_1_BXT + port; |
| 2740 | − else if (intel_phy_is_tc(dev_priv, phy)) | |
| 2741 | − return GMBUS_PIN_9_TC1_ICP + intel_port_to_tc(dev_priv, port); | |
| 2755 | + else if (intel_encoder_is_tc(encoder)) | |
| 2756 | + return GMBUS_PIN_9_TC1_ICP + intel_encoder_to_tc(encoder); | |
| 2742 | 2757 | |
| 2743 | 2758 | drm_WARN(&dev_priv->drm, 1, "Unknown port:%c\n", port_name(port)); |
| 2744 | 2759 | return GMBUS_PIN_2_BXT; |
| 2745 | 2760 | } |
| 2746 | 2761 | |
| 2747 | −static u8 mcc_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) | |
| 2762 | +static u8 mcc_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2748 | 2763 | { |
| 2749 | − enum phy phy = intel_port_to_phy(dev_priv, port); | |
| 2764 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2750 | 2765 | u8 ddc_pin; |
| 2751 | 2766 | |
| 2752 | 2767 | switch (phy) { |
| @@ -2767,11 +2782,12 @@ static u8 mcc_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) · 14 unmodified lines | ||
| 2767 | 2782 | return ddc_pin; |
| 2768 | 2783 | } |
| 2769 | 2784 | |
| 2770 | −static u8 rkl_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) | |
| 2785 | +static u8 rkl_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2771 | 2786 | { |
| 2772 | − enum phy phy = intel_port_to_phy(dev_priv, port); | |
| 2787 | + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); | |
| 2788 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2773 | 2789 | |
| 2774 | − WARN_ON(port == PORT_C); | |
| 2790 | + WARN_ON(encoder->port == PORT_C); | |
| 2775 | 2791 | |
| 2776 | 2792 | /* |
| 2777 | 2793 | * Pin mapping for RKL depends on which PCH is present. With TGP, the |
| @@ -2785,11 +2801,12 @@ static u8 rkl_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) · 7 unmodified lines | ||
| 2785 | 2801 | return GMBUS_PIN_1_BXT + phy; |
| 2786 | 2802 | } |
| 2787 | 2803 | |
| 2788 | −static u8 gen9bc_tgp_port_to_ddc_pin(struct drm_i915_private *i915, enum port port) | |
| 2804 | +static u8 gen9bc_tgp_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2789 | 2805 | { |
| 2790 | − enum phy phy = intel_port_to_phy(i915, port); | |
| 2806 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 2807 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2791 | 2808 | |
| 2792 | − drm_WARN_ON(&i915->drm, port == PORT_A); | |
| 2809 | + drm_WARN_ON(&i915->drm, encoder->port == PORT_A); | |
| 2793 | 2810 | |
| 2794 | 2811 | /* |
| 2795 | 2812 | * Pin mapping for GEN9 BC depends on which PCH is present. With TGP, |
| @@ -2803,16 +2820,16 @@ static u8 gen9bc_tgp_port_to_ddc_pin(struct drm_i915_private *i915, enum port po · 7 unmodified lines | ||
| 2803 | 2820 | return GMBUS_PIN_1_BXT + phy; |
| 2804 | 2821 | } |
| 2805 | 2822 | |
| 2806 | −static u8 dg1_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) | |
| 2823 | +static u8 dg1_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2807 | 2824 | { |
| 2808 | − return intel_port_to_phy(dev_priv, port) + 1; | |
| 2825 | + return intel_encoder_to_phy(encoder) + 1; | |
| 2809 | 2826 | } |
| 2810 | 2827 | |
| 2811 | −static u8 adls_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) | |
| 2828 | +static u8 adls_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2812 | 2829 | { |
| 2813 | − enum phy phy = intel_port_to_phy(dev_priv, port); | |
| 2830 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 2814 | 2831 | |
| 2815 | − WARN_ON(port == PORT_B || port == PORT_C); | |
| 2832 | + WARN_ON(encoder->port == PORT_B || encoder->port == PORT_C); | |
| 2816 | 2833 | |
| 2817 | 2834 | /* |
| 2818 | 2835 | * Pin mapping for ADL-S requires TC pins for all combo phy outputs |
| @@ -2824,9 +2841,9 @@ static u8 adls_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port · 5 unmodified lines | ||
| 2824 | 2841 | return GMBUS_PIN_9_TC1_ICP + phy - PHY_B; |
| 2825 | 2842 | } |
| 2826 | 2843 | |
| 2827 | −static u8 g4x_port_to_ddc_pin(struct drm_i915_private *dev_priv, | |
| 2828 | − enum port port) | |
| 2844 | +static u8 g4x_encoder_to_ddc_pin(struct intel_encoder *encoder) | |
| 2829 | 2845 | { |
| 2846 | + enum port port = encoder->port; | |
| 2830 | 2847 | u8 ddc_pin; |
| 2831 | 2848 | |
| 2832 | 2849 | switch (port) { |
| @@ -2850,30 +2867,29 @@ static u8 g4x_port_to_ddc_pin(struct drm_i915_private *dev_priv, · 17 unmodified lines | ||
| 2850 | 2867 | static u8 intel_hdmi_default_ddc_pin(struct intel_encoder *encoder) |
| 2851 | 2868 | { |
| 2852 | 2869 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 2853 | − enum port port = encoder->port; | |
| 2854 | 2870 | u8 ddc_pin; |
| 2855 | 2871 | |
| 2856 | 2872 | if (IS_ALDERLAKE_S(dev_priv)) |
| 2857 | − ddc_pin = adls_port_to_ddc_pin(dev_priv, port); | |
| 2873 | + ddc_pin = adls_encoder_to_ddc_pin(encoder); | |
| 2858 | 2874 | else if (INTEL_PCH_TYPE(dev_priv) >= PCH_DG1) |
| 2859 | − ddc_pin = dg1_port_to_ddc_pin(dev_priv, port); | |
| 2875 | + ddc_pin = dg1_encoder_to_ddc_pin(encoder); | |
| 2860 | 2876 | else if (IS_ROCKETLAKE(dev_priv)) |
| 2861 | − ddc_pin = rkl_port_to_ddc_pin(dev_priv, port); | |
| 2877 | + ddc_pin = rkl_encoder_to_ddc_pin(encoder); | |
| 2862 | 2878 | else if (DISPLAY_VER(dev_priv) == 9 && HAS_PCH_TGP(dev_priv)) |
| 2863 | − ddc_pin = gen9bc_tgp_port_to_ddc_pin(dev_priv, port); | |
| 2879 | + ddc_pin = gen9bc_tgp_encoder_to_ddc_pin(encoder); | |
| 2864 | 2880 | else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && |
| 2865 | 2881 | HAS_PCH_TGP(dev_priv)) |
| 2866 | − ddc_pin = mcc_port_to_ddc_pin(dev_priv, port); | |
| 2882 | + ddc_pin = mcc_encoder_to_ddc_pin(encoder); | |
| 2867 | 2883 | else if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) |
| 2868 | − ddc_pin = icl_port_to_ddc_pin(dev_priv, port); | |
| 2884 | + ddc_pin = icl_encoder_to_ddc_pin(encoder); | |
| 2869 | 2885 | else if (HAS_PCH_CNP(dev_priv)) |
| 2870 | − ddc_pin = cnp_port_to_ddc_pin(dev_priv, port); | |
| 2886 | + ddc_pin = cnp_encoder_to_ddc_pin(encoder); | |
| 2871 | 2887 | else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) |
| 2872 | − ddc_pin = bxt_port_to_ddc_pin(dev_priv, port); | |
| 2888 | + ddc_pin = bxt_encoder_to_ddc_pin(encoder); | |
| 2873 | 2889 | else if (IS_CHERRYVIEW(dev_priv)) |
| 2874 | − ddc_pin = chv_port_to_ddc_pin(dev_priv, port); | |
| 2890 | + ddc_pin = chv_encoder_to_ddc_pin(encoder); | |
| 2875 | 2891 | else |
| 2876 | − ddc_pin = g4x_port_to_ddc_pin(dev_priv, port); | |
| 2892 | + ddc_pin = g4x_encoder_to_ddc_pin(encoder); | |
| 2877 | 2893 | |
| 2878 | 2894 | return ddc_pin; |
| 2879 | 2895 | } |
| @@ -1444,7 +1444,7 @@ void intel_hpd_enable_detection(struct intel_encoder *encoder) · 1443 unmodified lines | ||
| 1444 | 1444 | |
| 1445 | 1445 | void intel_hpd_irq_setup(struct drm_i915_private *i915) |
| 1446 | 1446 | { |
| 1447 | − if (i915->display_irqs_enabled && i915->display.funcs.hotplug) | |
| 1447 | + if (i915->display.irq.display_irqs_enabled && i915->display.funcs.hotplug) | |
| 1448 | 1448 | i915->display.funcs.hotplug->hpd_irq_setup(i915); |
| 1449 | 1449 | } |
| 1450 | 1450 | |
| @@ -392,16 +392,13 @@ intel_lvds_mode_valid(struct drm_connector *_connector, · 391 unmodified lines | ||
| 392 | 392 | struct drm_i915_private *i915 = to_i915(connector->base.dev); |
| 393 | 393 | const struct drm_display_mode *fixed_mode = |
| 394 | 394 | intel_panel_fixed_mode(connector, mode); |
| 395 | − int max_pixclk = to_i915(connector->base.dev)->max_dotclk_freq; | |
| 395 | + int max_pixclk = to_i915(connector->base.dev)->display.cdclk.max_dotclk_freq; | |
| 396 | 396 | enum drm_mode_status status; |
| 397 | 397 | |
| 398 | 398 | status = intel_cpu_transcoder_mode_valid(i915, mode); |
| 399 | 399 | if (status != MODE_OK) |
| 400 | 400 | return status; |
| 401 | 401 | |
| 402 | − if (mode->flags & DRM_MODE_FLAG_DBLSCAN) | |
| 403 | − return MODE_NO_DBLESCAN; | |
| 404 | − | |
| 405 | 402 | status = intel_panel_mode_valid(connector, mode); |
| 406 | 403 | if (status != MODE_OK) |
| 407 | 404 | return status; |
| @@ -27,7 +27,6 @@ · 26 unmodified lines | ||
| 27 | 27 | |
| 28 | 28 | #include <linux/acpi.h> |
| 29 | 29 | #include <linux/dmi.h> |
| 30 | −#include <linux/firmware.h> | |
| 31 | 30 | #include <acpi/video.h> |
| 32 | 31 | |
| 33 | 32 | #include <drm/drm_edid.h> |
| @@ -263,7 +262,6 @@ struct intel_opregion { · 229 unmodified lines | ||
| 263 | 262 | struct opregion_asle *asle; |
| 264 | 263 | struct opregion_asle_ext *asle_ext; |
| 265 | 264 | void *rvda; |
| 266 | − void *vbt_firmware; | |
| 267 | 265 | const void *vbt; |
| 268 | 266 | u32 vbt_size; |
| 269 | 267 | struct work_struct asle_work; |
| @@ -869,46 +867,6 @@ static const struct dmi_system_id intel_no_opregion_vbt[] = { · 599 unmodified lines | ||
| 869 | 867 | { } |
| 870 | 868 | }; |
| 871 | 869 | |
| 872 | −static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv) | |
| 873 | −{ | |
| 874 | − struct intel_opregion *opregion = dev_priv->display.opregion; | |
| 875 | − const struct firmware *fw = NULL; | |
| 876 | − const char *name = dev_priv->display.params.vbt_firmware; | |
| 877 | − int ret; | |
| 878 | − | |
| 879 | − if (!name || !*name) | |
| 880 | − return -ENOENT; | |
| 881 | − | |
| 882 | − ret = request_firmware(&fw, name, dev_priv->drm.dev); | |
| 883 | − if (ret) { | |
| 884 | − drm_err(&dev_priv->drm, | |
| 885 | − "Requesting VBT firmware \"%s\" failed (%d)\n", | |
| 886 | − name, ret); | |
| 887 | − return ret; | |
| 888 | − } | |
| 889 | − | |
| 890 | − if (intel_bios_is_valid_vbt(dev_priv, fw->data, fw->size)) { | |
| 891 | − opregion->vbt_firmware = kmemdup(fw->data, fw->size, GFP_KERNEL); | |
| 892 | − if (opregion->vbt_firmware) { | |
| 893 | − drm_dbg_kms(&dev_priv->drm, | |
| 894 | − "Found valid VBT firmware \"%s\"\n", name); | |
| 895 | − opregion->vbt = opregion->vbt_firmware; | |
| 896 | − opregion->vbt_size = fw->size; | |
| 897 | − ret = 0; | |
| 898 | − } else { | |
| 899 | − ret = -ENOMEM; | |
| 900 | − } | |
| 901 | − } else { | |
| 902 | − drm_dbg_kms(&dev_priv->drm, "Invalid VBT firmware \"%s\"\n", | |
| 903 | − name); | |
| 904 | − ret = -EINVAL; | |
| 905 | − } | |
| 906 | − | |
| 907 | − release_firmware(fw); | |
| 908 | − | |
| 909 | − return ret; | |
| 910 | −} | |
| 911 | − | |
| 912 | 870 | int intel_opregion_setup(struct drm_i915_private *dev_priv) |
| 913 | 871 | { |
| 914 | 872 | struct intel_opregion *opregion; |
| @@ -1006,9 +964,6 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) · 91 unmodified lines | ||
| 1006 | 964 | drm_dbg(&dev_priv->drm, "Mailbox #2 for backlight present\n"); |
| 1007 | 965 | } |
| 1008 | 966 | |
| 1009 | − if (intel_load_vbt_firmware(dev_priv) == 0) | |
| 1010 | − goto out; | |
| 1011 | − | |
| 1012 | 967 | if (dmi_check_system(intel_no_opregion_vbt)) |
| 1013 | 968 | goto out; |
| 1014 | 969 | |
| @@ -1176,6 +1131,16 @@ const struct drm_edid *intel_opregion_get_edid(struct intel_connector *intel_con · 161 unmodified lines | ||
| 1176 | 1131 | return drm_edid; |
| 1177 | 1132 | } |
| 1178 | 1133 | |
| 1134 | +bool intel_opregion_vbt_present(struct drm_i915_private *i915) | |
| 1135 | +{ | |
| 1136 | + struct intel_opregion *opregion = i915->display.opregion; | |
| 1137 | + | |
| 1138 | + if (!opregion || !opregion->vbt) | |
| 1139 | + return false; | |
| 1140 | + | |
| 1141 | + return true; | |
| 1142 | +} | |
| 1143 | + | |
| 1179 | 1144 | const void *intel_opregion_get_vbt(struct drm_i915_private *i915, size_t *size) |
| 1180 | 1145 | { |
| 1181 | 1146 | struct intel_opregion *opregion = i915->display.opregion; |
| @@ -1186,7 +1151,7 @@ const void *intel_opregion_get_vbt(struct drm_i915_private *i915, size_t *size) · 4 unmodified lines | ||
| 1186 | 1151 | if (size) |
| 1187 | 1152 | *size = opregion->vbt_size; |
| 1188 | 1153 | |
| 1189 | − return opregion->vbt; | |
| 1154 | + return kmemdup(opregion->vbt, opregion->vbt_size, GFP_KERNEL); | |
| 1190 | 1155 | } |
| 1191 | 1156 | |
| 1192 | 1157 | bool intel_opregion_headless_sku(struct drm_i915_private *i915) |
| @@ -1312,7 +1277,6 @@ void intel_opregion_cleanup(struct drm_i915_private *i915) · 119 unmodified lines | ||
| 1312 | 1277 | memunmap(opregion->header); |
| 1313 | 1278 | if (opregion->rvda) |
| 1314 | 1279 | memunmap(opregion->rvda); |
| 1315 | − kfree(opregion->vbt_firmware); | |
| 1316 | 1280 | kfree(opregion); |
| 1317 | 1281 | i915->display.opregion = NULL; |
| 1318 | 1282 | } |
| @@ -53,6 +53,7 @@ int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv, · 52 unmodified lines | ||
| 53 | 53 | int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv); |
| 54 | 54 | const struct drm_edid *intel_opregion_get_edid(struct intel_connector *connector); |
| 55 | 55 | |
| 56 | +bool intel_opregion_vbt_present(struct drm_i915_private *i915); | |
| 56 | 57 | const void *intel_opregion_get_vbt(struct drm_i915_private *i915, size_t *size); |
| 57 | 58 | |
| 58 | 59 | bool intel_opregion_headless_sku(struct drm_i915_private *i915); |
| @@ -119,6 +120,11 @@ intel_opregion_get_edid(struct intel_connector *connector) · 60 unmodified lines | ||
| 119 | 120 | return NULL; |
| 120 | 121 | } |
| 121 | 122 | |
| 123 | +static inline bool intel_opregion_vbt_present(struct drm_i915_private *i915) | |
| 124 | +{ | |
| 125 | + return false; | |
| 126 | +} | |
| 127 | + | |
| 122 | 128 | static inline const void * |
| 123 | 129 | intel_opregion_get_vbt(struct drm_i915_private *i915, size_t *size) |
| 124 | 130 | { |
| @@ -972,10 +972,11 @@ static int check_overlay_dst(struct intel_overlay *overlay, · 971 unmodified lines | ||
| 972 | 972 | rec->dst_width, rec->dst_height); |
| 973 | 973 | |
| 974 | 974 | clipped = req; |
| 975 | − drm_rect_intersect(&clipped, &crtc_state->pipe_src); | |
| 976 | 975 | |
| 977 | − if (!drm_rect_visible(&clipped) || | |
| 978 | − !drm_rect_equals(&clipped, &req)) | |
| 976 | + if (!drm_rect_intersect(&clipped, &crtc_state->pipe_src)) | |
| 977 | + return -EINVAL; | |
| 978 | + | |
| 979 | + if (!drm_rect_equals(&clipped, &req)) | |
| 979 | 980 | return -EINVAL; |
| 980 | 981 | |
| 981 | 982 | return 0; |
| @@ -119,10 +119,11 @@ intel_pmdemand_update_phys_mask(struct drm_i915_private *i915, · 118 unmodified lines | ||
| 119 | 119 | if (!encoder) |
| 120 | 120 | return; |
| 121 | 121 | |
| 122 | − phy = intel_port_to_phy(i915, encoder->port); | |
| 123 | − if (intel_phy_is_tc(i915, phy)) | |
| 122 | + if (intel_encoder_is_tc(encoder)) | |
| 124 | 123 | return; |
| 125 | 124 | |
| 125 | + phy = intel_encoder_to_phy(encoder); | |
| 126 | + | |
| 126 | 127 | if (set_bit) |
| 127 | 128 | pmdemand_state->active_combo_phys_mask |= BIT(phy); |
| 128 | 129 | else |
| @@ -222,14 +223,7 @@ static bool · 93 unmodified lines | ||
| 222 | 223 | intel_pmdemand_encoder_has_tc_phy(struct drm_i915_private *i915, |
| 223 | 224 | struct intel_encoder *encoder) |
| 224 | 225 | { |
| 225 | − enum phy phy; | |
| 226 | − | |
| 227 | − if (!encoder) | |
| 228 | − return false; | |
| 229 | − | |
| 230 | − phy = intel_port_to_phy(i915, encoder->port); | |
| 231 | − | |
| 232 | − return intel_phy_is_tc(i915, phy); | |
| 226 | + return encoder && intel_encoder_is_tc(encoder); | |
| 233 | 227 | } |
| 234 | 228 | |
| 235 | 229 | static bool |
| @@ -43,9 +43,8 @@ struct intel_pmdemand_state { · 42 unmodified lines | ||
| 43 | 43 | struct pmdemand_params params; |
| 44 | 44 | }; |
| 45 | 45 | |
| 46 | −#define to_intel_pmdemand_state(x) container_of((x), \ | |
| 47 | − struct intel_pmdemand_state, \ | |
| 48 | − base) | |
| 46 | +#define to_intel_pmdemand_state(global_state) \ | |
| 47 | + container_of_const((global_state), struct intel_pmdemand_state, base) | |
| 49 | 48 | |
| 50 | 49 | void intel_pmdemand_init_early(struct drm_i915_private *i915); |
| 51 | 50 | int intel_pmdemand_init(struct drm_i915_private *i915); |
| @@ -605,8 +605,7 @@ static void wait_panel_status(struct intel_dp *intel_dp, · 604 unmodified lines | ||
| 605 | 605 | intel_de_read(dev_priv, pp_stat_reg), |
| 606 | 606 | intel_de_read(dev_priv, pp_ctrl_reg)); |
| 607 | 607 | |
| 608 | − if (intel_de_wait_for_register(dev_priv, pp_stat_reg, | |
| 609 | − mask, value, 5000)) | |
| 608 | + if (intel_de_wait(dev_priv, pp_stat_reg, mask, value, 5000)) | |
| 610 | 609 | drm_err(&dev_priv->drm, |
| 611 | 610 | "[ENCODER:%d:%s] %s panel status timeout: PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n", |
| 612 | 611 | dig_port->base.base.base.id, dig_port->base.base.name, |
| @@ -1671,6 +1670,37 @@ void intel_pps_setup(struct drm_i915_private *i915) · 1058 unmodified lines | ||
| 1671 | 1670 | i915->display.pps.mmio_base = PPS_BASE; |
| 1672 | 1671 | } |
| 1673 | 1672 | |
| 1673 | +static int intel_pps_show(struct seq_file *m, void *data) | |
| 1674 | +{ | |
| 1675 | + struct intel_connector *connector = m->private; | |
| 1676 | + struct intel_dp *intel_dp = intel_attached_dp(connector); | |
| 1677 | + | |
| 1678 | + if (connector->base.status != connector_status_connected) | |
| 1679 | + return -ENODEV; | |
| 1680 | + | |
| 1681 | + seq_printf(m, "Panel power up delay: %d\n", | |
| 1682 | + intel_dp->pps.panel_power_up_delay); | |
| 1683 | + seq_printf(m, "Panel power down delay: %d\n", | |
| 1684 | + intel_dp->pps.panel_power_down_delay); | |
| 1685 | + seq_printf(m, "Backlight on delay: %d\n", | |
| 1686 | + intel_dp->pps.backlight_on_delay); | |
| 1687 | + seq_printf(m, "Backlight off delay: %d\n", | |
| 1688 | + intel_dp->pps.backlight_off_delay); | |
| 1689 | + | |
| 1690 | + return 0; | |
| 1691 | +} | |
| 1692 | +DEFINE_SHOW_ATTRIBUTE(intel_pps); | |
| 1693 | + | |
| 1694 | +void intel_pps_connector_debugfs_add(struct intel_connector *connector) | |
| 1695 | +{ | |
| 1696 | + struct dentry *root = connector->base.debugfs_entry; | |
| 1697 | + int connector_type = connector->base.connector_type; | |
| 1698 | + | |
| 1699 | + if (connector_type == DRM_MODE_CONNECTOR_eDP) | |
| 1700 | + debugfs_create_file("i915_panel_timings", 0444, root, | |
| 1701 | + connector, &intel_pps_fops); | |
| 1702 | +} | |
| 1703 | + | |
| 1674 | 1704 | void assert_pps_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe) |
| 1675 | 1705 | { |
| 1676 | 1706 | i915_reg_t pp_reg; |
| @@ -51,6 +51,8 @@ void vlv_pps_init(struct intel_encoder *encoder, · 50 unmodified lines | ||
| 51 | 51 | void intel_pps_unlock_regs_wa(struct drm_i915_private *i915); |
| 52 | 52 | void intel_pps_setup(struct drm_i915_private *i915); |
| 53 | 53 | |
| 54 | +void intel_pps_connector_debugfs_add(struct intel_connector *connector); | |
| 55 | + | |
| 54 | 56 | void assert_pps_unlocked(struct drm_i915_private *i915, enum pipe pipe); |
| 55 | 57 | |
| 56 | 58 | #endif /* __INTEL_PPS_H__ */ |
| @@ -171,14 +171,27 @@ · 170 unmodified lines | ||
| 171 | 171 | * |
| 172 | 172 | * The rest of the bits are more self-explanatory and/or |
| 173 | 173 | * irrelevant for normal operation. |
| 174 | + * | |
| 175 | + * Description of intel_crtc_state variables. has_psr, has_panel_replay and | |
| 176 | + * has_sel_update: | |
| 177 | + * | |
| 178 | + * has_psr (alone): PSR1 | |
| 179 | + * has_psr + has_sel_update: PSR2 | |
| 180 | + * has_psr + has_panel_replay: Panel Replay | |
| 181 | + * has_psr + has_panel_replay + has_sel_update: Panel Replay Selective Update | |
| 182 | + * | |
| 183 | + * Description of some intel_psr varibles. enabled, panel_replay_enabled, | |
| 184 | + * sel_update_enabled | |
| 185 | + * | |
| 186 | + * enabled (alone): PSR1 | |
| 187 | + * enabled + sel_update_enabled: PSR2 | |
| 188 | + * enabled + panel_replay_enabled: Panel Replay | |
| 189 | + * enabled + panel_replay_enabled + sel_update_enabled: Panel Replay SU | |
| 174 | 190 | */ |
| 175 | 191 | |
| 176 | 192 | #define CAN_PSR(intel_dp) ((intel_dp)->psr.sink_support && \ |
| 177 | 193 | (intel_dp)->psr.source_support) |
| 178 | 194 | |
| 179 | −#define CAN_PANEL_REPLAY(intel_dp) ((intel_dp)->psr.sink_panel_replay_support && \ | |
| 180 | − (intel_dp)->psr.source_panel_replay_support) | |
| 181 | − | |
| 182 | 195 | bool intel_encoder_can_psr(struct intel_encoder *encoder) |
| 183 | 196 | { |
| 184 | 197 | if (intel_encoder_is_dp(encoder) || encoder->type == INTEL_OUTPUT_DP_MST) |
| @@ -330,6 +343,9 @@ static void psr_irq_control(struct intel_dp *intel_dp) · 145 unmodified lines | ||
| 330 | 343 | enum transcoder cpu_transcoder = intel_dp->psr.transcoder; |
| 331 | 344 | u32 mask; |
| 332 | 345 | |
| 346 | + if (intel_dp->psr.panel_replay_enabled) | |
| 347 | + return; | |
| 348 | + | |
| 333 | 349 | mask = psr_irq_psr_error_bit_get(intel_dp); |
| 334 | 350 | if (intel_dp->psr.debug & I915_PSR_DEBUG_IRQ) |
| 335 | 351 | mask |= psr_irq_post_exit_bit_get(intel_dp) | |
| @@ -619,40 +635,59 @@ static bool psr2_su_region_et_valid(struct intel_dp *intel_dp) · 283 unmodified lines | ||
| 619 | 635 | return false; |
| 620 | 636 | } |
| 621 | 637 | |
| 622 | −static void intel_psr_enable_sink(struct intel_dp *intel_dp) | |
| 638 | +static unsigned int intel_psr_get_enable_sink_offset(struct intel_dp *intel_dp) | |
| 639 | +{ | |
| 640 | + return intel_dp->psr.panel_replay_enabled ? | |
| 641 | + PANEL_REPLAY_CONFIG : DP_PSR_EN_CFG; | |
| 642 | +} | |
| 643 | + | |
| 644 | +/* | |
| 645 | + * Note: Most of the bits are same in PANEL_REPLAY_CONFIG and DP_PSR_EN_CFG. We | |
| 646 | + * are relying on PSR definitions on these "common" bits. | |
| 647 | + */ | |
| 648 | +void intel_psr_enable_sink(struct intel_dp *intel_dp, | |
| 649 | + const struct intel_crtc_state *crtc_state) | |
| 623 | 650 | { |
| 624 | 651 | struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); |
| 625 | 652 | u8 dpcd_val = DP_PSR_ENABLE; |
| 626 | 653 | |
| 627 | − if (intel_dp->psr.panel_replay_enabled) | |
| 628 | − return; | |
| 629 | − | |
| 630 | − if (intel_dp->psr.psr2_enabled) { | |
| 654 | + if (crtc_state->has_psr2) { | |
| 631 | 655 | /* Enable ALPM at sink for psr2 */ |
| 632 | − drm_dp_dpcd_writeb(&intel_dp->aux, DP_RECEIVER_ALPM_CONFIG, | |
| 633 | − DP_ALPM_ENABLE | | |
| 634 | − DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE); | |
| 656 | + if (!crtc_state->has_panel_replay) { | |
| 657 | + drm_dp_dpcd_writeb(&intel_dp->aux, | |
| 658 | + DP_RECEIVER_ALPM_CONFIG, | |
| 659 | + DP_ALPM_ENABLE | | |
| 660 | + DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE); | |
| 661 | + | |
| 662 | + if (psr2_su_region_et_valid(intel_dp)) | |
| 663 | + dpcd_val |= DP_PSR_ENABLE_SU_REGION_ET; | |
| 664 | + } | |
| 635 | 665 | |
| 636 | 666 | dpcd_val |= DP_PSR_ENABLE_PSR2 | DP_PSR_IRQ_HPD_WITH_CRC_ERRORS; |
| 637 | − if (psr2_su_region_et_valid(intel_dp)) | |
| 638 | − dpcd_val |= DP_PSR_ENABLE_SU_REGION_ET; | |
| 639 | 667 | } else { |
| 640 | 668 | if (intel_dp->psr.link_standby) |
| 641 | 669 | dpcd_val |= DP_PSR_MAIN_LINK_ACTIVE; |
| 642 | 670 | |
| 643 | − if (DISPLAY_VER(dev_priv) >= 8) | |
| 671 | + if (!crtc_state->has_panel_replay && DISPLAY_VER(dev_priv) >= 8) | |
| 644 | 672 | dpcd_val |= DP_PSR_CRC_VERIFICATION; |
| 645 | 673 | } |
| 646 | 674 | |
| 647 | − if (intel_dp->psr.req_psr2_sdp_prior_scanline) | |
| 675 | + if (crtc_state->has_panel_replay) | |
| 676 | + dpcd_val |= DP_PANEL_REPLAY_UNRECOVERABLE_ERROR_EN | | |
| 677 | + DP_PANEL_REPLAY_RFB_STORAGE_ERROR_EN; | |
| 678 | + | |
| 679 | + if (crtc_state->req_psr2_sdp_prior_scanline) | |
| 648 | 680 | dpcd_val |= DP_PSR_SU_REGION_SCANLINE_CAPTURE; |
| 649 | 681 | |
| 650 | 682 | if (intel_dp->psr.entry_setup_frames > 0) |
| 651 | 683 | dpcd_val |= DP_PSR_FRAME_CAPTURE; |
| 652 | 684 | |
| 653 | − drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, dpcd_val); | |
| 685 | + drm_dp_dpcd_writeb(&intel_dp->aux, | |
| 686 | + intel_psr_get_enable_sink_offset(intel_dp), | |
| 687 | + dpcd_val); | |
| 654 | 688 | |
| 655 | − drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER, DP_SET_POWER_D0); | |
| 689 | + if (intel_dp_is_edp(intel_dp)) | |
| 690 | + drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER, DP_SET_POWER_D0); | |
| 656 | 691 | } |
| 657 | 692 | |
| 658 | 693 | static u32 intel_psr1_get_tp_time(struct intel_dp *intel_dp) |
| @@ -1126,6 +1161,141 @@ static bool _compute_psr2_sdp_prior_scanline_indication(struct intel_dp *intel_d · 467 unmodified lines | ||
| 1126 | 1161 | return true; |
| 1127 | 1162 | } |
| 1128 | 1163 | |
| 1164 | +/* | |
| 1165 | + * See Bspec: 71632 for the table | |
| 1166 | + * | |
| 1167 | + * Silence_period = tSilence,Min + ((tSilence,Max - tSilence,Min) / 2) | |
| 1168 | + * | |
| 1169 | + * Half cycle duration: | |
| 1170 | + * | |
| 1171 | + * Link rates 1.62 - 4.32 and tLFPS_Cycle = 70 ns | |
| 1172 | + * FLOOR( (Link Rate * tLFPS_Cycle) / (2 * 10) ) | |
| 1173 | + * | |
| 1174 | + * Link rates 5.4 - 8.1 | |
| 1175 | + * PORT_ALPM_LFPS_CTL[ LFPS Cycle Count ] = 10 | |
| 1176 | + * LFPS Period chosen is the mid-point of the min:max values from the table | |
| 1177 | + * FLOOR( LFPS Period in Symbol clocks / | |
| 1178 | + * (2 * PORT_ALPM_LFPS_CTL[ LFPS Cycle Count ]) ) | |
| 1179 | + */ | |
| 1180 | +static bool _lnl_get_silence_period_and_lfps_half_cycle(int link_rate, | |
| 1181 | + int *silence_period, | |
| 1182 | + int *lfps_half_cycle) | |
| 1183 | +{ | |
| 1184 | + switch (link_rate) { | |
| 1185 | + case 162000: | |
| 1186 | + *silence_period = 20; | |
| 1187 | + *lfps_half_cycle = 5; | |
| 1188 | + break; | |
| 1189 | + case 216000: | |
| 1190 | + *silence_period = 27; | |
| 1191 | + *lfps_half_cycle = 7; | |
| 1192 | + break; | |
| 1193 | + case 243000: | |
| 1194 | + *silence_period = 31; | |
| 1195 | + *lfps_half_cycle = 8; | |
| 1196 | + break; | |
| 1197 | + case 270000: | |
| 1198 | + *silence_period = 34; | |
| 1199 | + *lfps_half_cycle = 9; | |
| 1200 | + break; | |
| 1201 | + case 324000: | |
| 1202 | + *silence_period = 41; | |
| 1203 | + *lfps_half_cycle = 11; | |
| 1204 | + break; | |
| 1205 | + case 432000: | |
| 1206 | + *silence_period = 56; | |
| 1207 | + *lfps_half_cycle = 15; | |
| 1208 | + break; | |
| 1209 | + case 540000: | |
| 1210 | + *silence_period = 69; | |
| 1211 | + *lfps_half_cycle = 12; | |
| 1212 | + break; | |
| 1213 | + case 648000: | |
| 1214 | + *silence_period = 84; | |
| 1215 | + *lfps_half_cycle = 15; | |
| 1216 | + break; | |
| 1217 | + case 675000: | |
| 1218 | + *silence_period = 87; | |
| 1219 | + *lfps_half_cycle = 15; | |
| 1220 | + break; | |
| 1221 | + case 810000: | |
| 1222 | + *silence_period = 104; | |
| 1223 | + *lfps_half_cycle = 19; | |
| 1224 | + break; | |
| 1225 | + default: | |
| 1226 | + *silence_period = *lfps_half_cycle = -1; | |
| 1227 | + return false; | |
| 1228 | + } | |
| 1229 | + return true; | |
| 1230 | +} | |
| 1231 | + | |
| 1232 | +/* | |
| 1233 | + * AUX-Less Wake Time = CEILING( ((PHY P2 to P0) + tLFPS_Period, Max+ | |
| 1234 | + * tSilence, Max+ tPHY Establishment + tCDS) / tline) | |
| 1235 | + * For the "PHY P2 to P0" latency see the PHY Power Control page | |
| 1236 | + * (PHY P2 to P0) : https://gfxspecs.intel.com/Predator/Home/Index/68965 | |
| 1237 | + * : 12 us | |
| 1238 | + * The tLFPS_Period, Max term is 800ns | |
| 1239 | + * The tSilence, Max term is 180ns | |
| 1240 | + * The tPHY Establishment (a.k.a. t1) term is 50us | |
| 1241 | + * The tCDS term is 1 or 2 times t2 | |
| 1242 | + * t2 = Number ML_PHY_LOCK * tML_PHY_LOCK | |
| 1243 | + * Number ML_PHY_LOCK = ( 7 + CEILING( 6.5us / tML_PHY_LOCK ) + 1) | |
| 1244 | + * Rounding up the 6.5us padding to the next ML_PHY_LOCK boundary and | |
| 1245 | + * adding the "+ 1" term ensures all ML_PHY_LOCK sequences that start | |
| 1246 | + * within the CDS period complete within the CDS period regardless of | |
| 1247 | + * entry into the period | |
| 1248 | + * tML_PHY_LOCK = TPS4 Length * ( 10 / (Link Rate in MHz) ) | |
| 1249 | + * TPS4 Length = 252 Symbols | |
| 1250 | + */ | |
| 1251 | +static int _lnl_compute_aux_less_wake_time(int port_clock) | |
| 1252 | +{ | |
| 1253 | + int tphy2_p2_to_p0 = 12 * 1000; | |
| 1254 | + int tlfps_period_max = 800; | |
| 1255 | + int tsilence_max = 180; | |
| 1256 | + int t1 = 50 * 1000; | |
| 1257 | + int tps4 = 252; | |
| 1258 | + int tml_phy_lock = 1000 * 1000 * tps4 * 10 / port_clock; | |
| 1259 | + int num_ml_phy_lock = 7 + DIV_ROUND_UP(6500, tml_phy_lock) + 1; | |
| 1260 | + int t2 = num_ml_phy_lock * tml_phy_lock; | |
| 1261 | + int tcds = 1 * t2; | |
| 1262 | + | |
| 1263 | + return DIV_ROUND_UP(tphy2_p2_to_p0 + tlfps_period_max + tsilence_max + | |
| 1264 | + t1 + tcds, 1000); | |
| 1265 | +} | |
| 1266 | + | |
| 1267 | +static int _lnl_compute_aux_less_alpm_params(struct intel_dp *intel_dp, | |
| 1268 | + struct intel_crtc_state *crtc_state) | |
| 1269 | +{ | |
| 1270 | + struct drm_i915_private *i915 = dp_to_i915(intel_dp); | |
| 1271 | + int aux_less_wake_time, aux_less_wake_lines, silence_period, | |
| 1272 | + lfps_half_cycle; | |
| 1273 | + | |
| 1274 | + aux_less_wake_time = | |
| 1275 | + _lnl_compute_aux_less_wake_time(crtc_state->port_clock); | |
| 1276 | + aux_less_wake_lines = intel_usecs_to_scanlines(&crtc_state->hw.adjusted_mode, | |
| 1277 | + aux_less_wake_time); | |
| 1278 | + | |
| 1279 | + if (!_lnl_get_silence_period_and_lfps_half_cycle(crtc_state->port_clock, | |
| 1280 | + &silence_period, | |
| 1281 | + &lfps_half_cycle)) | |
| 1282 | + return false; | |
| 1283 | + | |
| 1284 | + if (aux_less_wake_lines > ALPM_CTL_AUX_LESS_WAKE_TIME_MASK || | |
| 1285 | + silence_period > PORT_ALPM_CTL_SILENCE_PERIOD_MASK || | |
| 1286 | + lfps_half_cycle > PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION_MASK) | |
| 1287 | + return false; | |
| 1288 | + | |
| 1289 | + if (i915->display.params.psr_safest_params) | |
| 1290 | + aux_less_wake_lines = ALPM_CTL_AUX_LESS_WAKE_TIME_MASK; | |
| 1291 | + | |
| 1292 | + intel_dp->psr.alpm_parameters.fast_wake_lines = aux_less_wake_lines; | |
| 1293 | + intel_dp->psr.alpm_parameters.silence_period_sym_clocks = silence_period; | |
| 1294 | + intel_dp->psr.alpm_parameters.lfps_half_cycle_num_of_syms = lfps_half_cycle; | |
| 1295 | + | |
| 1296 | + return true; | |
| 1297 | +} | |
| 1298 | + | |
| 1129 | 1299 | static bool _lnl_compute_alpm_params(struct intel_dp *intel_dp, |
| 1130 | 1300 | struct intel_crtc_state *crtc_state) |
| 1131 | 1301 | { |
| @@ -1142,6 +1312,9 @@ static bool _lnl_compute_alpm_params(struct intel_dp *intel_dp, · 10 unmodified lines | ||
| 1142 | 1312 | if (check_entry_lines > 15) |
| 1143 | 1313 | return false; |
| 1144 | 1314 | |
| 1315 | + if (!_lnl_compute_aux_less_alpm_params(intel_dp, crtc_state)) | |
| 1316 | + return false; | |
| 1317 | + | |
| 1145 | 1318 | if (i915->display.params.psr_safest_params) |
| 1146 | 1319 | check_entry_lines = 15; |
| 1147 | 1320 | |
| @@ -1150,28 +1323,52 @@ static bool _lnl_compute_alpm_params(struct intel_dp *intel_dp, · 2 unmodified lines | ||
| 1150 | 1323 | return true; |
| 1151 | 1324 | } |
| 1152 | 1325 | |
| 1326 | +/* | |
| 1327 | + * IO wake time for DISPLAY_VER < 12 is not directly mentioned in Bspec. There | |
| 1328 | + * are 50 us io wake time and 32 us fast wake time. Clearly preharge pulses are | |
| 1329 | + * not (improperly) included in 32 us fast wake time. 50 us - 32 us = 18 us. | |
| 1330 | + */ | |
| 1331 | +static int skl_io_buffer_wake_time(void) | |
| 1332 | +{ | |
| 1333 | + return 18; | |
| 1334 | +} | |
| 1335 | + | |
| 1336 | +static int tgl_io_buffer_wake_time(void) | |
| 1337 | +{ | |
| 1338 | + return 10; | |
| 1339 | +} | |
| 1340 | + | |
| 1341 | +static int io_buffer_wake_time(const struct intel_crtc_state *crtc_state) | |
| 1342 | +{ | |
| 1343 | + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); | |
| 1344 | + | |
| 1345 | + if (DISPLAY_VER(i915) >= 12) | |
| 1346 | + return tgl_io_buffer_wake_time(); | |
| 1347 | + else | |
| 1348 | + return skl_io_buffer_wake_time(); | |
| 1349 | +} | |
| 1350 | + | |
| 1153 | 1351 | static bool _compute_alpm_params(struct intel_dp *intel_dp, |
| 1154 | 1352 | struct intel_crtc_state *crtc_state) |
| 1155 | 1353 | { |
| 1156 | 1354 | struct drm_i915_private *i915 = dp_to_i915(intel_dp); |
| 1157 | 1355 | int io_wake_lines, io_wake_time, fast_wake_lines, fast_wake_time; |
| 1356 | + int tfw_exit_latency = 20; /* eDP spec */ | |
| 1357 | + int phy_wake = 4; /* eDP spec */ | |
| 1358 | + int preamble = 8; /* eDP spec */ | |
| 1359 | + int precharge = intel_dp_aux_fw_sync_len() - preamble; | |
| 1158 | 1360 | u8 max_wake_lines; |
| 1159 | 1361 | |
| 1160 | − if (DISPLAY_VER(i915) >= 12) { | |
| 1161 | − io_wake_time = 42; | |
| 1162 | − /* | |
| 1163 | − * According to Bspec it's 42us, but based on testing | |
| 1164 | − * it is not enough -> use 45 us. | |
| 1165 | − */ | |
| 1166 | − fast_wake_time = 45; | |
| 1362 | + io_wake_time = max(precharge, io_buffer_wake_time(crtc_state)) + | |
| 1363 | + preamble + phy_wake + tfw_exit_latency; | |
| 1364 | + fast_wake_time = precharge + preamble + phy_wake + | |
| 1365 | + tfw_exit_latency; | |
| 1167 | 1366 | |
| 1367 | + if (DISPLAY_VER(i915) >= 12) | |
| 1168 | 1368 | /* TODO: Check how we can use ALPM_CTL fast wake extended field */ |
| 1169 | 1369 | max_wake_lines = 12; |
| 1170 | − } else { | |
| 1171 | − io_wake_time = 50; | |
| 1172 | − fast_wake_time = 32; | |
| 1370 | + else | |
| 1173 | 1371 | max_wake_lines = 8; |
| 1174 | − } | |
| 1175 | 1372 | |
| 1176 | 1373 | io_wake_lines = intel_usecs_to_scanlines( |
| 1177 | 1374 | &crtc_state->hw.adjusted_mode, io_wake_time); |
| @@ -1422,12 +1619,24 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, · 244 unmodified lines | ||
| 1422 | 1619 | return; |
| 1423 | 1620 | } |
| 1424 | 1621 | |
| 1622 | + /* | |
| 1623 | + * FIXME figure out what is wrong with PSR+bigjoiner and | |
| 1624 | + * fix it. Presumably something related to the fact that | |
| 1625 | + * PSR is a transcoder level feature. | |
| 1626 | + */ | |
| 1627 | + if (crtc_state->bigjoiner_pipes) { | |
| 1628 | + drm_dbg_kms(&dev_priv->drm, | |
| 1629 | + "PSR disabled due to bigjoiner\n"); | |
| 1630 | + return; | |
| 1631 | + } | |
| 1632 | + | |
| 1425 | 1633 | if (CAN_PANEL_REPLAY(intel_dp)) |
| 1426 | 1634 | crtc_state->has_panel_replay = true; |
| 1427 | − else | |
| 1428 | − crtc_state->has_psr = _psr_compute_config(intel_dp, crtc_state); | |
| 1429 | 1635 | |
| 1430 | − if (!(crtc_state->has_panel_replay || crtc_state->has_psr)) | |
| 1636 | + crtc_state->has_psr = crtc_state->has_panel_replay ? true : | |
| 1637 | + _psr_compute_config(intel_dp, crtc_state); | |
| 1638 | + | |
| 1639 | + if (!crtc_state->has_psr) | |
| 1431 | 1640 | return; |
| 1432 | 1641 | |
| 1433 | 1642 | crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state); |
| @@ -1454,7 +1663,7 @@ void intel_psr_get_config(struct intel_encoder *encoder, · 20 unmodified lines | ||
| 1454 | 1663 | goto unlock; |
| 1455 | 1664 | |
| 1456 | 1665 | if (intel_dp->psr.panel_replay_enabled) { |
| 1457 | − pipe_config->has_panel_replay = true; | |
| 1666 | + pipe_config->has_psr = pipe_config->has_panel_replay = true; | |
| 1458 | 1667 | } else { |
| 1459 | 1668 | /* |
| 1460 | 1669 | * Not possible to read EDP_PSR/PSR2_CTL registers as it is |
| @@ -1559,14 +1768,44 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp) · 98 unmodified lines | ||
| 1559 | 1768 | struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); |
| 1560 | 1769 | enum transcoder cpu_transcoder = intel_dp->psr.transcoder; |
| 1561 | 1770 | struct intel_psr *psr = &intel_dp->psr; |
| 1771 | + u32 alpm_ctl; | |
| 1562 | 1772 | |
| 1563 | − if (DISPLAY_VER(dev_priv) < 20) | |
| 1773 | + if (DISPLAY_VER(dev_priv) < 20 || (!intel_dp->psr.psr2_enabled && | |
| 1774 | + !intel_dp_is_edp(intel_dp))) | |
| 1564 | 1775 | return; |
| 1565 | 1776 | |
| 1566 | − intel_de_write(dev_priv, ALPM_CTL(cpu_transcoder), | |
| 1567 | − ALPM_CTL_EXTENDED_FAST_WAKE_ENABLE | | |
| 1568 | − ALPM_CTL_ALPM_ENTRY_CHECK(psr->alpm_parameters.check_entry_lines) | | |
| 1569 | − ALPM_CTL_EXTENDED_FAST_WAKE_TIME(psr->alpm_parameters.fast_wake_lines)); | |
| 1777 | + /* | |
| 1778 | + * Panel Replay on eDP is always using ALPM aux less. I.e. no need to | |
| 1779 | + * check panel support at this point. | |
| 1780 | + */ | |
| 1781 | + if (intel_dp->psr.panel_replay_enabled && intel_dp_is_edp(intel_dp)) { | |
| 1782 | + alpm_ctl = ALPM_CTL_ALPM_ENABLE | | |
| 1783 | + ALPM_CTL_ALPM_AUX_LESS_ENABLE | | |
| 1784 | + ALPM_CTL_AUX_LESS_SLEEP_HOLD_TIME_50_SYMBOLS; | |
| 1785 | + | |
| 1786 | + intel_de_write(dev_priv, PORT_ALPM_CTL(cpu_transcoder), | |
| 1787 | + PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE | | |
| 1788 | + PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(15) | | |
| 1789 | + PORT_ALPM_CTL_MAX_PHY_SWING_HOLD(0) | | |
| 1790 | + PORT_ALPM_CTL_SILENCE_PERIOD( | |
| 1791 | + psr->alpm_parameters.silence_period_sym_clocks)); | |
| 1792 | + | |
| 1793 | + intel_de_write(dev_priv, PORT_ALPM_LFPS_CTL(cpu_transcoder), | |
| 1794 | + PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT(10) | | |
| 1795 | + PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION( | |
| 1796 | + psr->alpm_parameters.lfps_half_cycle_num_of_syms) | | |
| 1797 | + PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION( | |
| 1798 | + psr->alpm_parameters.lfps_half_cycle_num_of_syms) | | |
| 1799 | + PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION( | |
| 1800 | + psr->alpm_parameters.lfps_half_cycle_num_of_syms)); | |
| 1801 | + } else { | |
| 1802 | + alpm_ctl = ALPM_CTL_EXTENDED_FAST_WAKE_ENABLE | | |
| 1803 | + ALPM_CTL_EXTENDED_FAST_WAKE_TIME(psr->alpm_parameters.fast_wake_lines); | |
| 1804 | + } | |
| 1805 | + | |
| 1806 | + alpm_ctl |= ALPM_CTL_ALPM_ENTRY_CHECK(psr->alpm_parameters.check_entry_lines); | |
| 1807 | + | |
| 1808 | + intel_de_write(dev_priv, ALPM_CTL(cpu_transcoder), alpm_ctl); | |
| 1570 | 1809 | } |
| 1571 | 1810 | |
| 1572 | 1811 | static void intel_psr_enable_source(struct intel_dp *intel_dp, |
| @@ -1574,7 +1813,7 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, · 1 unmodified line | ||
| 1574 | 1813 | { |
| 1575 | 1814 | struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); |
| 1576 | 1815 | enum transcoder cpu_transcoder = intel_dp->psr.transcoder; |
| 1577 | − u32 mask; | |
| 1816 | + u32 mask = 0; | |
| 1578 | 1817 | |
| 1579 | 1818 | /* |
| 1580 | 1819 | * Only HSW and BDW have PSR AUX registers that need to be setup. |
| @@ -1588,34 +1827,46 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, · 7 unmodified lines | ||
| 1588 | 1827 | * mask LPSP to avoid dependency on other drivers that might block |
| 1589 | 1828 | * runtime_pm besides preventing other hw tracking issues now we |
| 1590 | 1829 | * can rely on frontbuffer tracking. |
| 1830 | + * | |
| 1831 | + * From bspec prior LunarLake: | |
| 1832 | + * Only PSR_MASK[Mask FBC modify] and PSR_MASK[Mask Hotplug] are used in | |
| 1833 | + * panel replay mode. | |
| 1834 | + * | |
| 1835 | + * From bspec beyod LunarLake: | |
| 1836 | + * Panel Replay on DP: No bits are applicable | |
| 1837 | + * Panel Replay on eDP: All bits are applicable | |
| 1591 | 1838 | */ |
| 1592 | − mask = EDP_PSR_DEBUG_MASK_MEMUP | | |
| 1593 | − EDP_PSR_DEBUG_MASK_HPD; | |
| 1839 | + if (DISPLAY_VER(dev_priv) < 20 || intel_dp_is_edp(intel_dp)) | |
| 1840 | + mask = EDP_PSR_DEBUG_MASK_HPD; | |
| 1594 | 1841 | |
| 1595 | − /* | |
| 1596 | − * For some unknown reason on HSW non-ULT (or at least on | |
| 1597 | − * Dell Latitude E6540) external displays start to flicker | |
| 1598 | − * when PSR is enabled on the eDP. SR/PC6 residency is much | |
| 1599 | − * higher than should be possible with an external display. | |
| 1600 | − * As a workaround leave LPSP unmasked to prevent PSR entry | |
| 1601 | − * when external displays are active. | |
| 1602 | − */ | |
| 1603 | − if (DISPLAY_VER(dev_priv) >= 8 || IS_HASWELL_ULT(dev_priv)) | |
| 1604 | − mask |= EDP_PSR_DEBUG_MASK_LPSP; | |
| 1842 | + if (intel_dp_is_edp(intel_dp)) { | |
| 1843 | + mask |= EDP_PSR_DEBUG_MASK_MEMUP; | |
| 1605 | 1844 | |
| 1606 | − if (DISPLAY_VER(dev_priv) < 20) | |
| 1607 | − mask |= EDP_PSR_DEBUG_MASK_MAX_SLEEP; | |
| 1845 | + /* | |
| 1846 | + * For some unknown reason on HSW non-ULT (or at least on | |
| 1847 | + * Dell Latitude E6540) external displays start to flicker | |
| 1848 | + * when PSR is enabled on the eDP. SR/PC6 residency is much | |
| 1849 | + * higher than should be possible with an external display. | |
| 1850 | + * As a workaround leave LPSP unmasked to prevent PSR entry | |
| 1851 | + * when external displays are active. | |
| 1852 | + */ | |
| 1853 | + if (DISPLAY_VER(dev_priv) >= 8 || IS_HASWELL_ULT(dev_priv)) | |
| 1854 | + mask |= EDP_PSR_DEBUG_MASK_LPSP; | |
| 1608 | 1855 | |
| 1609 | − /* | |
| 1610 | − * No separate pipe reg write mask on hsw/bdw, so have to unmask all | |
| 1611 | − * registers in order to keep the CURSURFLIVE tricks working :( | |
| 1612 | − */ | |
| 1613 | − if (IS_DISPLAY_VER(dev_priv, 9, 10)) | |
| 1614 | − mask |= EDP_PSR_DEBUG_MASK_DISP_REG_WRITE; | |
| 1856 | + if (DISPLAY_VER(dev_priv) < 20) | |
| 1857 | + mask |= EDP_PSR_DEBUG_MASK_MAX_SLEEP; | |
| 1615 | 1858 | |
| 1616 | − /* allow PSR with sprite enabled */ | |
| 1617 | − if (IS_HASWELL(dev_priv)) | |
| 1618 | − mask |= EDP_PSR_DEBUG_MASK_SPRITE_ENABLE; | |
| 1859 | + /* | |
| 1860 | + * No separate pipe reg write mask on hsw/bdw, so have to unmask all | |
| 1861 | + * registers in order to keep the CURSURFLIVE tricks working :( | |
| 1862 | + */ | |
| 1863 | + if (IS_DISPLAY_VER(dev_priv, 9, 10)) | |
| 1864 | + mask |= EDP_PSR_DEBUG_MASK_DISP_REG_WRITE; | |
| 1865 | + | |
| 1866 | + /* allow PSR with sprite enabled */ | |
| 1867 | + if (IS_HASWELL(dev_priv)) | |
| 1868 | + mask |= EDP_PSR_DEBUG_MASK_SPRITE_ENABLE; | |
| 1869 | + } | |
| 1619 | 1870 | |
| 1620 | 1871 | intel_de_write(dev_priv, psr_debug_reg(dev_priv, cpu_transcoder), mask); |
| 1621 | 1872 | |
| @@ -1634,7 +1885,8 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, · 12 unmodified lines | ||
| 1634 | 1885 | intel_dp->psr.psr2_sel_fetch_enabled ? |
| 1635 | 1886 | IGNORE_PSR2_HW_TRACKING : 0); |
| 1636 | 1887 | |
| 1637 | − lnl_alpm_configure(intel_dp); | |
| 1888 | + if (intel_dp_is_edp(intel_dp)) | |
| 1889 | + lnl_alpm_configure(intel_dp); | |
| 1638 | 1890 | |
| 1639 | 1891 | /* |
| 1640 | 1892 | * Wa_16013835468 |
| @@ -1675,6 +1927,9 @@ static bool psr_interrupt_error_check(struct intel_dp *intel_dp) · 34 unmodified lines | ||
| 1675 | 1927 | enum transcoder cpu_transcoder = intel_dp->psr.transcoder; |
| 1676 | 1928 | u32 val; |
| 1677 | 1929 | |
| 1930 | + if (intel_dp->psr.panel_replay_enabled) | |
| 1931 | + goto no_err; | |
| 1932 | + | |
| 1678 | 1933 | /* |
| 1679 | 1934 | * If a PSR error happened and the driver is reloaded, the EDP_PSR_IIR |
| 1680 | 1935 | * will still keep the error set even after the reset done in the |
| @@ -1692,6 +1947,7 @@ static bool psr_interrupt_error_check(struct intel_dp *intel_dp) · 11 unmodified lines | ||
| 1692 | 1947 | return false; |
| 1693 | 1948 | } |
| 1694 | 1949 | |
| 1950 | +no_err: | |
| 1695 | 1951 | return true; |
| 1696 | 1952 | } |
| 1697 | 1953 | |
| @@ -1700,7 +1956,6 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp, · 2 unmodified lines | ||
| 1700 | 1956 | { |
| 1701 | 1957 | struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); |
| 1702 | 1958 | struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); |
| 1703 | − enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port); | |
| 1704 | 1959 | u32 val; |
| 1705 | 1960 | |
| 1706 | 1961 | drm_WARN_ON(&dev_priv->drm, intel_dp->psr.enabled); |
| @@ -1722,14 +1977,22 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp, · 15 unmodified lines | ||
| 1722 | 1977 | if (!psr_interrupt_error_check(intel_dp)) |
| 1723 | 1978 | return; |
| 1724 | 1979 | |
| 1725 | − if (intel_dp->psr.panel_replay_enabled) | |
| 1980 | + if (intel_dp->psr.panel_replay_enabled) { | |
| 1726 | 1981 | drm_dbg_kms(&dev_priv->drm, "Enabling Panel Replay\n"); |
| 1727 | − else | |
| 1982 | + } else { | |
| 1728 | 1983 | drm_dbg_kms(&dev_priv->drm, "Enabling PSR%s\n", |
| 1729 | 1984 | intel_dp->psr.psr2_enabled ? "2" : "1"); |
| 1730 | 1985 | |
| 1731 | − intel_snps_phy_update_psr_power_state(dev_priv, phy, true); | |
| 1732 | − intel_psr_enable_sink(intel_dp); | |
| 1986 | + /* | |
| 1987 | + * Panel replay has to be enabled before link training: doing it | |
| 1988 | + * only for PSR here. | |
| 1989 | + */ | |
| 1990 | + intel_psr_enable_sink(intel_dp, crtc_state); | |
| 1991 | + } | |
| 1992 | + | |
| 1993 | + if (intel_dp_is_edp(intel_dp)) | |
| 1994 | + intel_snps_phy_update_psr_power_state(&dig_port->base, true); | |
| 1995 | + | |
| 1733 | 1996 | intel_psr_enable_source(intel_dp, crtc_state); |
| 1734 | 1997 | intel_dp->psr.enabled = true; |
| 1735 | 1998 | intel_dp->psr.paused = false; |
| @@ -1799,8 +2062,6 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) · 63 unmodified lines | ||
| 1799 | 2062 | { |
| 1800 | 2063 | struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); |
| 1801 | 2064 | enum transcoder cpu_transcoder = intel_dp->psr.transcoder; |
| 1802 | − enum phy phy = intel_port_to_phy(dev_priv, | |
| 1803 | − dp_to_dig_port(intel_dp)->base.port); | |
| 1804 | 2065 | |
| 1805 | 2066 | lockdep_assert_held(&intel_dp->psr.lock); |
| 1806 | 2067 | |
| @@ -1835,12 +2096,25 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) · 28 unmodified lines | ||
| 1835 | 2096 | CLKGATE_DIS_MISC_DMASC_GATING_DIS, 0); |
| 1836 | 2097 | } |
| 1837 | 2098 | |
| 1838 | − intel_snps_phy_update_psr_power_state(dev_priv, phy, false); | |
| 2099 | + if (intel_dp_is_edp(intel_dp)) | |
| 2100 | + intel_snps_phy_update_psr_power_state(&dp_to_dig_port(intel_dp)->base, false); | |
| 2101 | + | |
| 2102 | + /* Panel Replay on eDP is always using ALPM aux less. */ | |
| 2103 | + if (intel_dp->psr.panel_replay_enabled && intel_dp_is_edp(intel_dp)) { | |
| 2104 | + intel_de_rmw(dev_priv, ALPM_CTL(cpu_transcoder), | |
| 2105 | + ALPM_CTL_ALPM_ENABLE | | |
| 2106 | + ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); | |
| 2107 | + | |
| 2108 | + intel_de_rmw(dev_priv, PORT_ALPM_CTL(cpu_transcoder), | |
| 2109 | + PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); | |
| 2110 | + } | |
| 1839 | 2111 | |
| 1840 | 2112 | /* Disable PSR on Sink */ |
| 1841 | − drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, 0); | |
| 2113 | + drm_dp_dpcd_writeb(&intel_dp->aux, | |
| 2114 | + intel_psr_get_enable_sink_offset(intel_dp), 0); | |
| 1842 | 2115 | |
| 1843 | − if (intel_dp->psr.psr2_enabled) | |
| 2116 | + if (!intel_dp->psr.panel_replay_enabled && | |
| 2117 | + intel_dp->psr.psr2_enabled) | |
| 1844 | 2118 | drm_dp_dpcd_writeb(&intel_dp->aux, DP_RECEIVER_ALPM_CONFIG, 0); |
| 1845 | 2119 | |
| 1846 | 2120 | intel_dp->psr.enabled = false; |
| @@ -1888,7 +2162,7 @@ void intel_psr_pause(struct intel_dp *intel_dp) · 41 unmodified lines | ||
| 1888 | 2162 | struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); |
| 1889 | 2163 | struct intel_psr *psr = &intel_dp->psr; |
| 1890 | 2164 | |
| 1891 | − if (!CAN_PSR(intel_dp)) | |
| 2165 | + if (!CAN_PSR(intel_dp) && !CAN_PANEL_REPLAY(intel_dp)) | |
| 1892 | 2166 | return; |
| 1893 | 2167 | |
| 1894 | 2168 | mutex_lock(&psr->lock); |
| @@ -1921,7 +2195,7 @@ void intel_psr_resume(struct intel_dp *intel_dp) · 26 unmodified lines | ||
| 1921 | 2195 | { |
| 1922 | 2196 | struct intel_psr *psr = &intel_dp->psr; |
| 1923 | 2197 | |
| 1924 | − if (!CAN_PSR(intel_dp)) | |
| 2198 | + if (!CAN_PSR(intel_dp) && !CAN_PANEL_REPLAY(intel_dp)) | |
| 1925 | 2199 | return; |
| 1926 | 2200 | |
| 1927 | 2201 | mutex_lock(&psr->lock); |
| @@ -1994,6 +2268,7 @@ static void psr_force_hw_tracking_exit(struct intel_dp *intel_dp) · 66 unmodified lines | ||
| 1994 | 2268 | |
| 1995 | 2269 | void intel_psr2_program_trans_man_trk_ctl(const struct intel_crtc_state *crtc_state) |
| 1996 | 2270 | { |
| 2271 | + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); | |
| 1997 | 2272 | struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); |
| 1998 | 2273 | enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; |
| 1999 | 2274 | struct intel_encoder *encoder; |
| @@ -2013,6 +2288,12 @@ void intel_psr2_program_trans_man_trk_ctl(const struct intel_crtc_state *crtc_st · 13 unmodified lines | ||
| 2013 | 2288 | |
| 2014 | 2289 | intel_de_write(dev_priv, PSR2_MAN_TRK_CTL(cpu_transcoder), |
| 2015 | 2290 | crtc_state->psr2_man_track_ctl); |
| 2291 | + | |
| 2292 | + if (!crtc_state->enable_psr2_su_region_et) | |
| 2293 | + return; | |
| 2294 | + | |
| 2295 | + intel_de_write(dev_priv, PIPE_SRCSZ_ERLY_TPT(crtc->pipe), | |
| 2296 | + crtc_state->pipe_srcsz_early_tpt); | |
| 2016 | 2297 | } |
| 2017 | 2298 | |
| 2018 | 2299 | static void psr2_man_trk_ctl_calc(struct intel_crtc_state *crtc_state, |
| @@ -2051,6 +2332,25 @@ exit: · 32 unmodified lines | ||
| 2051 | 2332 | crtc_state->psr2_man_track_ctl = val; |
| 2052 | 2333 | } |
| 2053 | 2334 | |
| 2335 | +static u32 | |
| 2336 | +psr2_pipe_srcsz_early_tpt_calc(struct intel_crtc_state *crtc_state, | |
| 2337 | + bool full_update, bool cursor_in_su_area) | |
| 2338 | +{ | |
| 2339 | + int width, height; | |
| 2340 | + | |
| 2341 | + if (!crtc_state->enable_psr2_su_region_et || full_update) | |
| 2342 | + return 0; | |
| 2343 | + | |
| 2344 | + if (!cursor_in_su_area) | |
| 2345 | + return PIPESRC_WIDTH(0) | | |
| 2346 | + PIPESRC_HEIGHT(drm_rect_height(&crtc_state->pipe_src)); | |
| 2347 | + | |
| 2348 | + width = drm_rect_width(&crtc_state->psr2_su_area); | |
| 2349 | + height = drm_rect_height(&crtc_state->psr2_su_area); | |
| 2350 | + | |
| 2351 | + return PIPESRC_WIDTH(width - 1) | PIPESRC_HEIGHT(height - 1); | |
| 2352 | +} | |
| 2353 | + | |
| 2054 | 2354 | static void clip_area_update(struct drm_rect *overlap_damage_area, |
| 2055 | 2355 | struct drm_rect *damage_area, |
| 2056 | 2356 | struct drm_rect *pipe_src) |
| @@ -2095,21 +2395,38 @@ static void intel_psr2_sel_fetch_pipe_alignment(struct intel_crtc_state *crtc_st · 38 unmodified lines | ||
| 2095 | 2395 | * cursor fully when cursor is in SU area. |
| 2096 | 2396 | */ |
| 2097 | 2397 | static void |
| 2098 | −intel_psr2_sel_fetch_et_alignment(struct intel_crtc_state *crtc_state, | |
| 2099 | − struct intel_plane_state *cursor_state) | |
| 2398 | +intel_psr2_sel_fetch_et_alignment(struct intel_atomic_state *state, | |
| 2399 | + struct intel_crtc *crtc, | |
| 2400 | + bool *cursor_in_su_area) | |
| 2100 | 2401 | { |
| 2101 | − struct drm_rect inter; | |
| 2402 | + struct intel_crtc_state *crtc_state = intel_atomic_get_new_crtc_state(state, crtc); | |
| 2403 | + struct intel_plane_state *new_plane_state; | |
| 2404 | + struct intel_plane *plane; | |
| 2405 | + int i; | |
| 2102 | 2406 | |
| 2103 | − if (!crtc_state->enable_psr2_su_region_et || | |
| 2104 | − !cursor_state->uapi.visible) | |
| 2407 | + if (!crtc_state->enable_psr2_su_region_et) | |
| 2105 | 2408 | return; |
| 2106 | 2409 | |
| 2107 | − inter = crtc_state->psr2_su_area; | |
| 2108 | − if (!drm_rect_intersect(&inter, &cursor_state->uapi.dst)) | |
| 2109 | − return; | |
| 2410 | + for_each_new_intel_plane_in_state(state, plane, new_plane_state, i) { | |
| 2411 | + struct drm_rect inter; | |
| 2110 | 2412 | |
| 2111 | − clip_area_update(&crtc_state->psr2_su_area, &cursor_state->uapi.dst, | |
| 2112 | − &crtc_state->pipe_src); | |
| 2413 | + if (new_plane_state->uapi.crtc != crtc_state->uapi.crtc) | |
| 2414 | + continue; | |
| 2415 | + | |
| 2416 | + if (plane->id != PLANE_CURSOR) | |
| 2417 | + continue; | |
| 2418 | + | |
| 2419 | + if (!new_plane_state->uapi.visible) | |
| 2420 | + continue; | |
| 2421 | + | |
| 2422 | + inter = crtc_state->psr2_su_area; | |
| 2423 | + if (!drm_rect_intersect(&inter, &new_plane_state->uapi.dst)) | |
| 2424 | + continue; | |
| 2425 | + | |
| 2426 | + clip_area_update(&crtc_state->psr2_su_area, &new_plane_state->uapi.dst, | |
| 2427 | + &crtc_state->pipe_src); | |
| 2428 | + *cursor_in_su_area = true; | |
| 2429 | + } | |
| 2113 | 2430 | } |
| 2114 | 2431 | |
| 2115 | 2432 | /* |
| @@ -2152,10 +2469,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, · 36 unmodified lines | ||
| 2152 | 2469 | { |
| 2153 | 2470 | struct drm_i915_private *dev_priv = to_i915(state->base.dev); |
| 2154 | 2471 | struct intel_crtc_state *crtc_state = intel_atomic_get_new_crtc_state(state, crtc); |
| 2155 | − struct intel_plane_state *new_plane_state, *old_plane_state, | |
| 2156 | − *cursor_plane_state = NULL; | |
| 2472 | + struct intel_plane_state *new_plane_state, *old_plane_state; | |
| 2157 | 2473 | struct intel_plane *plane; |
| 2158 | − bool full_update = false; | |
| 2474 | + bool full_update = false, cursor_in_su_area = false; | |
| 2159 | 2475 | int i, ret; |
| 2160 | 2476 | |
| 2161 | 2477 | if (!crtc_state->enable_psr2_sel_fetch) |
| @@ -2238,13 +2554,6 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, · 76 unmodified lines | ||
| 2238 | 2554 | damaged_area.x2 += new_plane_state->uapi.dst.x1 - src.x1; |
| 2239 | 2555 | |
| 2240 | 2556 | clip_area_update(&crtc_state->psr2_su_area, &damaged_area, &crtc_state->pipe_src); |
| 2241 | − | |
| 2242 | − /* | |
| 2243 | − * Cursor plane new state is stored to adjust su area to cover | |
| 2244 | − * cursor are fully. | |
| 2245 | − */ | |
| 2246 | − if (plane->id == PLANE_CURSOR) | |
| 2247 | − cursor_plane_state = new_plane_state; | |
| 2248 | 2557 | } |
| 2249 | 2558 | |
| 2250 | 2559 | /* |
| @@ -2273,9 +2582,13 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, · 22 unmodified lines | ||
| 2273 | 2582 | if (ret) |
| 2274 | 2583 | return ret; |
| 2275 | 2584 | |
| 2276 | − /* Adjust su area to cover cursor fully as necessary */ | |
| 2277 | − if (cursor_plane_state) | |
| 2278 | − intel_psr2_sel_fetch_et_alignment(crtc_state, cursor_plane_state); | |
| 2585 | + /* | |
| 2586 | + * Adjust su area to cover cursor fully as necessary (early | |
| 2587 | + * transport). This needs to be done after | |
| 2588 | + * drm_atomic_add_affected_planes to ensure visible cursor is added into | |
| 2589 | + * affected planes even when cursor is not updated by itself. | |
| 2590 | + */ | |
| 2591 | + intel_psr2_sel_fetch_et_alignment(state, crtc, &cursor_in_su_area); | |
| 2279 | 2592 | |
| 2280 | 2593 | intel_psr2_sel_fetch_pipe_alignment(crtc_state); |
| 2281 | 2594 | |
| @@ -2338,6 +2651,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, · 56 unmodified lines | ||
| 2338 | 2651 | |
| 2339 | 2652 | skip_sel_fetch_set_loop: |
| 2340 | 2653 | psr2_man_trk_ctl_calc(crtc_state, full_update); |
| 2654 | + crtc_state->pipe_srcsz_early_tpt = | |
| 2655 | + psr2_pipe_srcsz_early_tpt_calc(crtc_state, full_update, | |
| 2656 | + cursor_in_su_area); | |
| 2341 | 2657 | return 0; |
| 2342 | 2658 | } |
| 2343 | 2659 | |
| @@ -2394,7 +2710,7 @@ void intel_psr_post_plane_update(struct intel_atomic_state *state, · 50 unmodified lines | ||
| 2394 | 2710 | intel_atomic_get_new_crtc_state(state, crtc); |
| 2395 | 2711 | struct intel_encoder *encoder; |
| 2396 | 2712 | |
| 2397 | − if (!(crtc_state->has_psr || crtc_state->has_panel_replay)) | |
| 2713 | + if (!crtc_state->has_psr) | |
| 2398 | 2714 | return; |
| 2399 | 2715 | |
| 2400 | 2716 | for_each_intel_encoder_mask_with_psr(state->base.dev, encoder, |
| @@ -2994,6 +3310,13 @@ static void psr_capability_changed_check(struct intel_dp *intel_dp) · 593 unmodified lines | ||
| 2994 | 3310 | } |
| 2995 | 3311 | } |
| 2996 | 3312 | |
| 3313 | +/* | |
| 3314 | + * On common bits: | |
| 3315 | + * DP_PSR_RFB_STORAGE_ERROR == DP_PANEL_REPLAY_RFB_STORAGE_ERROR | |
| 3316 | + * DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR == DP_PANEL_REPLAY_VSC_SDP_UNCORRECTABLE_ERROR | |
| 3317 | + * DP_PSR_LINK_CRC_ERROR == DP_PANEL_REPLAY_LINK_CRC_ERROR | |
| 3318 | + * this function is relying on PSR definitions | |
| 3319 | + */ | |
| 2997 | 3320 | void intel_psr_short_pulse(struct intel_dp *intel_dp) |
| 2998 | 3321 | { |
| 2999 | 3322 | struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); |
| @@ -3003,7 +3326,7 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp) · 3 unmodified lines | ||
| 3003 | 3326 | DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR | |
| 3004 | 3327 | DP_PSR_LINK_CRC_ERROR; |
| 3005 | 3328 | |
| 3006 | − if (!CAN_PSR(intel_dp)) | |
| 3329 | + if (!CAN_PSR(intel_dp) && !CAN_PANEL_REPLAY(intel_dp)) | |
| 3007 | 3330 | return; |
| 3008 | 3331 | |
| 3009 | 3332 | mutex_lock(&psr->lock); |
| @@ -3017,12 +3340,14 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp) · 7 unmodified lines | ||
| 3017 | 3340 | goto exit; |
| 3018 | 3341 | } |
| 3019 | 3342 | |
| 3020 | − if (status == DP_PSR_SINK_INTERNAL_ERROR || (error_status & errors)) { | |
| 3343 | + if ((!psr->panel_replay_enabled && status == DP_PSR_SINK_INTERNAL_ERROR) || | |
| 3344 | + (error_status & errors)) { | |
| 3021 | 3345 | intel_psr_disable_locked(intel_dp); |
| 3022 | 3346 | psr->sink_not_reliable = true; |
| 3023 | 3347 | } |
| 3024 | 3348 | |
| 3025 | − if (status == DP_PSR_SINK_INTERNAL_ERROR && !error_status) | |
| 3349 | + if (!psr->panel_replay_enabled && status == DP_PSR_SINK_INTERNAL_ERROR && | |
| 3350 | + !error_status) | |
| 3026 | 3351 | drm_dbg_kms(&dev_priv->drm, |
| 3027 | 3352 | "PSR sink internal error, disabling PSR\n"); |
| 3028 | 3353 | if (error_status & DP_PSR_RFB_STORAGE_ERROR) |
| @@ -3042,8 +3367,10 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp) · 13 unmodified lines | ||
| 3042 | 3367 | /* clear status register */ |
| 3043 | 3368 | drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_ERROR_STATUS, error_status); |
| 3044 | 3369 | |
| 3045 | − psr_alpm_check(intel_dp); | |
| 3046 | − psr_capability_changed_check(intel_dp); | |
| 3370 | + if (!psr->panel_replay_enabled) { | |
| 3371 | + psr_alpm_check(intel_dp); | |
| 3372 | + psr_capability_changed_check(intel_dp); | |
| 3373 | + } | |
| 3047 | 3374 | |
| 3048 | 3375 | exit: |
| 3049 | 3376 | mutex_unlock(&psr->lock); |
| @@ -21,8 +21,13 @@ struct intel_encoder; · 20 unmodified lines | ||
| 21 | 21 | struct intel_plane; |
| 22 | 22 | struct intel_plane_state; |
| 23 | 23 | |
| 24 | +#define CAN_PANEL_REPLAY(intel_dp) ((intel_dp)->psr.sink_panel_replay_support && \ | |
| 25 | + (intel_dp)->psr.source_panel_replay_support) | |
| 26 | + | |
| 24 | 27 | bool intel_encoder_can_psr(struct intel_encoder *encoder); |
| 25 | 28 | void intel_psr_init_dpcd(struct intel_dp *intel_dp); |
| 29 | +void intel_psr_enable_sink(struct intel_dp *intel_dp, | |
| 30 | + const struct intel_crtc_state *crtc_state); | |
| 26 | 31 | void intel_psr_pre_plane_update(struct intel_atomic_state *state, |
| 27 | 32 | struct intel_crtc *crtc); |
| 28 | 33 | void intel_psr_post_plane_update(struct intel_atomic_state *state, |
| @@ -348,9 +348,13 @@ · 347 unmodified lines | ||
| 348 | 348 | #define PORT_ALPM_LFPS_CTL(tran) _MMIO_TRANS2(tran, _PORT_ALPM_LFPS_CTL_A) |
| 349 | 349 | #define PORT_ALPM_LFPS_CTL_LFPS_START_POLARITY REG_BIT(31) |
| 350 | 350 | #define PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MASK REG_GENMASK(27, 24) |
| 351 | −#define ALPM_CTL_EXTENDED_FAST_WAKE_MIN_LINES 5 | |
| 352 | −#define ALPM_CTL_EXTENDED_FAST_WAKE_TIME(lines) REG_FIELD_PREP(ALPM_CTL_EXTENDED_FAST_WAKE_TIME_MASK, (lines) - ALPM_CTL_EXTENDED_FAST_WAKE_MIN_LINES) | |
| 353 | −#define ALPM_CTL_AUX_LESS_WAKE_TIME_MASK REG_GENMASK(5, 0) | |
| 354 | −#define ALPM_CTL_AUX_LESS_WAKE_TIME(val) REG_FIELD_PREP(ALPM_CTL_AUX_LESS_WAKE_TIME_MASK, val) | |
| 351 | +#define PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MIN 7 | |
| 352 | +#define PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT(val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MASK, (val) - PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MIN) | |
| 353 | +#define PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(20, 16) | |
| 354 | +#define PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION(val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val) | |
| 355 | +#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(12, 8) | |
| 356 | +#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION(val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val) | |
| 357 | +#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(4, 0) | |
| 358 | +#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION(val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val) | |
| 355 | 359 | |
| 356 | 360 | #endif /* __INTEL_PSR_REGS_H__ */ |
| @@ -193,7 +193,7 @@ to_intel_sdvo_connector(struct drm_connector *connector) · 192 unmodified lines | ||
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | #define to_intel_sdvo_connector_state(conn_state) \ |
| 196 | − container_of((conn_state), struct intel_sdvo_connector_state, base.base) | |
| 196 | + container_of_const((conn_state), struct intel_sdvo_connector_state, base.base) | |
| 197 | 197 | |
| 198 | 198 | static bool |
| 199 | 199 | intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo); |
| @@ -1944,7 +1944,7 @@ intel_sdvo_mode_valid(struct drm_connector *connector, · 1744 unmodified lines | ||
| 1944 | 1944 | struct intel_sdvo_connector *intel_sdvo_connector = |
| 1945 | 1945 | to_intel_sdvo_connector(connector); |
| 1946 | 1946 | bool has_hdmi_sink = intel_has_hdmi_sink(intel_sdvo_connector, connector->state); |
| 1947 | − int max_dotclk = i915->max_dotclk_freq; | |
| 1947 | + int max_dotclk = i915->display.cdclk.max_dotclk_freq; | |
| 1948 | 1948 | enum drm_mode_status status; |
| 1949 | 1949 | int clock = mode->clock; |
| 1950 | 1950 | |
| @@ -1952,9 +1952,6 @@ intel_sdvo_mode_valid(struct drm_connector *connector, · 1 unmodified line | ||
| 1952 | 1952 | if (status != MODE_OK) |
| 1953 | 1953 | return status; |
| 1954 | 1954 | |
| 1955 | − if (mode->flags & DRM_MODE_FLAG_DBLSCAN) | |
| 1956 | − return MODE_NO_DBLESCAN; | |
| 1957 | − | |
| 1958 | 1955 | if (clock > max_dotclk) |
| 1959 | 1956 | return MODE_CLOCK_HIGH; |
| 1960 | 1957 | |
| @@ -2378,7 +2375,7 @@ intel_sdvo_connector_atomic_get_property(struct drm_connector *connector, · 417 unmodified lines | ||
| 2378 | 2375 | u64 *val) |
| 2379 | 2376 | { |
| 2380 | 2377 | struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); |
| 2381 | − const struct intel_sdvo_connector_state *sdvo_state = to_intel_sdvo_connector_state((void *)state); | |
| 2378 | + const struct intel_sdvo_connector_state *sdvo_state = to_intel_sdvo_connector_state(state); | |
| 2382 | 2379 | |
| 2383 | 2380 | if (property == intel_sdvo_connector->tv_format) { |
| 2384 | 2381 | int i; |
| @@ -44,12 +44,14 @@ void intel_snps_phy_wait_for_calibration(struct drm_i915_private *i915) · 43 unmodified lines | ||
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | −void intel_snps_phy_update_psr_power_state(struct drm_i915_private *i915, | |
| 48 | − enum phy phy, bool enable) | |
| 47 | +void intel_snps_phy_update_psr_power_state(struct intel_encoder *encoder, | |
| 48 | + bool enable) | |
| 49 | 49 | { |
| 50 | + struct drm_i915_private *i915 = to_i915(encoder->base.dev); | |
| 51 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 50 | 52 | u32 val; |
| 51 | 53 | |
| 52 | − if (!intel_phy_is_snps(i915, phy)) | |
| 54 | + if (!intel_encoder_is_snps(encoder)) | |
| 53 | 55 | return; |
| 54 | 56 | |
| 55 | 57 | val = REG_FIELD_PREP(SNPS_PHY_TX_REQ_LN_DIS_PWR_STATE_PSR, |
| @@ -63,7 +65,7 @@ void intel_snps_phy_set_signal_levels(struct intel_encoder *encoder, · 7 unmodified lines | ||
| 63 | 65 | { |
| 64 | 66 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 65 | 67 | const struct intel_ddi_buf_trans *trans; |
| 66 | − enum phy phy = intel_port_to_phy(dev_priv, encoder->port); | |
| 68 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 67 | 69 | int n_entries, ln; |
| 68 | 70 | |
| 69 | 71 | trans = encoder->get_buf_trans(encoder, crtc_state, &n_entries); |
| @@ -1822,7 +1824,7 @@ void intel_mpllb_enable(struct intel_encoder *encoder, · 1752 unmodified lines | ||
| 1822 | 1824 | { |
| 1823 | 1825 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 1824 | 1826 | const struct intel_mpllb_state *pll_state = &crtc_state->mpllb_state; |
| 1825 | − enum phy phy = intel_port_to_phy(dev_priv, encoder->port); | |
| 1827 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1826 | 1828 | i915_reg_t enable_reg = (phy <= PHY_D ? |
| 1827 | 1829 | DG2_PLL_ENABLE(phy) : MG_PLL_ENABLE(0)); |
| 1828 | 1830 | |
| @@ -1879,7 +1881,7 @@ void intel_mpllb_enable(struct intel_encoder *encoder, · 50 unmodified lines | ||
| 1879 | 1881 | void intel_mpllb_disable(struct intel_encoder *encoder) |
| 1880 | 1882 | { |
| 1881 | 1883 | struct drm_i915_private *i915 = to_i915(encoder->base.dev); |
| 1882 | − enum phy phy = intel_port_to_phy(i915, encoder->port); | |
| 1884 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1883 | 1885 | i915_reg_t enable_reg = (phy <= PHY_D ? |
| 1884 | 1886 | DG2_PLL_ENABLE(phy) : MG_PLL_ENABLE(0)); |
| 1885 | 1887 | |
| @@ -1951,7 +1953,7 @@ void intel_mpllb_readout_hw_state(struct intel_encoder *encoder, · 65 unmodified lines | ||
| 1951 | 1953 | struct intel_mpllb_state *pll_state) |
| 1952 | 1954 | { |
| 1953 | 1955 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 1954 | − enum phy phy = intel_port_to_phy(dev_priv, encoder->port); | |
| 1956 | + enum phy phy = intel_encoder_to_phy(encoder); | |
| 1955 | 1957 | |
| 1956 | 1958 | pll_state->mpllb_cp = intel_de_read(dev_priv, SNPS_PHY_MPLLB_CP(phy)); |
| 1957 | 1959 | pll_state->mpllb_div = intel_de_read(dev_priv, SNPS_PHY_MPLLB_DIV(phy)); |
| @@ -17,8 +17,8 @@ struct intel_mpllb_state; · 16 unmodified lines | ||
| 17 | 17 | enum phy; |
| 18 | 18 | |
| 19 | 19 | void intel_snps_phy_wait_for_calibration(struct drm_i915_private *dev_priv); |
| 20 | −void intel_snps_phy_update_psr_power_state(struct drm_i915_private *dev_priv, | |
| 21 | − enum phy phy, bool enable); | |
| 20 | +void intel_snps_phy_update_psr_power_state(struct intel_encoder *encoder, | |
| 21 | + bool enable); | |
| 22 | 22 | |
| 23 | 23 | int intel_mpllb_calc_state(struct intel_crtc_state *crtc_state, |
| 24 | 24 | struct intel_encoder *encoder); |
| @@ -100,11 +100,9 @@ static struct drm_i915_private *tc_to_i915(struct intel_tc_port *tc) · 99 unmodified lines | ||
| 100 | 100 | static bool intel_tc_port_in_mode(struct intel_digital_port *dig_port, |
| 101 | 101 | enum tc_port_mode mode) |
| 102 | 102 | { |
| 103 | − struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); | |
| 104 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 105 | 103 | struct intel_tc_port *tc = to_tc_port(dig_port); |
| 106 | 104 | |
| 107 | − return intel_phy_is_tc(i915, phy) && tc->mode == mode; | |
| 105 | + return intel_encoder_is_tc(&dig_port->base) && tc->mode == mode; | |
| 108 | 106 | } |
| 109 | 107 | |
| 110 | 108 | bool intel_tc_port_in_tbt_alt_mode(struct intel_digital_port *dig_port) |
| @@ -124,11 +122,9 @@ bool intel_tc_port_in_legacy_mode(struct intel_digital_port *dig_port) · 13 unmodified lines | ||
| 124 | 122 | |
| 125 | 123 | bool intel_tc_port_handles_hpd_glitches(struct intel_digital_port *dig_port) |
| 126 | 124 | { |
| 127 | − struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); | |
| 128 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 129 | 125 | struct intel_tc_port *tc = to_tc_port(dig_port); |
| 130 | 126 | |
| 131 | − return intel_phy_is_tc(i915, phy) && !tc->legacy_port; | |
| 127 | + return intel_encoder_is_tc(&dig_port->base) && !tc->legacy_port; | |
| 132 | 128 | } |
| 133 | 129 | |
| 134 | 130 | /* |
| @@ -254,8 +250,7 @@ assert_tc_cold_blocked(struct intel_tc_port *tc) · 119 unmodified lines | ||
| 254 | 250 | static enum intel_display_power_domain |
| 255 | 251 | tc_port_power_domain(struct intel_tc_port *tc) |
| 256 | 252 | { |
| 257 | − struct drm_i915_private *i915 = tc_to_i915(tc); | |
| 258 | − enum tc_port tc_port = intel_port_to_tc(i915, tc->dig_port->base.port); | |
| 253 | + enum tc_port tc_port = intel_encoder_to_tc(&tc->dig_port->base); | |
| 259 | 254 | |
| 260 | 255 | return POWER_DOMAIN_PORT_DDI_LANES_TC1 + tc_port - TC_PORT_1; |
| 261 | 256 | } |
| @@ -302,7 +297,7 @@ u32 intel_tc_port_get_pin_assignment_mask(struct intel_digital_port *dig_port) · 40 unmodified lines | ||
| 302 | 297 | static int lnl_tc_port_get_max_lane_count(struct intel_digital_port *dig_port) |
| 303 | 298 | { |
| 304 | 299 | struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); |
| 305 | − enum tc_port tc_port = intel_port_to_tc(i915, dig_port->base.port); | |
| 300 | + enum tc_port tc_port = intel_encoder_to_tc(&dig_port->base); | |
| 306 | 301 | intel_wakeref_t wakeref; |
| 307 | 302 | u32 val, pin_assignment; |
| 308 | 303 | |
| @@ -375,9 +370,8 @@ int intel_tc_port_max_lane_count(struct intel_digital_port *dig_port) · 66 unmodified lines | ||
| 375 | 370 | { |
| 376 | 371 | struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); |
| 377 | 372 | struct intel_tc_port *tc = to_tc_port(dig_port); |
| 378 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 379 | 373 | |
| 380 | − if (!intel_phy_is_tc(i915, phy) || tc->mode != TC_PORT_DP_ALT) | |
| 374 | + if (!intel_encoder_is_tc(&dig_port->base) || tc->mode != TC_PORT_DP_ALT) | |
| 381 | 375 | return 4; |
| 382 | 376 | |
| 383 | 377 | assert_tc_cold_blocked(tc); |
| @@ -458,9 +452,7 @@ static void tc_port_fixup_legacy_flag(struct intel_tc_port *tc, · 74 unmodified lines | ||
| 458 | 452 | |
| 459 | 453 | static void tc_phy_load_fia_params(struct intel_tc_port *tc, bool modular_fia) |
| 460 | 454 | { |
| 461 | − struct drm_i915_private *i915 = tc_to_i915(tc); | |
| 462 | − enum port port = tc->dig_port->base.port; | |
| 463 | − enum tc_port tc_port = intel_port_to_tc(i915, port); | |
| 455 | + enum tc_port tc_port = intel_encoder_to_tc(&tc->dig_port->base); | |
| 464 | 456 | |
| 465 | 457 | /* |
| 466 | 458 | * Each Modular FIA instance houses 2 TC ports. In SOC that has more |
| @@ -812,7 +804,7 @@ static u32 adlp_tc_phy_hpd_live_status(struct intel_tc_port *tc) · 345 unmodified lines | ||
| 812 | 804 | static bool adlp_tc_phy_is_ready(struct intel_tc_port *tc) |
| 813 | 805 | { |
| 814 | 806 | struct drm_i915_private *i915 = tc_to_i915(tc); |
| 815 | − enum tc_port tc_port = intel_port_to_tc(i915, tc->dig_port->base.port); | |
| 807 | + enum tc_port tc_port = intel_encoder_to_tc(&tc->dig_port->base); | |
| 816 | 808 | u32 val; |
| 817 | 809 | |
| 818 | 810 | assert_display_core_power_enabled(tc); |
| @@ -1635,10 +1627,7 @@ static bool __intel_tc_port_link_needs_reset(struct intel_tc_port *tc) · 816 unmodified lines | ||
| 1635 | 1627 | |
| 1636 | 1628 | bool intel_tc_port_link_needs_reset(struct intel_digital_port *dig_port) |
| 1637 | 1629 | { |
| 1638 | − struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); | |
| 1639 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 1640 | − | |
| 1641 | − if (!intel_phy_is_tc(i915, phy)) | |
| 1630 | + if (!intel_encoder_is_tc(&dig_port->base)) | |
| 1642 | 1631 | return false; |
| 1643 | 1632 | |
| 1644 | 1633 | return __intel_tc_port_link_needs_reset(to_tc_port(dig_port)); |
| @@ -1740,11 +1729,9 @@ bool intel_tc_port_link_reset(struct intel_digital_port *dig_port) · 95 unmodified lines | ||
| 1740 | 1729 | |
| 1741 | 1730 | void intel_tc_port_link_cancel_reset_work(struct intel_digital_port *dig_port) |
| 1742 | 1731 | { |
| 1743 | − struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); | |
| 1744 | − enum phy phy = intel_port_to_phy(i915, dig_port->base.port); | |
| 1745 | 1732 | struct intel_tc_port *tc = to_tc_port(dig_port); |
| 1746 | 1733 | |
| 1747 | − if (!intel_phy_is_tc(i915, phy)) | |
| 1734 | + if (!intel_encoder_is_tc(&dig_port->base)) | |
| 1748 | 1735 | return; |
| 1749 | 1736 | |
| 1750 | 1737 | cancel_delayed_work(&tc->link_reset_work); |
| @@ -1861,7 +1848,7 @@ int intel_tc_port_init(struct intel_digital_port *dig_port, bool is_legacy) · 110 unmodified lines | ||
| 1861 | 1848 | struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); |
| 1862 | 1849 | struct intel_tc_port *tc; |
| 1863 | 1850 | enum port port = dig_port->base.port; |
| 1864 | − enum tc_port tc_port = intel_port_to_tc(i915, port); | |
| 1851 | + enum tc_port tc_port = intel_encoder_to_tc(&dig_port->base); | |
| 1865 | 1852 | |
| 1866 | 1853 | if (drm_WARN_ON(&i915->drm, tc_port == TC_PORT_NONE)) |
| 1867 | 1854 | return -EINVAL; |
| @@ -885,7 +885,8 @@ struct intel_tv_connector_state { · 884 unmodified lines | ||
| 885 | 885 | bool bypass_vfilter; |
| 886 | 886 | }; |
| 887 | 887 | |
| 888 | −#define to_intel_tv_connector_state(x) container_of(x, struct intel_tv_connector_state, base) | |
| 888 | +#define to_intel_tv_connector_state(conn_state) \ | |
| 889 | + container_of_const((conn_state), struct intel_tv_connector_state, base) | |
| 889 | 890 | |
| 890 | 891 | static struct drm_connector_state * |
| 891 | 892 | intel_tv_connector_duplicate_state(struct drm_connector *connector) |
| @@ -961,16 +962,13 @@ intel_tv_mode_valid(struct drm_connector *connector, · 69 unmodified lines | ||
| 961 | 962 | { |
| 962 | 963 | struct drm_i915_private *i915 = to_i915(connector->dev); |
| 963 | 964 | const struct tv_mode *tv_mode = intel_tv_mode_find(connector->state); |
| 964 | − int max_dotclk = i915->max_dotclk_freq; | |
| 965 | + int max_dotclk = i915->display.cdclk.max_dotclk_freq; | |
| 965 | 966 | enum drm_mode_status status; |
| 966 | 967 | |
| 967 | 968 | status = intel_cpu_transcoder_mode_valid(i915, mode); |
| 968 | 969 | if (status != MODE_OK) |
| 969 | 970 | return status; |
| 970 | 971 | |
| 971 | − if (mode->flags & DRM_MODE_FLAG_DBLSCAN) | |
| 972 | − return MODE_NO_DBLESCAN; | |
| 973 | − | |
| 974 | 972 | if (mode->clock > max_dotclk) |
| 975 | 973 | return MODE_CLOCK_HIGH; |
| 976 | 974 | |
| @@ -485,6 +485,7 @@ struct child_device_config { · 484 unmodified lines | ||
| 485 | 485 | u8 hdmi_iboost_level:4; /* 196+ */ |
| 486 | 486 | u8 dp_max_link_rate:3; /* 216+ */ |
| 487 | 487 | u8 dp_max_link_rate_reserved:5; /* 216+ */ |
| 488 | + u8 efp_index; /* 256+ */ | |
| 488 | 489 | } __packed; |
| 489 | 490 | |
| 490 | 491 | struct bdb_general_definitions { |
| @@ -602,22 +603,22 @@ struct bdb_driver_features { · 111 unmodified lines | ||
| 602 | 603 | u8 custom_vbt_version; /* 155+ */ |
| 603 | 604 | |
| 604 | 605 | /* Driver Feature Flags */ |
| 605 | − u16 rmpm_enabled:1; /* 165+ */ | |
| 606 | − u16 s2ddt_enabled:1; /* 165+ */ | |
| 607 | − u16 dpst_enabled:1; /* 165-227 */ | |
| 608 | − u16 bltclt_enabled:1; /* 165+ */ | |
| 609 | − u16 adb_enabled:1; /* 165-227 */ | |
| 610 | − u16 drrs_enabled:1; /* 165-227 */ | |
| 611 | − u16 grs_enabled:1; /* 165+ */ | |
| 612 | − u16 gpmt_enabled:1; /* 165+ */ | |
| 613 | − u16 tbt_enabled:1; /* 165+ */ | |
| 606 | + u16 rmpm_enabled:1; /* 159+ */ | |
| 607 | + u16 s2ddt_enabled:1; /* 159+ */ | |
| 608 | + u16 dpst_enabled:1; /* 159-227 */ | |
| 609 | + u16 bltclt_enabled:1; /* 159+ */ | |
| 610 | + u16 adb_enabled:1; /* 159-227 */ | |
| 611 | + u16 drrs_enabled:1; /* 159-227 */ | |
| 612 | + u16 grs_enabled:1; /* 159+ */ | |
| 613 | + u16 gpmt_enabled:1; /* 159+ */ | |
| 614 | + u16 tbt_enabled:1; /* 159+ */ | |
| 614 | 615 | u16 psr_enabled:1; /* 165-227 */ |
| 615 | 616 | u16 ips_enabled:1; /* 165+ */ |
| 616 | − u16 dpfs_enabled:1; /* 165+ */ | |
| 617 | + u16 dfps_enabled:1; /* 165+ */ | |
| 617 | 618 | u16 dmrrs_enabled:1; /* 174-227 */ |
| 618 | 619 | u16 adt_enabled:1; /* ???-228 */ |
| 619 | 620 | u16 hpd_wake:1; /* 201-240 */ |
| 620 | − u16 pc_feature_valid:1; | |
| 621 | + u16 pc_feature_valid:1; /* 159+ */ | |
| 621 | 622 | } __packed; |
| 622 | 623 | |
| 623 | 624 | /* |
| @@ -880,11 +881,12 @@ struct bdb_lvds_lfp_data_tail { · 256 unmodified lines | ||
| 880 | 881 | struct lfp_backlight_data_entry { |
| 881 | 882 | u8 type:2; |
| 882 | 883 | u8 active_low_pwm:1; |
| 883 | − u8 obsolete1:5; | |
| 884 | + u8 i2c_pin:3; /* obsolete since ? */ | |
| 885 | + u8 i2c_speed:2; /* obsolete since ? */ | |
| 884 | 886 | u16 pwm_freq_hz; |
| 885 | 887 | u8 min_brightness; /* ???-233 */ |
| 886 | − u8 obsolete2; | |
| 887 | − u8 obsolete3; | |
| 888 | + u8 i2c_address; /* obsolete since ? */ | |
| 889 | + u8 i2c_command; /* obsolete since ? */ | |
| 888 | 890 | } __packed; |
| 889 | 891 | |
| 890 | 892 | struct lfp_backlight_control_method { |
| @@ -905,8 +907,8 @@ struct lfp_brightness_level { · 14 unmodified lines | ||
| 905 | 907 | struct bdb_lfp_backlight_data { |
| 906 | 908 | u8 entry_size; |
| 907 | 909 | struct lfp_backlight_data_entry data[16]; |
| 908 | − u8 level[16]; /* ???-233 */ | |
| 909 | − struct lfp_backlight_control_method backlight_control[16]; | |
| 910 | + u8 level[16]; /* 162-233 */ | |
| 911 | + struct lfp_backlight_control_method backlight_control[16]; /* 191+ */ | |
| 910 | 912 | struct lfp_brightness_level brightness_level[16]; /* 234+ */ |
| 911 | 913 | struct lfp_brightness_level brightness_min_level[16]; /* 234+ */ |
| 912 | 914 | u8 brightness_precision_bits[16]; /* 236+ */ |
| @@ -917,7 +919,7 @@ struct bdb_lfp_backlight_data { · 4 unmodified lines | ||
| 917 | 919 | * Block 44 - LFP Power Conservation Features Block |
| 918 | 920 | */ |
| 919 | 921 | struct lfp_power_features { |
| 920 | − u8 reserved1:1; | |
| 922 | + u8 dpst_support:1; /* ???-159 */ | |
| 921 | 923 | u8 power_conservation_pref:3; |
| 922 | 924 | u8 reserved2:1; |
| 923 | 925 | u8 lace_enabled_status:1; /* 210+ */ |
| @@ -9,6 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | #include "intel_de.h" |
| 10 | 10 | #include "intel_display_types.h" |
| 11 | 11 | #include "intel_vrr.h" |
| 12 | +#include "intel_dp.h" | |
| 12 | 13 | |
| 13 | 14 | bool intel_vrr_is_capable(struct intel_connector *connector) |
| 14 | 15 | { |
| @@ -113,10 +114,18 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state, · 98 unmodified lines | ||
| 113 | 114 | struct drm_i915_private *i915 = to_i915(crtc->base.dev); |
| 114 | 115 | struct intel_connector *connector = |
| 115 | 116 | to_intel_connector(conn_state->connector); |
| 117 | + struct intel_dp *intel_dp = intel_attached_dp(connector); | |
| 116 | 118 | struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; |
| 117 | 119 | const struct drm_display_info *info = &connector->base.display_info; |
| 118 | 120 | int vmin, vmax; |
| 119 | 121 | |
| 122 | + /* | |
| 123 | + * FIXME all joined pipes share the same transcoder. | |
| 124 | + * Need to account for that during VRR toggle/push/etc. | |
| 125 | + */ | |
| 126 | + if (crtc_state->bigjoiner_pipes) | |
| 127 | + return; | |
| 128 | + | |
| 120 | 129 | if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) |
| 121 | 130 | return; |
| 122 | 131 | |
| @@ -165,6 +174,14 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state, · 42 unmodified lines | ||
| 165 | 174 | if (crtc_state->uapi.vrr_enabled) { |
| 166 | 175 | crtc_state->vrr.enable = true; |
| 167 | 176 | crtc_state->mode_flags |= I915_MODE_FLAG_VRR; |
| 177 | + if (intel_dp_as_sdp_supported(intel_dp)) { | |
| 178 | + crtc_state->vrr.vsync_start = | |
| 179 | + (crtc_state->hw.adjusted_mode.crtc_vtotal - | |
| 180 | + crtc_state->hw.adjusted_mode.vsync_start); | |
| 181 | + crtc_state->vrr.vsync_end = | |
| 182 | + (crtc_state->hw.adjusted_mode.crtc_vtotal - | |
| 183 | + crtc_state->hw.adjusted_mode.vsync_end); | |
| 184 | + } | |
| 168 | 185 | } |
| 169 | 186 | } |
| 170 | 187 | |
| @@ -240,6 +257,12 @@ void intel_vrr_enable(const struct intel_crtc_state *crtc_state) · 69 unmodified lines | ||
| 240 | 257 | return; |
| 241 | 258 | |
| 242 | 259 | intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder), TRANS_PUSH_EN); |
| 260 | + | |
| 261 | + if (HAS_AS_SDP(dev_priv)) | |
| 262 | + intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder), | |
| 263 | + VRR_VSYNC_END(crtc_state->vrr.vsync_end) | | |
| 264 | + VRR_VSYNC_START(crtc_state->vrr.vsync_start)); | |
| 265 | + | |
| 243 | 266 | intel_de_write(dev_priv, TRANS_VRR_CTL(cpu_transcoder), |
| 244 | 267 | VRR_CTL_VRR_ENABLE | trans_vrr_ctl(crtc_state)); |
| 245 | 268 | } |
| @@ -258,13 +281,16 @@ void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state) · 12 unmodified lines | ||
| 258 | 281 | intel_de_wait_for_clear(dev_priv, TRANS_VRR_STATUS(cpu_transcoder), |
| 259 | 282 | VRR_STATUS_VRR_EN_LIVE, 1000); |
| 260 | 283 | intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder), 0); |
| 284 | + | |
| 285 | + if (HAS_AS_SDP(dev_priv)) | |
| 286 | + intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder), 0); | |
| 261 | 287 | } |
| 262 | 288 | |
| 263 | 289 | void intel_vrr_get_config(struct intel_crtc_state *crtc_state) |
| 264 | 290 | { |
| 265 | 291 | struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); |
| 266 | 292 | enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; |
| 267 | − u32 trans_vrr_ctl; | |
| 293 | + u32 trans_vrr_ctl, trans_vrr_vsync; | |
| 268 | 294 | |
| 269 | 295 | trans_vrr_ctl = intel_de_read(dev_priv, TRANS_VRR_CTL(cpu_transcoder)); |
| 270 | 296 | |
| @@ -284,6 +310,16 @@ void intel_vrr_get_config(struct intel_crtc_state *crtc_state) · 13 unmodified lines | ||
| 284 | 310 | crtc_state->vrr.vmin = intel_de_read(dev_priv, TRANS_VRR_VMIN(cpu_transcoder)) + 1; |
| 285 | 311 | } |
| 286 | 312 | |
| 287 | − if (crtc_state->vrr.enable) | |
| 313 | + if (crtc_state->vrr.enable) { | |
| 288 | 314 | crtc_state->mode_flags |= I915_MODE_FLAG_VRR; |
| 315 | + | |
| 316 | + if (HAS_AS_SDP(dev_priv)) { | |
| 317 | + trans_vrr_vsync = | |
| 318 | + intel_de_read(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder)); | |
| 319 | + crtc_state->vrr.vsync_start = | |
| 320 | + REG_FIELD_GET(VRR_VSYNC_START_MASK, trans_vrr_vsync); | |
| 321 | + crtc_state->vrr.vsync_end = | |
| 322 | + REG_FIELD_GET(VRR_VSYNC_END_MASK, trans_vrr_vsync); | |
| 323 | + } | |
| 324 | + } | |
| 289 | 325 | } |
| @@ -213,10 +213,11 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, · 212 unmodified lines | ||
| 213 | 213 | * The pipe scaler does not use all the bits of PIPESRC, at least |
| 214 | 214 | * on the earlier platforms. So even when we're scaling a plane |
| 215 | 215 | * the *pipe* source size must not be too large. For simplicity |
| 216 | − * we assume the limits match the scaler source size limits. Might | |
| 217 | − * not be 100% accurate on all platforms, but good enough for now. | |
| 216 | + * we assume the limits match the scaler destination size limits. | |
| 217 | + * Might not be 100% accurate on all platforms, but good enough for | |
| 218 | + * now. | |
| 218 | 219 | */ |
| 219 | − if (pipe_src_w > max_src_w || pipe_src_h > max_src_h) { | |
| 220 | + if (pipe_src_w > max_dst_w || pipe_src_h > max_dst_h) { | |
| 220 | 221 | drm_dbg_kms(&dev_priv->drm, |
| 221 | 222 | "scaler_user index %u.%u: pipe src size %ux%u " |
| 222 | 223 | "is out of scaler range\n", |
| @@ -6,18 +6,19 @@ · 5 unmodified lines | ||
| 6 | 6 | #include <drm/drm_blend.h> |
| 7 | 7 | |
| 8 | 8 | #include "i915_drv.h" |
| 9 | −#include "i915_fixed.h" | |
| 10 | 9 | #include "i915_reg.h" |
| 11 | 10 | #include "i9xx_wm.h" |
| 12 | 11 | #include "intel_atomic.h" |
| 13 | 12 | #include "intel_atomic_plane.h" |
| 14 | 13 | #include "intel_bw.h" |
| 14 | +#include "intel_cdclk.h" | |
| 15 | 15 | #include "intel_crtc.h" |
| 16 | 16 | #include "intel_de.h" |
| 17 | 17 | #include "intel_display.h" |
| 18 | 18 | #include "intel_display_power.h" |
| 19 | 19 | #include "intel_display_types.h" |
| 20 | 20 | #include "intel_fb.h" |
| 21 | +#include "intel_fixed.h" | |
| 21 | 22 | #include "intel_pcode.h" |
| 22 | 23 | #include "intel_wm.h" |
| 23 | 24 | #include "skl_watermark.h" |
| @@ -2601,10 +2602,17 @@ skl_compute_ddb(struct intel_atomic_state *state) · 2577 unmodified lines | ||
| 2601 | 2602 | return ret; |
| 2602 | 2603 | } |
| 2603 | 2604 | |
| 2604 | − if (HAS_MBUS_JOINING(i915)) | |
| 2605 | + if (HAS_MBUS_JOINING(i915)) { | |
| 2605 | 2606 | new_dbuf_state->joined_mbus = |
| 2606 | 2607 | adlp_check_mbus_joined(new_dbuf_state->active_pipes); |
| 2607 | 2608 | |
| 2609 | + if (old_dbuf_state->joined_mbus != new_dbuf_state->joined_mbus) { | |
| 2610 | + ret = intel_cdclk_state_set_joined_mbus(state, new_dbuf_state->joined_mbus); | |
| 2611 | + if (ret) | |
| 2612 | + return ret; | |
| 2613 | + } | |
| 2614 | + } | |
| 2615 | + | |
| 2608 | 2616 | for_each_intel_crtc(&i915->drm, crtc) { |
| 2609 | 2617 | enum pipe pipe = crtc->pipe; |
| 2610 | 2618 | |
| @@ -2628,13 +2636,6 @@ skl_compute_ddb(struct intel_atomic_state *state) · 17 unmodified lines | ||
| 2628 | 2636 | if (ret) |
| 2629 | 2637 | return ret; |
| 2630 | 2638 | |
| 2631 | − if (old_dbuf_state->joined_mbus != new_dbuf_state->joined_mbus) { | |
| 2632 | − /* TODO: Implement vblank synchronized MBUS joining changes */ | |
| 2633 | − ret = intel_modeset_all_pipes_late(state, "MBUS joining change"); | |
| 2634 | − if (ret) | |
| 2635 | − return ret; | |
| 2636 | − } | |
| 2637 | − | |
| 2638 | 2639 | drm_dbg_kms(&i915->drm, |
| 2639 | 2640 | "Enabled dbuf slices 0x%x -> 0x%x (total dbuf slices 0x%x), mbus joined? %s->%s\n", |
| 2640 | 2641 | old_dbuf_state->enabled_slices, |
| @@ -3057,6 +3058,8 @@ static void skl_wm_get_hw_state(struct drm_i915_private *i915) · 416 unmodified lines | ||
| 3057 | 3058 | if (HAS_MBUS_JOINING(i915)) |
| 3058 | 3059 | dbuf_state->joined_mbus = intel_de_read(i915, MBUS_CTL) & MBUS_JOIN; |
| 3059 | 3060 | |
| 3061 | + dbuf_state->mdclk_cdclk_ratio = intel_mdclk_cdclk_ratio(i915, &i915->display.cdclk.hw); | |
| 3062 | + | |
| 3060 | 3063 | for_each_intel_crtc(&i915->drm, crtc) { |
| 3061 | 3064 | struct intel_crtc_state *crtc_state = |
| 3062 | 3065 | to_intel_crtc_state(crtc->base.state); |
| @@ -3530,85 +3533,6 @@ int intel_dbuf_init(struct drm_i915_private *i915) · 467 unmodified lines | ||
| 3530 | 3533 | return 0; |
| 3531 | 3534 | } |
| 3532 | 3535 | |
| 3533 | −/* | |
| 3534 | − * Configure MBUS_CTL and all DBUF_CTL_S of each slice to join_mbus state before | |
| 3535 | − * update the request state of all DBUS slices. | |
| 3536 | − */ | |
| 3537 | −static void update_mbus_pre_enable(struct intel_atomic_state *state) | |
| 3538 | −{ | |
| 3539 | − struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3540 | − u32 mbus_ctl, dbuf_min_tracker_val; | |
| 3541 | − enum dbuf_slice slice; | |
| 3542 | − const struct intel_dbuf_state *dbuf_state = | |
| 3543 | − intel_atomic_get_new_dbuf_state(state); | |
| 3544 | − | |
| 3545 | − if (!HAS_MBUS_JOINING(i915)) | |
| 3546 | − return; | |
| 3547 | − | |
| 3548 | − /* | |
| 3549 | − * TODO: Implement vblank synchronized MBUS joining changes. | |
| 3550 | − * Must be properly coordinated with dbuf reprogramming. | |
| 3551 | − */ | |
| 3552 | − if (dbuf_state->joined_mbus) { | |
| 3553 | − mbus_ctl = MBUS_HASHING_MODE_1x4 | MBUS_JOIN | | |
| 3554 | − MBUS_JOIN_PIPE_SELECT_NONE; | |
| 3555 | − dbuf_min_tracker_val = DBUF_MIN_TRACKER_STATE_SERVICE(3); | |
| 3556 | − } else { | |
| 3557 | − mbus_ctl = MBUS_HASHING_MODE_2x2 | | |
| 3558 | − MBUS_JOIN_PIPE_SELECT_NONE; | |
| 3559 | − dbuf_min_tracker_val = DBUF_MIN_TRACKER_STATE_SERVICE(1); | |
| 3560 | − } | |
| 3561 | − | |
| 3562 | − intel_de_rmw(i915, MBUS_CTL, | |
| 3563 | − MBUS_HASHING_MODE_MASK | MBUS_JOIN | | |
| 3564 | − MBUS_JOIN_PIPE_SELECT_MASK, mbus_ctl); | |
| 3565 | − | |
| 3566 | − for_each_dbuf_slice(i915, slice) | |
| 3567 | − intel_de_rmw(i915, DBUF_CTL_S(slice), | |
| 3568 | − DBUF_MIN_TRACKER_STATE_SERVICE_MASK, | |
| 3569 | − dbuf_min_tracker_val); | |
| 3570 | −} | |
| 3571 | − | |
| 3572 | −void intel_dbuf_pre_plane_update(struct intel_atomic_state *state) | |
| 3573 | −{ | |
| 3574 | − struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3575 | − const struct intel_dbuf_state *new_dbuf_state = | |
| 3576 | − intel_atomic_get_new_dbuf_state(state); | |
| 3577 | − const struct intel_dbuf_state *old_dbuf_state = | |
| 3578 | − intel_atomic_get_old_dbuf_state(state); | |
| 3579 | − | |
| 3580 | − if (!new_dbuf_state || | |
| 3581 | − (new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices && | |
| 3582 | − new_dbuf_state->joined_mbus == old_dbuf_state->joined_mbus)) | |
| 3583 | − return; | |
| 3584 | − | |
| 3585 | − WARN_ON(!new_dbuf_state->base.changed); | |
| 3586 | − | |
| 3587 | − update_mbus_pre_enable(state); | |
| 3588 | − gen9_dbuf_slices_update(i915, | |
| 3589 | − old_dbuf_state->enabled_slices | | |
| 3590 | − new_dbuf_state->enabled_slices); | |
| 3591 | −} | |
| 3592 | − | |
| 3593 | −void intel_dbuf_post_plane_update(struct intel_atomic_state *state) | |
| 3594 | −{ | |
| 3595 | − struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3596 | − const struct intel_dbuf_state *new_dbuf_state = | |
| 3597 | − intel_atomic_get_new_dbuf_state(state); | |
| 3598 | − const struct intel_dbuf_state *old_dbuf_state = | |
| 3599 | − intel_atomic_get_old_dbuf_state(state); | |
| 3600 | − | |
| 3601 | − if (!new_dbuf_state || | |
| 3602 | − (new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices && | |
| 3603 | − new_dbuf_state->joined_mbus == old_dbuf_state->joined_mbus)) | |
| 3604 | − return; | |
| 3605 | − | |
| 3606 | − WARN_ON(!new_dbuf_state->base.changed); | |
| 3607 | − | |
| 3608 | − gen9_dbuf_slices_update(i915, | |
| 3609 | − new_dbuf_state->enabled_slices); | |
| 3610 | −} | |
| 3611 | − | |
| 3612 | 3536 | static bool xelpdp_is_only_pipe_per_dbuf_bank(enum pipe pipe, u8 active_pipes) |
| 3613 | 3537 | { |
| 3614 | 3538 | switch (pipe) { |
| @@ -3628,14 +3552,12 @@ static bool xelpdp_is_only_pipe_per_dbuf_bank(enum pipe pipe, u8 active_pipes) · 13 unmodified lines | ||
| 3628 | 3552 | return false; |
| 3629 | 3553 | } |
| 3630 | 3554 | |
| 3631 | −void intel_mbus_dbox_update(struct intel_atomic_state *state) | |
| 3555 | +static void intel_mbus_dbox_update(struct intel_atomic_state *state) | |
| 3632 | 3556 | { |
| 3633 | 3557 | struct drm_i915_private *i915 = to_i915(state->base.dev); |
| 3634 | 3558 | const struct intel_dbuf_state *new_dbuf_state, *old_dbuf_state; |
| 3635 | − const struct intel_crtc_state *new_crtc_state; | |
| 3636 | 3559 | const struct intel_crtc *crtc; |
| 3637 | 3560 | u32 val = 0; |
| 3638 | − int i; | |
| 3639 | 3561 | |
| 3640 | 3562 | if (DISPLAY_VER(i915) < 11) |
| 3641 | 3563 | return; |
| @@ -3679,12 +3601,9 @@ void intel_mbus_dbox_update(struct intel_atomic_state *state) · 37 unmodified lines | ||
| 3679 | 3601 | val |= MBUS_DBOX_B_CREDIT(8); |
| 3680 | 3602 | } |
| 3681 | 3603 | |
| 3682 | − for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { | |
| 3604 | + for_each_intel_crtc_in_pipe_mask(&i915->drm, crtc, new_dbuf_state->active_pipes) { | |
| 3683 | 3605 | u32 pipe_val = val; |
| 3684 | 3606 | |
| 3685 | − if (!new_crtc_state->hw.active) | |
| 3686 | − continue; | |
| 3687 | − | |
| 3688 | 3607 | if (DISPLAY_VER(i915) >= 14) { |
| 3689 | 3608 | if (xelpdp_is_only_pipe_per_dbuf_bank(crtc->pipe, |
| 3690 | 3609 | new_dbuf_state->active_pipes)) |
| @@ -3697,6 +3616,217 @@ void intel_mbus_dbox_update(struct intel_atomic_state *state) · 6 unmodified lines | ||
| 3697 | 3616 | } |
| 3698 | 3617 | } |
| 3699 | 3618 | |
| 3619 | +int intel_dbuf_state_set_mdclk_cdclk_ratio(struct intel_atomic_state *state, | |
| 3620 | + int ratio) | |
| 3621 | +{ | |
| 3622 | + struct intel_dbuf_state *dbuf_state; | |
| 3623 | + | |
| 3624 | + dbuf_state = intel_atomic_get_dbuf_state(state); | |
| 3625 | + if (IS_ERR(dbuf_state)) | |
| 3626 | + return PTR_ERR(dbuf_state); | |
| 3627 | + | |
| 3628 | + dbuf_state->mdclk_cdclk_ratio = ratio; | |
| 3629 | + | |
| 3630 | + return intel_atomic_lock_global_state(&dbuf_state->base); | |
| 3631 | +} | |
| 3632 | + | |
| 3633 | +void intel_dbuf_mdclk_cdclk_ratio_update(struct drm_i915_private *i915, | |
| 3634 | + int ratio, bool joined_mbus) | |
| 3635 | +{ | |
| 3636 | + enum dbuf_slice slice; | |
| 3637 | + | |
| 3638 | + if (!HAS_MBUS_JOINING(i915)) | |
| 3639 | + return; | |
| 3640 | + | |
| 3641 | + if (DISPLAY_VER(i915) >= 20) | |
| 3642 | + intel_de_rmw(i915, MBUS_CTL, MBUS_TRANSLATION_THROTTLE_MIN_MASK, | |
| 3643 | + MBUS_TRANSLATION_THROTTLE_MIN(ratio - 1)); | |
| 3644 | + | |
| 3645 | + if (joined_mbus) | |
| 3646 | + ratio *= 2; | |
| 3647 | + | |
| 3648 | + drm_dbg_kms(&i915->drm, "Updating dbuf ratio to %d (mbus joined: %s)\n", | |
| 3649 | + ratio, str_yes_no(joined_mbus)); | |
| 3650 | + | |
| 3651 | + for_each_dbuf_slice(i915, slice) | |
| 3652 | + intel_de_rmw(i915, DBUF_CTL_S(slice), | |
| 3653 | + DBUF_MIN_TRACKER_STATE_SERVICE_MASK, | |
| 3654 | + DBUF_MIN_TRACKER_STATE_SERVICE(ratio - 1)); | |
| 3655 | +} | |
| 3656 | + | |
| 3657 | +static void intel_dbuf_mdclk_min_tracker_update(struct intel_atomic_state *state) | |
| 3658 | +{ | |
| 3659 | + struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3660 | + const struct intel_dbuf_state *old_dbuf_state = | |
| 3661 | + intel_atomic_get_old_dbuf_state(state); | |
| 3662 | + const struct intel_dbuf_state *new_dbuf_state = | |
| 3663 | + intel_atomic_get_new_dbuf_state(state); | |
| 3664 | + int mdclk_cdclk_ratio; | |
| 3665 | + | |
| 3666 | + if (intel_cdclk_is_decreasing_later(state)) { | |
| 3667 | + /* cdclk/mdclk will be changed later by intel_set_cdclk_post_plane_update() */ | |
| 3668 | + mdclk_cdclk_ratio = old_dbuf_state->mdclk_cdclk_ratio; | |
| 3669 | + } else { | |
| 3670 | + /* cdclk/mdclk already changed by intel_set_cdclk_pre_plane_update() */ | |
| 3671 | + mdclk_cdclk_ratio = new_dbuf_state->mdclk_cdclk_ratio; | |
| 3672 | + } | |
| 3673 | + | |
| 3674 | + intel_dbuf_mdclk_cdclk_ratio_update(i915, mdclk_cdclk_ratio, | |
| 3675 | + new_dbuf_state->joined_mbus); | |
| 3676 | +} | |
| 3677 | + | |
| 3678 | +static enum pipe intel_mbus_joined_pipe(struct intel_atomic_state *state, | |
| 3679 | + const struct intel_dbuf_state *dbuf_state) | |
| 3680 | +{ | |
| 3681 | + struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3682 | + enum pipe pipe = ffs(dbuf_state->active_pipes) - 1; | |
| 3683 | + const struct intel_crtc_state *new_crtc_state; | |
| 3684 | + struct intel_crtc *crtc; | |
| 3685 | + | |
| 3686 | + drm_WARN_ON(&i915->drm, !dbuf_state->joined_mbus); | |
| 3687 | + drm_WARN_ON(&i915->drm, !is_power_of_2(dbuf_state->active_pipes)); | |
| 3688 | + | |
| 3689 | + crtc = intel_crtc_for_pipe(i915, pipe); | |
| 3690 | + new_crtc_state = intel_atomic_get_new_crtc_state(state, crtc); | |
| 3691 | + | |
| 3692 | + if (new_crtc_state && !intel_crtc_needs_modeset(new_crtc_state)) | |
| 3693 | + return pipe; | |
| 3694 | + else | |
| 3695 | + return INVALID_PIPE; | |
| 3696 | +} | |
| 3697 | + | |
| 3698 | +static void intel_dbuf_mbus_join_update(struct intel_atomic_state *state, | |
| 3699 | + enum pipe pipe) | |
| 3700 | +{ | |
| 3701 | + struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3702 | + const struct intel_dbuf_state *old_dbuf_state = | |
| 3703 | + intel_atomic_get_old_dbuf_state(state); | |
| 3704 | + const struct intel_dbuf_state *new_dbuf_state = | |
| 3705 | + intel_atomic_get_new_dbuf_state(state); | |
| 3706 | + u32 mbus_ctl; | |
| 3707 | + | |
| 3708 | + drm_dbg_kms(&i915->drm, "Changing mbus joined: %s -> %s (pipe: %c)\n", | |
| 3709 | + str_yes_no(old_dbuf_state->joined_mbus), | |
| 3710 | + str_yes_no(new_dbuf_state->joined_mbus), | |
| 3711 | + pipe != INVALID_PIPE ? pipe_name(pipe) : '*'); | |
| 3712 | + | |
| 3713 | + if (new_dbuf_state->joined_mbus) | |
| 3714 | + mbus_ctl = MBUS_HASHING_MODE_1x4 | MBUS_JOIN; | |
| 3715 | + else | |
| 3716 | + mbus_ctl = MBUS_HASHING_MODE_2x2; | |
| 3717 | + | |
| 3718 | + if (pipe != INVALID_PIPE) | |
| 3719 | + mbus_ctl |= MBUS_JOIN_PIPE_SELECT(pipe); | |
| 3720 | + else | |
| 3721 | + mbus_ctl |= MBUS_JOIN_PIPE_SELECT_NONE; | |
| 3722 | + | |
| 3723 | + intel_de_rmw(i915, MBUS_CTL, | |
| 3724 | + MBUS_HASHING_MODE_MASK | MBUS_JOIN | | |
| 3725 | + MBUS_JOIN_PIPE_SELECT_MASK, mbus_ctl); | |
| 3726 | +} | |
| 3727 | + | |
| 3728 | +void intel_dbuf_mbus_pre_ddb_update(struct intel_atomic_state *state) | |
| 3729 | +{ | |
| 3730 | + const struct intel_dbuf_state *new_dbuf_state = | |
| 3731 | + intel_atomic_get_new_dbuf_state(state); | |
| 3732 | + const struct intel_dbuf_state *old_dbuf_state = | |
| 3733 | + intel_atomic_get_old_dbuf_state(state); | |
| 3734 | + | |
| 3735 | + if (!new_dbuf_state) | |
| 3736 | + return; | |
| 3737 | + | |
| 3738 | + if (!old_dbuf_state->joined_mbus && new_dbuf_state->joined_mbus) { | |
| 3739 | + enum pipe pipe = intel_mbus_joined_pipe(state, new_dbuf_state); | |
| 3740 | + | |
| 3741 | + WARN_ON(!new_dbuf_state->base.changed); | |
| 3742 | + | |
| 3743 | + intel_dbuf_mbus_join_update(state, pipe); | |
| 3744 | + intel_mbus_dbox_update(state); | |
| 3745 | + intel_dbuf_mdclk_min_tracker_update(state); | |
| 3746 | + } | |
| 3747 | +} | |
| 3748 | + | |
| 3749 | +void intel_dbuf_mbus_post_ddb_update(struct intel_atomic_state *state) | |
| 3750 | +{ | |
| 3751 | + struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3752 | + const struct intel_dbuf_state *new_dbuf_state = | |
| 3753 | + intel_atomic_get_new_dbuf_state(state); | |
| 3754 | + const struct intel_dbuf_state *old_dbuf_state = | |
| 3755 | + intel_atomic_get_old_dbuf_state(state); | |
| 3756 | + | |
| 3757 | + if (!new_dbuf_state) | |
| 3758 | + return; | |
| 3759 | + | |
| 3760 | + if (old_dbuf_state->joined_mbus && !new_dbuf_state->joined_mbus) { | |
| 3761 | + enum pipe pipe = intel_mbus_joined_pipe(state, old_dbuf_state); | |
| 3762 | + | |
| 3763 | + WARN_ON(!new_dbuf_state->base.changed); | |
| 3764 | + | |
| 3765 | + intel_dbuf_mdclk_min_tracker_update(state); | |
| 3766 | + intel_mbus_dbox_update(state); | |
| 3767 | + intel_dbuf_mbus_join_update(state, pipe); | |
| 3768 | + | |
| 3769 | + if (pipe != INVALID_PIPE) { | |
| 3770 | + struct intel_crtc *crtc = intel_crtc_for_pipe(i915, pipe); | |
| 3771 | + | |
| 3772 | + intel_crtc_wait_for_next_vblank(crtc); | |
| 3773 | + } | |
| 3774 | + } else if (old_dbuf_state->joined_mbus == new_dbuf_state->joined_mbus && | |
| 3775 | + old_dbuf_state->active_pipes != new_dbuf_state->active_pipes) { | |
| 3776 | + WARN_ON(!new_dbuf_state->base.changed); | |
| 3777 | + | |
| 3778 | + intel_dbuf_mdclk_min_tracker_update(state); | |
| 3779 | + intel_mbus_dbox_update(state); | |
| 3780 | + } | |
| 3781 | + | |
| 3782 | +} | |
| 3783 | + | |
| 3784 | +void intel_dbuf_pre_plane_update(struct intel_atomic_state *state) | |
| 3785 | +{ | |
| 3786 | + struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3787 | + const struct intel_dbuf_state *new_dbuf_state = | |
| 3788 | + intel_atomic_get_new_dbuf_state(state); | |
| 3789 | + const struct intel_dbuf_state *old_dbuf_state = | |
| 3790 | + intel_atomic_get_old_dbuf_state(state); | |
| 3791 | + u8 old_slices, new_slices; | |
| 3792 | + | |
| 3793 | + if (!new_dbuf_state) | |
| 3794 | + return; | |
| 3795 | + | |
| 3796 | + old_slices = old_dbuf_state->enabled_slices; | |
| 3797 | + new_slices = old_dbuf_state->enabled_slices | new_dbuf_state->enabled_slices; | |
| 3798 | + | |
| 3799 | + if (old_slices == new_slices) | |
| 3800 | + return; | |
| 3801 | + | |
| 3802 | + WARN_ON(!new_dbuf_state->base.changed); | |
| 3803 | + | |
| 3804 | + gen9_dbuf_slices_update(i915, new_slices); | |
| 3805 | +} | |
| 3806 | + | |
| 3807 | +void intel_dbuf_post_plane_update(struct intel_atomic_state *state) | |
| 3808 | +{ | |
| 3809 | + struct drm_i915_private *i915 = to_i915(state->base.dev); | |
| 3810 | + const struct intel_dbuf_state *new_dbuf_state = | |
| 3811 | + intel_atomic_get_new_dbuf_state(state); | |
| 3812 | + const struct intel_dbuf_state *old_dbuf_state = | |
| 3813 | + intel_atomic_get_old_dbuf_state(state); | |
| 3814 | + u8 old_slices, new_slices; | |
| 3815 | + | |
| 3816 | + if (!new_dbuf_state) | |
| 3817 | + return; | |
| 3818 | + | |
| 3819 | + old_slices = old_dbuf_state->enabled_slices | new_dbuf_state->enabled_slices; | |
| 3820 | + new_slices = new_dbuf_state->enabled_slices; | |
| 3821 | + | |
| 3822 | + if (old_slices == new_slices) | |
| 3823 | + return; | |
| 3824 | + | |
| 3825 | + WARN_ON(!new_dbuf_state->base.changed); | |
| 3826 | + | |
| 3827 | + gen9_dbuf_slices_update(i915, new_slices); | |
| 3828 | +} | |
| 3829 | + | |
| 3700 | 3830 | static int skl_watermark_ipc_status_show(struct seq_file *m, void *data) |
| 3701 | 3831 | { |
| 3702 | 3832 | struct drm_i915_private *i915 = m->private; |
| @@ -58,22 +58,31 @@ struct intel_dbuf_state { · 57 unmodified lines | ||
| 58 | 58 | u8 slices[I915_MAX_PIPES]; |
| 59 | 59 | u8 enabled_slices; |
| 60 | 60 | u8 active_pipes; |
| 61 | + u8 mdclk_cdclk_ratio; | |
| 61 | 62 | bool joined_mbus; |
| 62 | 63 | }; |
| 63 | 64 | |
| 64 | 65 | struct intel_dbuf_state * |
| 65 | 66 | intel_atomic_get_dbuf_state(struct intel_atomic_state *state); |
| 66 | 67 | |
| 67 | −#define to_intel_dbuf_state(x) container_of((x), struct intel_dbuf_state, base) | |
| 68 | +#define to_intel_dbuf_state(global_state) \ | |
| 69 | + container_of_const((global_state), struct intel_dbuf_state, base) | |
| 70 | + | |
| 68 | 71 | #define intel_atomic_get_old_dbuf_state(state) \ |
| 69 | 72 | to_intel_dbuf_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj)) |
| 70 | 73 | #define intel_atomic_get_new_dbuf_state(state) \ |
| 71 | 74 | to_intel_dbuf_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj)) |
| 72 | 75 | |
| 73 | 76 | int intel_dbuf_init(struct drm_i915_private *i915); |
| 77 | +int intel_dbuf_state_set_mdclk_cdclk_ratio(struct intel_atomic_state *state, | |
| 78 | + int ratio); | |
| 79 | + | |
| 74 | 80 | void intel_dbuf_pre_plane_update(struct intel_atomic_state *state); |
| 75 | 81 | void intel_dbuf_post_plane_update(struct intel_atomic_state *state); |
| 76 | −void intel_mbus_dbox_update(struct intel_atomic_state *state); | |
| 82 | +void intel_dbuf_mdclk_cdclk_ratio_update(struct drm_i915_private *i915, | |
| 83 | + int ratio, bool joined_mbus); | |
| 84 | +void intel_dbuf_mbus_pre_ddb_update(struct intel_atomic_state *state); | |
| 85 | +void intel_dbuf_mbus_post_ddb_update(struct intel_atomic_state *state); | |
| 77 | 86 | |
| 78 | 87 | #endif /* __SKL_WATERMARK_H__ */ |
| 79 | 88 | |
| @@ -32,14 +32,16 @@ · 31 unmodified lines | ||
| 32 | 32 | #define MBUS_BBOX_CTL_S1 _MMIO(0x45040) |
| 33 | 33 | #define MBUS_BBOX_CTL_S2 _MMIO(0x45044) |
| 34 | 34 | |
| 35 | −#define MBUS_CTL _MMIO(0x4438C) | |
| 36 | −#define MBUS_JOIN REG_BIT(31) | |
| 37 | −#define MBUS_HASHING_MODE_MASK REG_BIT(30) | |
| 38 | −#define MBUS_HASHING_MODE_2x2 REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 0) | |
| 39 | −#define MBUS_HASHING_MODE_1x4 REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 1) | |
| 40 | −#define MBUS_JOIN_PIPE_SELECT_MASK REG_GENMASK(28, 26) | |
| 41 | −#define MBUS_JOIN_PIPE_SELECT(pipe) REG_FIELD_PREP(MBUS_JOIN_PIPE_SELECT_MASK, pipe) | |
| 42 | −#define MBUS_JOIN_PIPE_SELECT_NONE MBUS_JOIN_PIPE_SELECT(7) | |
| 35 | +#define MBUS_CTL _MMIO(0x4438C) | |
| 36 | +#define MBUS_JOIN REG_BIT(31) | |
| 37 | +#define MBUS_HASHING_MODE_MASK REG_BIT(30) | |
| 38 | +#define MBUS_HASHING_MODE_2x2 REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 0) | |
| 39 | +#define MBUS_HASHING_MODE_1x4 REG_FIELD_PREP(MBUS_HASHING_MODE_MASK, 1) | |
| 40 | +#define MBUS_JOIN_PIPE_SELECT_MASK REG_GENMASK(28, 26) | |
| 41 | +#define MBUS_JOIN_PIPE_SELECT(pipe) REG_FIELD_PREP(MBUS_JOIN_PIPE_SELECT_MASK, pipe) | |
| 42 | +#define MBUS_JOIN_PIPE_SELECT_NONE MBUS_JOIN_PIPE_SELECT(7) | |
| 43 | +#define MBUS_TRANSLATION_THROTTLE_MIN_MASK REG_GENMASK(15, 13) | |
| 44 | +#define MBUS_TRANSLATION_THROTTLE_MIN(val) REG_FIELD_PREP(MBUS_TRANSLATION_THROTTLE_MIN_MASK, val) | |
| 43 | 45 | |
| 44 | 46 | /* Watermark register definitions for SKL */ |
| 45 | 47 | #define _CUR_WM_A_0 0x70140 |
| @@ -273,8 +273,7 @@ static int intel_dsi_compute_config(struct intel_encoder *encoder, · 272 unmodified lines | ||
| 273 | 273 | struct drm_connector_state *conn_state) |
| 274 | 274 | { |
| 275 | 275 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
| 276 | − struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, | |
| 277 | − base); | |
| 276 | + struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); | |
| 278 | 277 | struct intel_connector *intel_connector = intel_dsi->attached_connector; |
| 279 | 278 | struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; |
| 280 | 279 | int ret; |
| @@ -386,7 +386,7 @@ struct drm_i915_gem_object { · 385 unmodified lines | ||
| 386 | 386 | * and kernel mode driver for caching policy control after GEN12. |
| 387 | 387 | * In the meantime platform specific tables are created to translate |
| 388 | 388 | * i915_cache_level into pat index, for more details check the macros |
| 389 | − * defined i915/i915_pci.c, e.g. PVC_CACHELEVEL. | |
| 389 | + * defined i915/i915_pci.c, e.g. TGL_CACHELEVEL. | |
| 390 | 390 | * For backward compatibility, this field contains values exactly match |
| 391 | 391 | * the entries of enum i915_cache_level for pre-GEN12 platforms (See |
| 392 | 392 | * LEGACY_CACHELEVEL), so that the PTE encode functions for these |
| @@ -713,7 +713,7 @@ static int igt_ppgtt_huge_fill(void *arg) · 712 unmodified lines | ||
| 713 | 713 | { |
| 714 | 714 | struct drm_i915_private *i915 = arg; |
| 715 | 715 | unsigned int supported = RUNTIME_INFO(i915)->page_sizes; |
| 716 | − bool has_pte64 = GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50); | |
| 716 | + bool has_pte64 = GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55); | |
| 717 | 717 | struct i915_address_space *vm; |
| 718 | 718 | struct i915_gem_context *ctx; |
| 719 | 719 | unsigned long max_pages; |
| @@ -857,7 +857,7 @@ out: · 137 unmodified lines | ||
| 857 | 857 | static int igt_ppgtt_64K(void *arg) |
| 858 | 858 | { |
| 859 | 859 | struct drm_i915_private *i915 = arg; |
| 860 | − bool has_pte64 = GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50); | |
| 860 | + bool has_pte64 = GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55); | |
| 861 | 861 | struct drm_i915_gem_object *obj; |
| 862 | 862 | struct i915_address_space *vm; |
| 863 | 863 | struct i915_gem_context *ctx; |
| @@ -117,7 +117,7 @@ static bool fastblit_supports_x_tiling(const struct drm_i915_private *i915) · 116 unmodified lines | ||
| 117 | 117 | if (gen < 12) |
| 118 | 118 | return true; |
| 119 | 119 | |
| 120 | − if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) | |
| 120 | + if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 55)) | |
| 121 | 121 | return false; |
| 122 | 122 | |
| 123 | 123 | return HAS_DISPLAY(i915); |
| @@ -166,7 +166,7 @@ static int prepare_blit(const struct tiled_blits *t, · 42 unmodified lines | ||
| 166 | 166 | src_pitch = t->width; /* in dwords */ |
| 167 | 167 | if (src->tiling == CLIENT_TILING_Y) { |
| 168 | 168 | src_tiles = XY_FAST_COPY_BLT_D0_SRC_TILE_MODE(YMAJOR); |
| 169 | − if (GRAPHICS_VER_FULL(to_i915(batch->base.dev)) >= IP_VER(12, 50)) | |
| 169 | + if (GRAPHICS_VER_FULL(to_i915(batch->base.dev)) >= IP_VER(12, 55)) | |
| 170 | 170 | src_4t = XY_FAST_COPY_BLT_D1_SRC_TILE4; |
| 171 | 171 | } else if (src->tiling == CLIENT_TILING_X) { |
| 172 | 172 | src_tiles = XY_FAST_COPY_BLT_D0_SRC_TILE_MODE(TILE_X); |
| @@ -177,7 +177,7 @@ static int prepare_blit(const struct tiled_blits *t, · 4 unmodified lines | ||
| 177 | 177 | dst_pitch = t->width; /* in dwords */ |
| 178 | 178 | if (dst->tiling == CLIENT_TILING_Y) { |
| 179 | 179 | dst_tiles = XY_FAST_COPY_BLT_D0_DST_TILE_MODE(YMAJOR); |
| 180 | − if (GRAPHICS_VER_FULL(to_i915(batch->base.dev)) >= IP_VER(12, 50)) | |
| 180 | + if (GRAPHICS_VER_FULL(to_i915(batch->base.dev)) >= IP_VER(12, 55)) | |
| 181 | 181 | dst_4t = XY_FAST_COPY_BLT_D1_DST_TILE4; |
| 182 | 182 | } else if (dst->tiling == CLIENT_TILING_X) { |
| 183 | 183 | dst_tiles = XY_FAST_COPY_BLT_D0_DST_TILE_MODE(TILE_X); |
| @@ -365,7 +365,7 @@ static u64 tiled_offset(const struct intel_gt *gt, · 181 unmodified lines | ||
| 365 | 365 | v += x; |
| 366 | 366 | |
| 367 | 367 | swizzle = gt->ggtt->bit_6_swizzle_x; |
| 368 | − } else if (GRAPHICS_VER_FULL(gt->i915) >= IP_VER(12, 50)) { | |
| 368 | + } else if (GRAPHICS_VER_FULL(gt->i915) >= IP_VER(12, 55)) { | |
| 369 | 369 | /* Y-major tiling layout is Tile4 for Xe_HP and beyond */ |
| 370 | 370 | v = linear_x_y_to_ftiled_pos(x_pos, y_pos, stride, 32); |
| 371 | 371 | |
| @@ -189,9 +189,6 @@ static bool gen12_needs_ccs_aux_inv(struct intel_engine_cs *engine) · 188 unmodified lines | ||
| 189 | 189 | { |
| 190 | 190 | i915_reg_t reg = gen12_get_aux_inv_reg(engine); |
| 191 | 191 | |
| 192 | − if (IS_PONTEVECCHIO(engine->i915)) | |
| 193 | − return false; | |
| 194 | − | |
| 195 | 192 | /* |
| 196 | 193 | * So far platforms supported by i915 having flat ccs do not require |
| 197 | 194 | * AUX invalidation. Check also whether the engine requires it. |
| @@ -827,7 +824,7 @@ u32 *gen12_emit_fini_breadcrumb_rcs(struct i915_request *rq, u32 *cs) · 629 unmodified lines | ||
| 827 | 824 | cs = gen12_emit_pipe_control(cs, 0, |
| 828 | 825 | PIPE_CONTROL_DEPTH_CACHE_FLUSH, 0); |
| 829 | 826 | |
| 830 | − if (GRAPHICS_VER(i915) == 12 && GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) | |
| 827 | + if (GRAPHICS_VER(i915) == 12 && GRAPHICS_VER_FULL(i915) < IP_VER(12, 55)) | |
| 831 | 828 | /* Wa_1409600907 */ |
| 832 | 829 | flags |= PIPE_CONTROL_DEPTH_STALL; |
| 833 | 830 | |
| @@ -500,11 +500,11 @@ gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt, · 499 unmodified lines | ||
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | static void |
| 503 | −xehpsdv_ppgtt_insert_huge(struct i915_address_space *vm, | |
| 504 | − struct i915_vma_resource *vma_res, | |
| 505 | − struct sgt_dma *iter, | |
| 506 | − unsigned int pat_index, | |
| 507 | − u32 flags) | |
| 503 | +xehp_ppgtt_insert_huge(struct i915_address_space *vm, | |
| 504 | + struct i915_vma_resource *vma_res, | |
| 505 | + struct sgt_dma *iter, | |
| 506 | + unsigned int pat_index, | |
| 507 | + u32 flags) | |
| 508 | 508 | { |
| 509 | 509 | const gen8_pte_t pte_encode = vm->pte_encode(0, pat_index, flags); |
| 510 | 510 | unsigned int rem = sg_dma_len(iter->sg); |
| @@ -741,8 +741,8 @@ static void gen8_ppgtt_insert(struct i915_address_space *vm, · 230 unmodified lines | ||
| 741 | 741 | struct sgt_dma iter = sgt_dma(vma_res); |
| 742 | 742 | |
| 743 | 743 | if (vma_res->bi.page_sizes.sg > I915_GTT_PAGE_SIZE) { |
| 744 | − if (GRAPHICS_VER_FULL(vm->i915) >= IP_VER(12, 50)) | |
| 745 | − xehpsdv_ppgtt_insert_huge(vm, vma_res, &iter, pat_index, flags); | |
| 744 | + if (GRAPHICS_VER_FULL(vm->i915) >= IP_VER(12, 55)) | |
| 745 | + xehp_ppgtt_insert_huge(vm, vma_res, &iter, pat_index, flags); | |
| 746 | 746 | else |
| 747 | 747 | gen8_ppgtt_insert_huge(vm, vma_res, &iter, pat_index, flags); |
| 748 | 748 | } else { |
| @@ -781,11 +781,11 @@ static void gen8_ppgtt_insert_entry(struct i915_address_space *vm, · 32 unmodified lines | ||
| 781 | 781 | drm_clflush_virt_range(&vaddr[gen8_pd_index(idx, 0)], sizeof(*vaddr)); |
| 782 | 782 | } |
| 783 | 783 | |
| 784 | −static void __xehpsdv_ppgtt_insert_entry_lm(struct i915_address_space *vm, | |
| 785 | − dma_addr_t addr, | |
| 786 | − u64 offset, | |
| 787 | − unsigned int pat_index, | |
| 788 | − u32 flags) | |
| 784 | +static void xehp_ppgtt_insert_entry_lm(struct i915_address_space *vm, | |
| 785 | + dma_addr_t addr, | |
| 786 | + u64 offset, | |
| 787 | + unsigned int pat_index, | |
| 788 | + u32 flags) | |
| 789 | 789 | { |
| 790 | 790 | u64 idx = offset >> GEN8_PTE_SHIFT; |
| 791 | 791 | struct i915_page_directory * const pdp = |
| @@ -810,15 +810,15 @@ static void __xehpsdv_ppgtt_insert_entry_lm(struct i915_address_space *vm, · 18 unmodified lines | ||
| 810 | 810 | vaddr[gen8_pd_index(idx, 0) / 16] = vm->pte_encode(addr, pat_index, flags); |
| 811 | 811 | } |
| 812 | 812 | |
| 813 | −static void xehpsdv_ppgtt_insert_entry(struct i915_address_space *vm, | |
| 814 | − dma_addr_t addr, | |
| 815 | − u64 offset, | |
| 816 | − unsigned int pat_index, | |
| 817 | − u32 flags) | |
| 813 | +static void xehp_ppgtt_insert_entry(struct i915_address_space *vm, | |
| 814 | + dma_addr_t addr, | |
| 815 | + u64 offset, | |
| 816 | + unsigned int pat_index, | |
| 817 | + u32 flags) | |
| 818 | 818 | { |
| 819 | 819 | if (flags & PTE_LM) |
| 820 | − return __xehpsdv_ppgtt_insert_entry_lm(vm, addr, offset, | |
| 821 | − pat_index, flags); | |
| 820 | + return xehp_ppgtt_insert_entry_lm(vm, addr, offset, | |
| 821 | + pat_index, flags); | |
| 822 | 822 | |
| 823 | 823 | return gen8_ppgtt_insert_entry(vm, addr, offset, pat_index, flags); |
| 824 | 824 | } |
| @@ -1042,7 +1042,7 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt, · 217 unmodified lines | ||
| 1042 | 1042 | ppgtt->vm.bind_async_flags = I915_VMA_LOCAL_BIND; |
| 1043 | 1043 | ppgtt->vm.insert_entries = gen8_ppgtt_insert; |
| 1044 | 1044 | if (HAS_64K_PAGES(gt->i915)) |
| 1045 | − ppgtt->vm.insert_page = xehpsdv_ppgtt_insert_entry; | |
| 1045 | + ppgtt->vm.insert_page = xehp_ppgtt_insert_entry; | |
| 1046 | 1046 | else |
| 1047 | 1047 | ppgtt->vm.insert_page = gen8_ppgtt_insert_entry; |
| 1048 | 1048 | ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc; |
| @@ -497,9 +497,8 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id, · 496 unmodified lines | ||
| 497 | 497 | engine->logical_mask = BIT(logical_instance); |
| 498 | 498 | __sprint_engine_name(engine); |
| 499 | 499 | |
| 500 | − if ((engine->class == COMPUTE_CLASS && !RCS_MASK(engine->gt) && | |
| 501 | − __ffs(CCS_MASK(engine->gt)) == engine->instance) || | |
| 502 | − engine->class == RENDER_CLASS) | |
| 500 | + if ((engine->class == COMPUTE_CLASS || engine->class == RENDER_CLASS) && | |
| 501 | + __ffs(CCS_MASK(engine->gt) | RCS_MASK(engine->gt)) == engine->instance) | |
| 503 | 502 | engine->flags |= I915_ENGINE_FIRST_RENDER_COMPUTE; |
| 504 | 503 | |
| 505 | 504 | /* features common between engines sharing EUs */ |
| @@ -765,14 +764,14 @@ static void engine_mask_apply_media_fuses(struct intel_gt *gt) · 259 unmodified lines | ||
| 765 | 764 | * and bits have disable semantices. |
| 766 | 765 | */ |
| 767 | 766 | media_fuse = intel_uncore_read(gt->uncore, GEN11_GT_VEBOX_VDBOX_DISABLE); |
| 768 | − if (MEDIA_VER_FULL(i915) < IP_VER(12, 50)) | |
| 767 | + if (MEDIA_VER_FULL(i915) < IP_VER(12, 55)) | |
| 769 | 768 | media_fuse = ~media_fuse; |
| 770 | 769 | |
| 771 | 770 | vdbox_mask = media_fuse & GEN11_GT_VDBOX_DISABLE_MASK; |
| 772 | 771 | vebox_mask = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >> |
| 773 | 772 | GEN11_GT_VEBOX_DISABLE_SHIFT; |
| 774 | 773 | |
| 775 | − if (MEDIA_VER_FULL(i915) >= IP_VER(12, 50)) { | |
| 774 | + if (MEDIA_VER_FULL(i915) >= IP_VER(12, 55)) { | |
| 776 | 775 | fuse1 = intel_uncore_read(gt->uncore, HSW_PAVP_FUSE1); |
| 777 | 776 | gt->info.sfc_mask = REG_FIELD_GET(XEHP_SFC_ENABLE_MASK, fuse1); |
| 778 | 777 | } else { |
| @@ -839,38 +838,6 @@ static void engine_mask_apply_compute_fuses(struct intel_gt *gt) · 60 unmodified lines | ||
| 839 | 838 | } |
| 840 | 839 | } |
| 841 | 840 | |
| 842 | −static void engine_mask_apply_copy_fuses(struct intel_gt *gt) | |
| 843 | −{ | |
| 844 | − struct drm_i915_private *i915 = gt->i915; | |
| 845 | − struct intel_gt_info *info = >->info; | |
| 846 | − unsigned long meml3_mask; | |
| 847 | − unsigned long quad; | |
| 848 | − | |
| 849 | − if (!(GRAPHICS_VER_FULL(i915) >= IP_VER(12, 60) && | |
| 850 | − GRAPHICS_VER_FULL(i915) < IP_VER(12, 70))) | |
| 851 | − return; | |
| 852 | − | |
| 853 | − meml3_mask = intel_uncore_read(gt->uncore, GEN10_MIRROR_FUSE3); | |
| 854 | − meml3_mask = REG_FIELD_GET(GEN12_MEML3_EN_MASK, meml3_mask); | |
| 855 | − | |
| 856 | − /* | |
| 857 | − * Link Copy engines may be fused off according to meml3_mask. Each | |
| 858 | − * bit is a quad that houses 2 Link Copy and two Sub Copy engines. | |
| 859 | − */ | |
| 860 | − for_each_clear_bit(quad, &meml3_mask, GEN12_MAX_MSLICES) { | |
| 861 | − unsigned int instance = quad * 2 + 1; | |
| 862 | − intel_engine_mask_t mask = GENMASK(_BCS(instance + 1), | |
| 863 | − _BCS(instance)); | |
| 864 | − | |
| 865 | − if (mask & info->engine_mask) { | |
| 866 | − gt_dbg(gt, "bcs%u fused off\n", instance); | |
| 867 | − gt_dbg(gt, "bcs%u fused off\n", instance + 1); | |
| 868 | − | |
| 869 | − info->engine_mask &= ~mask; | |
| 870 | − } | |
| 871 | − } | |
| 872 | −} | |
| 873 | − | |
| 874 | 841 | /* |
| 875 | 842 | * Determine which engines are fused off in our particular hardware. |
| 876 | 843 | * Note that we have a catch-22 situation where we need to be able to access |
| @@ -889,7 +856,6 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt) · 12 unmodified lines | ||
| 889 | 856 | |
| 890 | 857 | engine_mask_apply_media_fuses(gt); |
| 891 | 858 | engine_mask_apply_compute_fuses(gt); |
| 892 | − engine_mask_apply_copy_fuses(gt); | |
| 893 | 859 | |
| 894 | 860 | /* |
| 895 | 861 | * The only use of the GSC CS is to load and communicate with the GSC |
| @@ -1193,7 +1159,6 @@ static int intel_engine_init_tlb_invalidation(struct intel_engine_cs *engine) · 297 unmodified lines | ||
| 1193 | 1159 | if (GRAPHICS_VER_FULL(i915) == IP_VER(12, 74) || |
| 1194 | 1160 | GRAPHICS_VER_FULL(i915) == IP_VER(12, 71) || |
| 1195 | 1161 | GRAPHICS_VER_FULL(i915) == IP_VER(12, 70) || |
| 1196 | − GRAPHICS_VER_FULL(i915) == IP_VER(12, 50) || | |
| 1197 | 1162 | GRAPHICS_VER_FULL(i915) == IP_VER(12, 55)) { |
| 1198 | 1163 | regs = xehp_regs; |
| 1199 | 1164 | num = ARRAY_SIZE(xehp_regs); |
| @@ -493,7 +493,7 @@ __execlists_schedule_in(struct i915_request *rq) · 492 unmodified lines | ||
| 493 | 493 | /* Use a fixed tag for OA and friends */ |
| 494 | 494 | GEM_BUG_ON(ce->tag <= BITS_PER_LONG); |
| 495 | 495 | ce->lrc.ccid = ce->tag; |
| 496 | − } else if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) { | |
| 496 | + } else if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) { | |
| 497 | 497 | /* We don't need a strict matching tag, just different values */ |
| 498 | 498 | unsigned int tag = ffs(READ_ONCE(engine->context_tag)); |
| 499 | 499 | |
| @@ -613,7 +613,7 @@ static void __execlists_schedule_out(struct i915_request * const rq, · 113 unmodified lines | ||
| 613 | 613 | intel_engine_add_retire(engine, ce->timeline); |
| 614 | 614 | |
| 615 | 615 | ccid = ce->lrc.ccid; |
| 616 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) { | |
| 616 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) { | |
| 617 | 617 | ccid >>= XEHP_SW_CTX_ID_SHIFT - 32; |
| 618 | 618 | ccid &= XEHP_MAX_CONTEXT_HW_ID; |
| 619 | 619 | } else { |
| @@ -1907,7 +1907,7 @@ process_csb(struct intel_engine_cs *engine, struct i915_request **inactive) · 1287 unmodified lines | ||
| 1907 | 1907 | ENGINE_TRACE(engine, "csb[%d]: status=0x%08x:0x%08x\n", |
| 1908 | 1908 | head, upper_32_bits(csb), lower_32_bits(csb)); |
| 1909 | 1909 | |
| 1910 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 1910 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) | |
| 1911 | 1911 | promote = xehp_csb_parse(csb); |
| 1912 | 1912 | else if (GRAPHICS_VER(engine->i915) >= 12) |
| 1913 | 1913 | promote = gen12_csb_parse(csb); |
| @@ -3482,7 +3482,7 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine) · 1568 unmodified lines | ||
| 3482 | 3482 | } |
| 3483 | 3483 | } |
| 3484 | 3484 | |
| 3485 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) { | |
| 3485 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) { | |
| 3486 | 3486 | if (intel_engine_has_preemption(engine)) |
| 3487 | 3487 | engine->emit_bb_start = xehp_emit_bb_start; |
| 3488 | 3488 | else |
| @@ -3585,7 +3585,7 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine) · 96 unmodified lines | ||
| 3585 | 3585 | |
| 3586 | 3586 | engine->context_tag = GENMASK(BITS_PER_LONG - 2, 0); |
| 3587 | 3587 | if (GRAPHICS_VER(engine->i915) >= 11 && |
| 3588 | − GRAPHICS_VER_FULL(engine->i915) < IP_VER(12, 50)) { | |
| 3588 | + GRAPHICS_VER_FULL(engine->i915) < IP_VER(12, 55)) { | |
| 3589 | 3589 | execlists->ccid |= engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT - 32); |
| 3590 | 3590 | execlists->ccid |= engine->class << (GEN11_ENGINE_CLASS_SHIFT - 32); |
| 3591 | 3591 | } |
| @@ -103,19 +103,6 @@ static const struct gsc_def gsc_def_dg1[] = { · 102 unmodified lines | ||
| 103 | 103 | } |
| 104 | 104 | }; |
| 105 | 105 | |
| 106 | −static const struct gsc_def gsc_def_xehpsdv[] = { | |
| 107 | − { | |
| 108 | − /* HECI1 not enabled on the device. */ | |
| 109 | − }, | |
| 110 | − { | |
| 111 | − .name = "mei-gscfi", | |
| 112 | − .bar = DG1_GSC_HECI2_BASE, | |
| 113 | − .bar_size = GSC_BAR_LENGTH, | |
| 114 | − .use_polling = true, | |
| 115 | − .slow_firmware = true, | |
| 116 | − } | |
| 117 | −}; | |
| 118 | − | |
| 119 | 106 | static const struct gsc_def gsc_def_dg2[] = { |
| 120 | 107 | { |
| 121 | 108 | .name = "mei-gsc", |
| @@ -188,8 +175,6 @@ static void gsc_init_one(struct drm_i915_private *i915, struct intel_gsc *gsc, · 66 unmodified lines | ||
| 188 | 175 | |
| 189 | 176 | if (IS_DG1(i915)) { |
| 190 | 177 | def = &gsc_def_dg1[intf_id]; |
| 191 | − } else if (IS_XEHPSDV(i915)) { | |
| 192 | − def = &gsc_def_xehpsdv[intf_id]; | |
| 193 | 178 | } else if (IS_DG2(i915)) { |
| 194 | 179 | def = &gsc_def_dg2[intf_id]; |
| 195 | 180 | } else { |
| @@ -278,7 +278,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt, · 277 unmodified lines | ||
| 278 | 278 | intel_uncore_posting_read(uncore, |
| 279 | 279 | XELPMP_RING_FAULT_REG); |
| 280 | 280 | |
| 281 | − } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) { | |
| 281 | + } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) { | |
| 282 | 282 | intel_gt_mcr_multicast_rmw(gt, XEHP_RING_FAULT_REG, |
| 283 | 283 | RING_FAULT_VALID, 0); |
| 284 | 284 | intel_gt_mcr_read_any(gt, XEHP_RING_FAULT_REG); |
| @@ -403,7 +403,7 @@ void intel_gt_check_and_clear_faults(struct intel_gt *gt) · 118 unmodified lines | ||
| 403 | 403 | struct drm_i915_private *i915 = gt->i915; |
| 404 | 404 | |
| 405 | 405 | /* From GEN8 onwards we only have one 'All Engine Fault Register' */ |
| 406 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 406 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 407 | 407 | xehp_check_faults(gt); |
| 408 | 408 | else if (GRAPHICS_VER(i915) >= 8) |
| 409 | 409 | gen8_check_faults(gt); |
| @@ -57,51 +57,18 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { · 56 unmodified lines | ||
| 57 | 57 | * are of a "GAM" subclass that has special rules. Thus we use a separate |
| 58 | 58 | * GAM table farther down for those. |
| 59 | 59 | */ |
| 60 | −static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { | |
| 60 | +static const struct intel_mmio_range dg2_mslice_steering_table[] = { | |
| 61 | 61 | { 0x00DD00, 0x00DDFF }, |
| 62 | 62 | { 0x00E900, 0x00FFFF }, /* 0xEA00 - OxEFFF is unused */ |
| 63 | 63 | {}, |
| 64 | 64 | }; |
| 65 | 65 | |
| 66 | −static const struct intel_mmio_range xehpsdv_gam_steering_table[] = { | |
| 67 | − { 0x004000, 0x004AFF }, | |
| 68 | − { 0x00C800, 0x00CFFF }, | |
| 69 | − {}, | |
| 70 | −}; | |
| 71 | − | |
| 72 | −static const struct intel_mmio_range xehpsdv_lncf_steering_table[] = { | |
| 73 | − { 0x00B000, 0x00B0FF }, | |
| 74 | − { 0x00D800, 0x00D8FF }, | |
| 75 | − {}, | |
| 76 | −}; | |
| 77 | − | |
| 78 | 66 | static const struct intel_mmio_range dg2_lncf_steering_table[] = { |
| 79 | 67 | { 0x00B000, 0x00B0FF }, |
| 80 | 68 | { 0x00D880, 0x00D8FF }, |
| 81 | 69 | {}, |
| 82 | 70 | }; |
| 83 | 71 | |
| 84 | −/* | |
| 85 | − * We have several types of MCR registers on PVC where steering to (0,0) | |
| 86 | − * will always provide us with a non-terminated value. We'll stick them | |
| 87 | − * all in the same table for simplicity. | |
| 88 | − */ | |
| 89 | −static const struct intel_mmio_range pvc_instance0_steering_table[] = { | |
| 90 | − { 0x004000, 0x004AFF }, /* HALF-BSLICE */ | |
| 91 | − { 0x008800, 0x00887F }, /* CC */ | |
| 92 | − { 0x008A80, 0x008AFF }, /* TILEPSMI */ | |
| 93 | − { 0x00B000, 0x00B0FF }, /* HALF-BSLICE */ | |
| 94 | − { 0x00B100, 0x00B3FF }, /* L3BANK */ | |
| 95 | − { 0x00C800, 0x00CFFF }, /* HALF-BSLICE */ | |
| 96 | − { 0x00D800, 0x00D8FF }, /* HALF-BSLICE */ | |
| 97 | − { 0x00DD00, 0x00DDFF }, /* BSLICE */ | |
| 98 | − { 0x00E900, 0x00E9FF }, /* HALF-BSLICE */ | |
| 99 | − { 0x00EC00, 0x00EEFF }, /* HALF-BSLICE */ | |
| 100 | − { 0x00F000, 0x00FFFF }, /* HALF-BSLICE */ | |
| 101 | − { 0x024180, 0x0241FF }, /* HALF-BSLICE */ | |
| 102 | − {}, | |
| 103 | −}; | |
| 104 | − | |
| 105 | 72 | static const struct intel_mmio_range xelpg_instance0_steering_table[] = { |
| 106 | 73 | { 0x000B00, 0x000BFF }, /* SQIDI */ |
| 107 | 74 | { 0x001000, 0x001FFF }, /* SQIDI */ |
| @@ -185,22 +152,16 @@ void intel_gt_mcr_init(struct intel_gt *gt) · 77 unmodified lines | ||
| 185 | 152 | gt->steering_table[INSTANCE0] = xelpg_instance0_steering_table; |
| 186 | 153 | gt->steering_table[L3BANK] = xelpg_l3bank_steering_table; |
| 187 | 154 | gt->steering_table[DSS] = xelpg_dss_steering_table; |
| 188 | − } else if (IS_PONTEVECCHIO(i915)) { | |
| 189 | − gt->steering_table[INSTANCE0] = pvc_instance0_steering_table; | |
| 190 | 155 | } else if (IS_DG2(i915)) { |
| 191 | − gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; | |
| 156 | + gt->steering_table[MSLICE] = dg2_mslice_steering_table; | |
| 192 | 157 | gt->steering_table[LNCF] = dg2_lncf_steering_table; |
| 193 | 158 | /* |
| 194 | 159 | * No need to hook up the GAM table since it has a dedicated |
| 195 | 160 | * steering control register on DG2 and can use implicit |
| 196 | 161 | * steering. |
| 197 | 162 | */ |
| 198 | − } else if (IS_XEHPSDV(i915)) { | |
| 199 | − gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; | |
| 200 | − gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; | |
| 201 | − gt->steering_table[GAM] = xehpsdv_gam_steering_table; | |
| 202 | 163 | } else if (GRAPHICS_VER(i915) >= 11 && |
| 203 | − GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) { | |
| 164 | + GRAPHICS_VER_FULL(i915) < IP_VER(12, 55)) { | |
| 204 | 165 | gt->steering_table[L3BANK] = icl_l3bank_steering_table; |
| 205 | 166 | gt->info.l3bank_mask = |
| 206 | 167 | ~intel_uncore_read(gt->uncore, GEN10_MIRROR_FUSE3) & |
| @@ -821,8 +782,6 @@ void intel_gt_mcr_report_steering(struct drm_printer *p, struct intel_gt *gt, · 614 unmodified lines | ||
| 821 | 782 | for (int i = 0; i < NUM_STEERING_TYPES; i++) |
| 822 | 783 | if (gt->steering_table[i]) |
| 823 | 784 | report_steering_type(p, gt, i, dump_table); |
| 824 | − } else if (IS_PONTEVECCHIO(gt->i915)) { | |
| 825 | − report_steering_type(p, gt, INSTANCE0, dump_table); | |
| 826 | 785 | } else if (HAS_MSLICE_STEERING(gt->i915)) { |
| 827 | 786 | report_steering_type(p, gt, MSLICE, dump_table); |
| 828 | 787 | report_steering_type(p, gt, LNCF, dump_table); |
| @@ -842,10 +801,7 @@ void intel_gt_mcr_report_steering(struct drm_printer *p, struct intel_gt *gt, · 13 unmodified lines | ||
| 842 | 801 | void intel_gt_mcr_get_ss_steering(struct intel_gt *gt, unsigned int dss, |
| 843 | 802 | unsigned int *group, unsigned int *instance) |
| 844 | 803 | { |
| 845 | − if (IS_PONTEVECCHIO(gt->i915)) { | |
| 846 | − *group = dss / GEN_DSS_PER_CSLICE; | |
| 847 | − *instance = dss % GEN_DSS_PER_CSLICE; | |
| 848 | − } else if (GRAPHICS_VER_FULL(gt->i915) >= IP_VER(12, 50)) { | |
| 804 | + if (GRAPHICS_VER_FULL(gt->i915) >= IP_VER(12, 55)) { | |
| 849 | 805 | *group = dss / GEN_DSS_PER_GSLICE; |
| 850 | 806 | *instance = dss % GEN_DSS_PER_GSLICE; |
| 851 | 807 | } else { |
| @@ -54,7 +54,7 @@ int intel_gt_mcr_wait_for_reg(struct intel_gt *gt, · 53 unmodified lines | ||
| 54 | 54 | * the topology, so we lookup the DSS ID directly in "slice 0." |
| 55 | 55 | */ |
| 56 | 56 | #define _HAS_SS(ss_, gt_, group_, instance_) ( \ |
| 57 | − GRAPHICS_VER_FULL(gt_->i915) >= IP_VER(12, 50) ? \ | |
| 57 | + GRAPHICS_VER_FULL(gt_->i915) >= IP_VER(12, 55) ? \ | |
| 58 | 58 | intel_sseu_has_subslice(&(gt_)->info.sseu, 0, ss_) : \ |
| 59 | 59 | intel_sseu_has_subslice(&(gt_)->info.sseu, group_, instance_)) |
| 60 | 60 | |
| @@ -392,10 +392,6 @@ void intel_gt_pm_frequency_dump(struct intel_gt *gt, struct drm_printer *p) · 391 unmodified lines | ||
| 392 | 392 | drm_puts(p, "no P-state info available\n"); |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | − drm_printf(p, "Current CD clock frequency: %d kHz\n", i915->display.cdclk.hw.cdclk); | |
| 396 | − drm_printf(p, "Max CD clock frequency: %d kHz\n", i915->display.cdclk.max_cdclk_freq); | |
| 397 | − drm_printf(p, "Max pixel clock frequency: %d kHz\n", i915->max_dotclk_freq); | |
| 398 | − | |
| 399 | 395 | intel_runtime_pm_put(uncore->rpm, wakeref); |
| 400 | 396 | } |
| 401 | 397 | |
| @@ -718,44 +718,11 @@ · 717 unmodified lines | ||
| 718 | 718 | |
| 719 | 719 | #define UNSLICE_UNIT_LEVEL_CLKGATE _MMIO(0x9434) |
| 720 | 720 | #define VFUNIT_CLKGATE_DIS REG_BIT(20) |
| 721 | −#define TSGUNIT_CLKGATE_DIS REG_BIT(17) /* XEHPSDV */ | |
| 722 | 721 | #define CG3DDISCFEG_CLKGATE_DIS REG_BIT(17) /* DG2 */ |
| 723 | 722 | #define GAMEDIA_CLKGATE_DIS REG_BIT(11) |
| 724 | 723 | #define HSUNIT_CLKGATE_DIS REG_BIT(8) |
| 725 | 724 | #define VSUNIT_CLKGATE_DIS REG_BIT(3) |
| 726 | 725 | |
| 727 | −#define UNSLCGCTL9440 _MMIO(0x9440) | |
| 728 | −#define GAMTLBOACS_CLKGATE_DIS REG_BIT(28) | |
| 729 | −#define GAMTLBVDBOX5_CLKGATE_DIS REG_BIT(27) | |
| 730 | −#define GAMTLBVDBOX6_CLKGATE_DIS REG_BIT(26) | |
| 731 | −#define GAMTLBVDBOX3_CLKGATE_DIS REG_BIT(24) | |
| 732 | −#define GAMTLBVDBOX4_CLKGATE_DIS REG_BIT(23) | |
| 733 | −#define GAMTLBVDBOX7_CLKGATE_DIS REG_BIT(22) | |
| 734 | −#define GAMTLBVDBOX2_CLKGATE_DIS REG_BIT(21) | |
| 735 | −#define GAMTLBVDBOX0_CLKGATE_DIS REG_BIT(17) | |
| 736 | −#define GAMTLBKCR_CLKGATE_DIS REG_BIT(16) | |
| 737 | −#define GAMTLBGUC_CLKGATE_DIS REG_BIT(15) | |
| 738 | −#define GAMTLBBLT_CLKGATE_DIS REG_BIT(14) | |
| 739 | −#define GAMTLBVDBOX1_CLKGATE_DIS REG_BIT(6) | |
| 740 | − | |
| 741 | −#define UNSLCGCTL9444 _MMIO(0x9444) | |
| 742 | −#define GAMTLBGFXA0_CLKGATE_DIS REG_BIT(30) | |
| 743 | −#define GAMTLBGFXA1_CLKGATE_DIS REG_BIT(29) | |
| 744 | −#define GAMTLBCOMPA0_CLKGATE_DIS REG_BIT(28) | |
| 745 | −#define GAMTLBCOMPA1_CLKGATE_DIS REG_BIT(27) | |
| 746 | −#define GAMTLBCOMPB0_CLKGATE_DIS REG_BIT(26) | |
| 747 | −#define GAMTLBCOMPB1_CLKGATE_DIS REG_BIT(25) | |
| 748 | −#define GAMTLBCOMPC0_CLKGATE_DIS REG_BIT(24) | |
| 749 | −#define GAMTLBCOMPC1_CLKGATE_DIS REG_BIT(23) | |
| 750 | −#define GAMTLBCOMPD0_CLKGATE_DIS REG_BIT(22) | |
| 751 | −#define GAMTLBCOMPD1_CLKGATE_DIS REG_BIT(21) | |
| 752 | −#define GAMTLBMERT_CLKGATE_DIS REG_BIT(20) | |
| 753 | −#define GAMTLBVEBOX3_CLKGATE_DIS REG_BIT(19) | |
| 754 | −#define GAMTLBVEBOX2_CLKGATE_DIS REG_BIT(18) | |
| 755 | −#define GAMTLBVEBOX1_CLKGATE_DIS REG_BIT(17) | |
| 756 | −#define GAMTLBVEBOX0_CLKGATE_DIS REG_BIT(16) | |
| 757 | −#define LTCDD_CLKGATE_DIS REG_BIT(10) | |
| 758 | − | |
| 759 | 726 | #define GEN11_SLICE_UNIT_LEVEL_CLKGATE _MMIO(0x94d4) |
| 760 | 727 | #define XEHP_SLICE_UNIT_LEVEL_CLKGATE MCR_REG(0x94d4) |
| 761 | 728 | #define SARBUNIT_CLKGATE_DIS (1 << 5) |
| @@ -765,9 +732,6 @@ · 3 unmodified lines | ||
| 765 | 732 | #define L3_CLKGATE_DIS REG_BIT(16) |
| 766 | 733 | #define L3_CR2X_CLKGATE_DIS REG_BIT(17) |
| 767 | 734 | |
| 768 | −#define SCCGCTL94DC MCR_REG(0x94dc) | |
| 769 | −#define CG3DDISURB REG_BIT(14) | |
| 770 | − | |
| 771 | 735 | #define UNSLICE_UNIT_LEVEL_CLKGATE2 _MMIO(0x94e4) |
| 772 | 736 | #define VSUNIT_CLKGATE_DIS_TGL REG_BIT(19) |
| 773 | 737 | #define PSDUNIT_CLKGATE_DIS REG_BIT(5) |
| @@ -989,10 +953,6 @@ · 215 unmodified lines | ||
| 989 | 953 | #define GEN7_WA_FOR_GEN7_L3_CONTROL 0x3C47FF8C |
| 990 | 954 | #define GEN7_L3AGDIS (1 << 19) |
| 991 | 955 | |
| 992 | −#define XEHPC_LNCFMISCCFGREG0 MCR_REG(0xb01c) | |
| 993 | −#define XEHPC_HOSTCACHEEN REG_BIT(1) | |
| 994 | −#define XEHPC_OVRLSCCC REG_BIT(0) | |
| 995 | − | |
| 996 | 956 | #define GEN7_L3CNTLREG2 _MMIO(0xb020) |
| 997 | 957 | |
| 998 | 958 | /* MOCS (Memory Object Control State) registers */ |
| @@ -1046,20 +1006,9 @@ · 47 unmodified lines | ||
| 1046 | 1006 | #define XEHP_L3SQCREG5 MCR_REG(0xb158) |
| 1047 | 1007 | #define L3_PWM_TIMER_INIT_VAL_MASK REG_GENMASK(9, 0) |
| 1048 | 1008 | |
| 1049 | −#define MLTICTXCTL MCR_REG(0xb170) | |
| 1050 | −#define TDONRENDER REG_BIT(2) | |
| 1051 | − | |
| 1052 | 1009 | #define XEHP_L3SCQREG7 MCR_REG(0xb188) |
| 1053 | 1010 | #define BLEND_FILL_CACHING_OPT_DIS REG_BIT(3) |
| 1054 | 1011 | |
| 1055 | −#define XEHPC_L3SCRUB MCR_REG(0xb18c) | |
| 1056 | −#define SCRUB_CL_DWNGRADE_SHARED REG_BIT(12) | |
| 1057 | −#define SCRUB_RATE_PER_BANK_MASK REG_GENMASK(2, 0) | |
| 1058 | −#define SCRUB_RATE_4B_PER_CLK REG_FIELD_PREP(SCRUB_RATE_PER_BANK_MASK, 0x6) | |
| 1059 | − | |
| 1060 | −#define L3SQCREG1_CCS0 MCR_REG(0xb200) | |
| 1061 | −#define FLUSHALLNONCOH REG_BIT(5) | |
| 1062 | − | |
| 1063 | 1012 | #define GEN11_GLBLINVL _MMIO(0xb404) |
| 1064 | 1013 | #define GEN11_BANK_HASH_ADDR_EXCL_MASK (0x7f << 5) |
| 1065 | 1014 | #define GEN11_BANK_HASH_ADDR_EXCL_BIT0 (1 << 5) |
| @@ -1109,7 +1058,6 @@ · 43 unmodified lines | ||
| 1109 | 1058 | #define XEHP_COMPCTX_TLB_INV_CR MCR_REG(0xcf04) |
| 1110 | 1059 | #define XELPMP_GSC_TLB_INV_CR _MMIO(0xcf04) /* media GT only */ |
| 1111 | 1060 | |
| 1112 | −#define XEHP_MERT_MOD_CTRL MCR_REG(0xcf28) | |
| 1113 | 1061 | #define RENDER_MOD_CTRL MCR_REG(0xcf2c) |
| 1114 | 1062 | #define COMP_MOD_CTRL MCR_REG(0xcf30) |
| 1115 | 1063 | #define XELPMP_GSC_MOD_CTRL _MMIO(0xcf30) /* media GT only */ |
| @@ -1185,7 +1133,6 @@ · 69 unmodified lines | ||
| 1185 | 1133 | #define EU_PERF_CNTL4 PERF_REG(0xe45c) |
| 1186 | 1134 | |
| 1187 | 1135 | #define GEN9_ROW_CHICKEN4 MCR_REG(0xe48c) |
| 1188 | −#define GEN12_DISABLE_GRF_CLEAR REG_BIT(13) | |
| 1189 | 1136 | #define XEHP_DIS_BBL_SYSPIPE REG_BIT(11) |
| 1190 | 1137 | #define GEN12_DISABLE_TDL_PUSH REG_BIT(9) |
| 1191 | 1138 | #define GEN11_DIS_PICK_2ND_EU REG_BIT(7) |
| @@ -1202,7 +1149,6 @@ · 10 unmodified lines | ||
| 1202 | 1149 | #define FLOW_CONTROL_ENABLE REG_BIT(15) |
| 1203 | 1150 | #define UGM_BACKUP_MODE REG_BIT(13) |
| 1204 | 1151 | #define MDQ_ARBITRATION_MODE REG_BIT(12) |
| 1205 | −#define SYSTOLIC_DOP_CLOCK_GATING_DIS REG_BIT(10) | |
| 1206 | 1152 | #define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE REG_BIT(8) |
| 1207 | 1153 | #define STALL_DOP_GATING_DISABLE REG_BIT(5) |
| 1208 | 1154 | #define THROTTLE_12_5 REG_GENMASK(4, 2) |
| @@ -1679,11 +1625,6 @@ · 470 unmodified lines | ||
| 1679 | 1625 | |
| 1680 | 1626 | #define GEN12_SFC_DONE(n) _MMIO(0x1cc000 + (n) * 0x1000) |
| 1681 | 1627 | |
| 1682 | −#define GT0_PACKAGE_ENERGY_STATUS _MMIO(0x250004) | |
| 1683 | −#define GT0_PACKAGE_RAPL_LIMIT _MMIO(0x250008) | |
| 1684 | −#define GT0_PACKAGE_POWER_SKU_UNIT _MMIO(0x250068) | |
| 1685 | −#define GT0_PLATFORM_ENERGY_STATUS _MMIO(0x25006c) | |
| 1686 | − | |
| 1687 | 1628 | /* |
| 1688 | 1629 | * Standalone Media's non-engine GT registers are located at their regular GT |
| 1689 | 1630 | * offsets plus 0x380000. This extra offset is stored inside the intel_uncore |
| @@ -573,7 +573,6 @@ static ssize_t media_freq_factor_show(struct kobject *kobj, · 572 unmodified lines | ||
| 573 | 573 | char *buff) |
| 574 | 574 | { |
| 575 | 575 | struct intel_gt *gt = intel_gt_sysfs_get_drvdata(kobj, attr->attr.name); |
| 576 | − struct intel_guc_slpc *slpc = >->uc.guc.slpc; | |
| 577 | 576 | intel_wakeref_t wakeref; |
| 578 | 577 | u32 mode; |
| 579 | 578 | |
| @@ -581,20 +580,12 @@ static ssize_t media_freq_factor_show(struct kobject *kobj, · 1 unmodified line | ||
| 581 | 580 | * Retrieve media_ratio_mode from GEN6_RPNSWREQ bit 13 set by |
| 582 | 581 | * GuC. GEN6_RPNSWREQ:13 value 0 represents 1:2 and 1 represents 1:1 |
| 583 | 582 | */ |
| 584 | − if (IS_XEHPSDV(gt->i915) && | |
| 585 | − slpc->media_ratio_mode == SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL) { | |
| 586 | − /* | |
| 587 | − * For XEHPSDV dynamic mode GEN6_RPNSWREQ:13 does not contain | |
| 588 | − * the media_ratio_mode, just return the cached media ratio | |
| 589 | − */ | |
| 590 | − mode = slpc->media_ratio_mode; | |
| 591 | − } else { | |
| 592 | − with_intel_runtime_pm(gt->uncore->rpm, wakeref) | |
| 593 | − mode = intel_uncore_read(gt->uncore, GEN6_RPNSWREQ); | |
| 594 | − mode = REG_FIELD_GET(GEN12_MEDIA_FREQ_RATIO, mode) ? | |
| 595 | − SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE : | |
| 596 | − SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO; | |
| 597 | − } | |
| 583 | + with_intel_runtime_pm(gt->uncore->rpm, wakeref) | |
| 584 | + mode = intel_uncore_read(gt->uncore, GEN6_RPNSWREQ); | |
| 585 | + | |
| 586 | + mode = REG_FIELD_GET(GEN12_MEDIA_FREQ_RATIO, mode) ? | |
| 587 | + SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE : | |
| 588 | + SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO; | |
| 598 | 589 | |
| 599 | 590 | return sysfs_emit(buff, "%u\n", media_ratio_mode_to_factor(mode)); |
| 600 | 591 | } |
| @@ -680,7 +680,7 @@ void setup_private_pat(struct intel_gt *gt) · 679 unmodified lines | ||
| 680 | 680 | |
| 681 | 681 | if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) |
| 682 | 682 | xelpg_setup_private_ppat(gt); |
| 683 | − else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 683 | + else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 684 | 684 | xehp_setup_private_ppat(gt); |
| 685 | 685 | else if (GRAPHICS_VER(i915) >= 12) |
| 686 | 686 | tgl_setup_private_ppat(uncore); |
| @@ -546,47 +546,6 @@ static const u8 gen12_rcs_offsets[] = { · 545 unmodified lines | ||
| 546 | 546 | END |
| 547 | 547 | }; |
| 548 | 548 | |
| 549 | −static const u8 xehp_rcs_offsets[] = { | |
| 550 | − NOP(1), | |
| 551 | − LRI(13, POSTED), | |
| 552 | − REG16(0x244), | |
| 553 | − REG(0x034), | |
| 554 | − REG(0x030), | |
| 555 | − REG(0x038), | |
| 556 | − REG(0x03c), | |
| 557 | − REG(0x168), | |
| 558 | − REG(0x140), | |
| 559 | − REG(0x110), | |
| 560 | − REG(0x1c0), | |
| 561 | − REG(0x1c4), | |
| 562 | − REG(0x1c8), | |
| 563 | − REG(0x180), | |
| 564 | − REG16(0x2b4), | |
| 565 | − | |
| 566 | − NOP(5), | |
| 567 | − LRI(9, POSTED), | |
| 568 | − REG16(0x3a8), | |
| 569 | − REG16(0x28c), | |
| 570 | − REG16(0x288), | |
| 571 | − REG16(0x284), | |
| 572 | − REG16(0x280), | |
| 573 | − REG16(0x27c), | |
| 574 | − REG16(0x278), | |
| 575 | − REG16(0x274), | |
| 576 | − REG16(0x270), | |
| 577 | − | |
| 578 | − LRI(3, POSTED), | |
| 579 | − REG(0x1b0), | |
| 580 | − REG16(0x5a8), | |
| 581 | − REG16(0x5ac), | |
| 582 | − | |
| 583 | − NOP(6), | |
| 584 | − LRI(1, 0), | |
| 585 | − REG(0x0c8), | |
| 586 | − | |
| 587 | − END | |
| 588 | −}; | |
| 589 | − | |
| 590 | 549 | static const u8 dg2_rcs_offsets[] = { |
| 591 | 550 | NOP(1), |
| 592 | 551 | LRI(15, POSTED), |
| @@ -695,8 +654,6 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine) · 102 unmodified lines | ||
| 695 | 654 | return mtl_rcs_offsets; |
| 696 | 655 | else if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) |
| 697 | 656 | return dg2_rcs_offsets; |
| 698 | − else if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 699 | − return xehp_rcs_offsets; | |
| 700 | 657 | else if (GRAPHICS_VER(engine->i915) >= 12) |
| 701 | 658 | return gen12_rcs_offsets; |
| 702 | 659 | else if (GRAPHICS_VER(engine->i915) >= 11) |
| @@ -719,7 +676,7 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine) · 16 unmodified lines | ||
| 719 | 676 | |
| 720 | 677 | static int lrc_ring_mi_mode(const struct intel_engine_cs *engine) |
| 721 | 678 | { |
| 722 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 679 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) | |
| 723 | 680 | return 0x70; |
| 724 | 681 | else if (GRAPHICS_VER(engine->i915) >= 12) |
| 725 | 682 | return 0x60; |
| @@ -733,7 +690,7 @@ static int lrc_ring_mi_mode(const struct intel_engine_cs *engine) · 7 unmodified lines | ||
| 733 | 690 | |
| 734 | 691 | static int lrc_ring_bb_offset(const struct intel_engine_cs *engine) |
| 735 | 692 | { |
| 736 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 693 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) | |
| 737 | 694 | return 0x80; |
| 738 | 695 | else if (GRAPHICS_VER(engine->i915) >= 12) |
| 739 | 696 | return 0x70; |
| @@ -748,7 +705,7 @@ static int lrc_ring_bb_offset(const struct intel_engine_cs *engine) · 8 unmodified lines | ||
| 748 | 705 | |
| 749 | 706 | static int lrc_ring_gpr0(const struct intel_engine_cs *engine) |
| 750 | 707 | { |
| 751 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 708 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) | |
| 752 | 709 | return 0x84; |
| 753 | 710 | else if (GRAPHICS_VER(engine->i915) >= 12) |
| 754 | 711 | return 0x74; |
| @@ -795,7 +752,7 @@ static int lrc_ring_indirect_offset(const struct intel_engine_cs *engine) · 40 unmodified lines | ||
| 795 | 752 | static int lrc_ring_cmd_buf_cctl(const struct intel_engine_cs *engine) |
| 796 | 753 | { |
| 797 | 754 | |
| 798 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 755 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) | |
| 799 | 756 | /* |
| 800 | 757 | * Note that the CSFE context has a dummy slot for CMD_BUF_CCTL |
| 801 | 758 | * simply to match the RCS context image layout. |
| @@ -35,9 +35,9 @@ static bool engine_supports_migration(struct intel_engine_cs *engine) · 34 unmodified lines | ||
| 35 | 35 | return true; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | −static void xehpsdv_toggle_pdes(struct i915_address_space *vm, | |
| 39 | − struct i915_page_table *pt, | |
| 40 | − void *data) | |
| 38 | +static void xehp_toggle_pdes(struct i915_address_space *vm, | |
| 39 | + struct i915_page_table *pt, | |
| 40 | + void *data) | |
| 41 | 41 | { |
| 42 | 42 | struct insert_pte_data *d = data; |
| 43 | 43 | |
| @@ -52,9 +52,9 @@ static void xehpsdv_toggle_pdes(struct i915_address_space *vm, · 8 unmodified lines | ||
| 52 | 52 | d->offset += SZ_2M; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | −static void xehpsdv_insert_pte(struct i915_address_space *vm, | |
| 56 | − struct i915_page_table *pt, | |
| 57 | − void *data) | |
| 55 | +static void xehp_insert_pte(struct i915_address_space *vm, | |
| 56 | + struct i915_page_table *pt, | |
| 57 | + void *data) | |
| 58 | 58 | { |
| 59 | 59 | struct insert_pte_data *d = data; |
| 60 | 60 | |
| @@ -120,7 +120,7 @@ static struct i915_address_space *migrate_vm(struct intel_gt *gt) · 59 unmodified lines | ||
| 120 | 120 | * 512 entry layout using 4K GTT pages. The other two windows just map |
| 121 | 121 | * lmem pages and must use the new compact 32 entry layout using 64K GTT |
| 122 | 122 | * pages, which ensures we can address any lmem object that the user |
| 123 | − * throws at us. We then also use the xehpsdv_toggle_pdes as a way of | |
| 123 | + * throws at us. We then also use the xehp_toggle_pdes as a way of | |
| 124 | 124 | * just toggling the PDE bit(GEN12_PDE_64K) for us, to enable the |
| 125 | 125 | * compact layout for each of these page-tables, that fall within the |
| 126 | 126 | * [CHUNK_SIZE, 3 * CHUNK_SIZE) range. |
| @@ -209,12 +209,12 @@ static struct i915_address_space *migrate_vm(struct intel_gt *gt) · 82 unmodified lines | ||
| 209 | 209 | /* Now allow the GPU to rewrite the PTE via its own ppGTT */ |
| 210 | 210 | if (HAS_64K_PAGES(gt->i915)) { |
| 211 | 211 | vm->vm.foreach(&vm->vm, base, d.offset - base, |
| 212 | − xehpsdv_insert_pte, &d); | |
| 212 | + xehp_insert_pte, &d); | |
| 213 | 213 | d.offset = base + CHUNK_SZ; |
| 214 | 214 | vm->vm.foreach(&vm->vm, |
| 215 | 215 | d.offset, |
| 216 | 216 | 2 * CHUNK_SZ, |
| 217 | − xehpsdv_toggle_pdes, &d); | |
| 217 | + xehp_toggle_pdes, &d); | |
| 218 | 218 | } else { |
| 219 | 219 | vm->vm.foreach(&vm->vm, base, d.offset - base, |
| 220 | 220 | insert_pte, &d); |
| @@ -925,7 +925,7 @@ static int emit_clear(struct i915_request *rq, u32 offset, int size, · 704 unmodified lines | ||
| 925 | 925 | |
| 926 | 926 | GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX); |
| 927 | 927 | |
| 928 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 928 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 929 | 929 | ring_sz = XY_FAST_COLOR_BLT_DW; |
| 930 | 930 | else if (ver >= 8) |
| 931 | 931 | ring_sz = 8; |
| @@ -936,7 +936,7 @@ static int emit_clear(struct i915_request *rq, u32 offset, int size, · 4 unmodified lines | ||
| 936 | 936 | if (IS_ERR(cs)) |
| 937 | 937 | return PTR_ERR(cs); |
| 938 | 938 | |
| 939 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) { | |
| 939 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) { | |
| 940 | 940 | *cs++ = XY_FAST_COLOR_BLT_CMD | XY_FAST_COLOR_BLT_DEPTH_32 | |
| 941 | 941 | (XY_FAST_COLOR_BLT_DW - 2); |
| 942 | 942 | *cs++ = FIELD_PREP(XY_FAST_COLOR_BLT_MOCS_MASK, mocs) | |
| @@ -53,7 +53,6 @@ struct drm_i915_mocs_table { · 52 unmodified lines | ||
| 53 | 53 | |
| 54 | 54 | /* Helper defines */ |
| 55 | 55 | #define GEN9_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */ |
| 56 | −#define PVC_NUM_MOCS_ENTRIES 3 | |
| 57 | 56 | #define MTL_NUM_MOCS_ENTRIES 16 |
| 58 | 57 | |
| 59 | 58 | /* (e)LLC caching options */ |
| @@ -367,31 +366,6 @@ static const struct drm_i915_mocs_entry gen12_mocs_table[] = { · 307 unmodified lines | ||
| 367 | 366 | L3_3_WB), |
| 368 | 367 | }; |
| 369 | 368 | |
| 370 | −static const struct drm_i915_mocs_entry xehpsdv_mocs_table[] = { | |
| 371 | − /* wa_1608975824 */ | |
| 372 | − MOCS_ENTRY(0, 0, L3_3_WB | L3_LKUP(1)), | |
| 373 | − | |
| 374 | − /* UC - Coherent; GO:L3 */ | |
| 375 | − MOCS_ENTRY(1, 0, L3_1_UC | L3_LKUP(1)), | |
| 376 | − /* UC - Coherent; GO:Memory */ | |
| 377 | − MOCS_ENTRY(2, 0, L3_1_UC | L3_GLBGO(1) | L3_LKUP(1)), | |
| 378 | − /* UC - Non-Coherent; GO:Memory */ | |
| 379 | − MOCS_ENTRY(3, 0, L3_1_UC | L3_GLBGO(1)), | |
| 380 | − /* UC - Non-Coherent; GO:L3 */ | |
| 381 | − MOCS_ENTRY(4, 0, L3_1_UC), | |
| 382 | − | |
| 383 | − /* WB */ | |
| 384 | − MOCS_ENTRY(5, 0, L3_3_WB | L3_LKUP(1)), | |
| 385 | − | |
| 386 | − /* HW Reserved - SW program but never use. */ | |
| 387 | − MOCS_ENTRY(48, 0, L3_3_WB | L3_LKUP(1)), | |
| 388 | − MOCS_ENTRY(49, 0, L3_1_UC | L3_LKUP(1)), | |
| 389 | − MOCS_ENTRY(60, 0, L3_1_UC), | |
| 390 | − MOCS_ENTRY(61, 0, L3_1_UC), | |
| 391 | − MOCS_ENTRY(62, 0, L3_1_UC), | |
| 392 | − MOCS_ENTRY(63, 0, L3_1_UC), | |
| 393 | −}; | |
| 394 | − | |
| 395 | 369 | static const struct drm_i915_mocs_entry dg2_mocs_table[] = { |
| 396 | 370 | /* UC - Coherent; GO:L3 */ |
| 397 | 371 | MOCS_ENTRY(0, 0, L3_1_UC | L3_LKUP(1)), |
| @@ -404,17 +378,6 @@ static const struct drm_i915_mocs_entry dg2_mocs_table[] = { · 6 unmodified lines | ||
| 404 | 378 | MOCS_ENTRY(3, 0, L3_3_WB | L3_LKUP(1)), |
| 405 | 379 | }; |
| 406 | 380 | |
| 407 | −static const struct drm_i915_mocs_entry pvc_mocs_table[] = { | |
| 408 | − /* Error */ | |
| 409 | − MOCS_ENTRY(0, 0, L3_3_WB), | |
| 410 | − | |
| 411 | − /* UC */ | |
| 412 | − MOCS_ENTRY(1, 0, L3_1_UC), | |
| 413 | − | |
| 414 | − /* WB */ | |
| 415 | − MOCS_ENTRY(2, 0, L3_3_WB), | |
| 416 | −}; | |
| 417 | − | |
| 418 | 381 | static const struct drm_i915_mocs_entry mtl_mocs_table[] = { |
| 419 | 382 | /* Error - Reserved for Non-Use */ |
| 420 | 383 | MOCS_ENTRY(0, |
| @@ -501,25 +464,12 @@ static unsigned int get_mocs_settings(struct drm_i915_private *i915, · 80 unmodified lines | ||
| 501 | 464 | table->n_entries = MTL_NUM_MOCS_ENTRIES; |
| 502 | 465 | table->uc_index = 9; |
| 503 | 466 | table->unused_entries_index = 1; |
| 504 | − } else if (IS_PONTEVECCHIO(i915)) { | |
| 505 | − table->size = ARRAY_SIZE(pvc_mocs_table); | |
| 506 | − table->table = pvc_mocs_table; | |
| 507 | − table->n_entries = PVC_NUM_MOCS_ENTRIES; | |
| 508 | − table->uc_index = 1; | |
| 509 | − table->wb_index = 2; | |
| 510 | − table->unused_entries_index = 2; | |
| 511 | 467 | } else if (IS_DG2(i915)) { |
| 512 | 468 | table->size = ARRAY_SIZE(dg2_mocs_table); |
| 513 | 469 | table->table = dg2_mocs_table; |
| 514 | 470 | table->uc_index = 1; |
| 515 | 471 | table->n_entries = GEN9_NUM_MOCS_ENTRIES; |
| 516 | 472 | table->unused_entries_index = 3; |
| 517 | − } else if (IS_XEHPSDV(i915)) { | |
| 518 | − table->size = ARRAY_SIZE(xehpsdv_mocs_table); | |
| 519 | − table->table = xehpsdv_mocs_table; | |
| 520 | − table->uc_index = 2; | |
| 521 | − table->n_entries = GEN9_NUM_MOCS_ENTRIES; | |
| 522 | − table->unused_entries_index = 5; | |
| 523 | 473 | } else if (IS_DG1(i915)) { |
| 524 | 474 | table->size = ARRAY_SIZE(dg1_mocs_table); |
| 525 | 475 | table->table = dg1_mocs_table; |
| @@ -670,7 +620,7 @@ static void init_l3cc_table(struct intel_gt *gt, · 144 unmodified lines | ||
| 670 | 620 | |
| 671 | 621 | intel_gt_mcr_lock(gt, &flags); |
| 672 | 622 | for_each_l3cc(l3cc, table, i) |
| 673 | − if (GRAPHICS_VER_FULL(gt->i915) >= IP_VER(12, 50)) | |
| 623 | + if (GRAPHICS_VER_FULL(gt->i915) >= IP_VER(12, 55)) | |
| 674 | 624 | intel_gt_mcr_multicast_write_fw(gt, XEHP_LNCFCMOCS(i), l3cc); |
| 675 | 625 | else |
| 676 | 626 | intel_uncore_write_fw(gt->uncore, GEN9_LNCFCMOCS(i), l3cc); |
| @@ -1086,11 +1086,7 @@ static u32 intel_rps_read_state_cap(struct intel_rps *rps) · 1085 unmodified lines | ||
| 1086 | 1086 | struct drm_i915_private *i915 = rps_to_i915(rps); |
| 1087 | 1087 | struct intel_uncore *uncore = rps_to_uncore(rps); |
| 1088 | 1088 | |
| 1089 | − if (IS_PONTEVECCHIO(i915)) | |
| 1090 | − return intel_uncore_read(uncore, PVC_RP_STATE_CAP); | |
| 1091 | − else if (IS_XEHPSDV(i915)) | |
| 1092 | − return intel_uncore_read(uncore, XEHPSDV_RP_STATE_CAP); | |
| 1093 | − else if (IS_GEN9_LP(i915)) | |
| 1089 | + if (IS_GEN9_LP(i915)) | |
| 1094 | 1090 | return intel_uncore_read(uncore, BXT_RP_STATE_CAP); |
| 1095 | 1091 | else |
| 1096 | 1092 | return intel_uncore_read(uncore, GEN6_RP_STATE_CAP); |
| @@ -214,13 +214,8 @@ static void xehp_sseu_info_init(struct intel_gt *gt) · 213 unmodified lines | ||
| 214 | 214 | int num_compute_regs, num_geometry_regs; |
| 215 | 215 | int eu; |
| 216 | 216 | |
| 217 | − if (IS_PONTEVECCHIO(gt->i915)) { | |
| 218 | − num_geometry_regs = 0; | |
| 219 | − num_compute_regs = 2; | |
| 220 | − } else { | |
| 221 | − num_geometry_regs = 1; | |
| 222 | − num_compute_regs = 1; | |
| 223 | − } | |
| 217 | + num_geometry_regs = 1; | |
| 218 | + num_compute_regs = 1; | |
| 224 | 219 | |
| 225 | 220 | /* |
| 226 | 221 | * The concept of slice has been removed in Xe_HP. To be compatible |
| @@ -642,7 +637,7 @@ void intel_sseu_info_init(struct intel_gt *gt) · 415 unmodified lines | ||
| 642 | 637 | { |
| 643 | 638 | struct drm_i915_private *i915 = gt->i915; |
| 644 | 639 | |
| 645 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 640 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 646 | 641 | xehp_sseu_info_init(gt); |
| 647 | 642 | else if (GRAPHICS_VER(i915) >= 12) |
| 648 | 643 | gen12_sseu_info_init(gt); |
| @@ -851,7 +846,7 @@ void intel_sseu_print_topology(struct drm_i915_private *i915, · 202 unmodified lines | ||
| 851 | 846 | { |
| 852 | 847 | if (sseu->max_slices == 0) |
| 853 | 848 | drm_printf(p, "Unavailable\n"); |
| 854 | − else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 849 | + else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 855 | 850 | sseu_print_xehp_topology(sseu, p); |
| 856 | 851 | else |
| 857 | 852 | sseu_print_hsw_topology(sseu, p); |
| @@ -257,12 +257,6 @@ wa_write(struct i915_wa_list *wal, i915_reg_t reg, u32 set) · 256 unmodified lines | ||
| 257 | 257 | wa_write_clr_set(wal, reg, ~0, set); |
| 258 | 258 | } |
| 259 | 259 | |
| 260 | −static void | |
| 261 | −wa_mcr_write(struct i915_wa_list *wal, i915_mcr_reg_t reg, u32 set) | |
| 262 | −{ | |
| 263 | − wa_mcr_write_clr_set(wal, reg, ~0, set); | |
| 264 | −} | |
| 265 | − | |
| 266 | 260 | static void |
| 267 | 261 | wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 set) |
| 268 | 262 | { |
| @@ -918,12 +912,8 @@ __intel_engine_init_ctx_wa(struct intel_engine_cs *engine, · 649 unmodified lines | ||
| 918 | 912 | |
| 919 | 913 | if (IS_GFX_GT_IP_RANGE(engine->gt, IP_VER(12, 70), IP_VER(12, 74))) |
| 920 | 914 | xelpg_ctx_workarounds_init(engine, wal); |
| 921 | − else if (IS_PONTEVECCHIO(i915)) | |
| 922 | − ; /* noop; none at this time */ | |
| 923 | 915 | else if (IS_DG2(i915)) |
| 924 | 916 | dg2_ctx_workarounds_init(engine, wal); |
| 925 | − else if (IS_XEHPSDV(i915)) | |
| 926 | − ; /* noop; none at this time */ | |
| 927 | 917 | else if (IS_DG1(i915)) |
| 928 | 918 | dg1_ctx_workarounds_init(engine, wal); |
| 929 | 919 | else if (GRAPHICS_VER(i915) == 12) |
| @@ -1350,9 +1340,6 @@ xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) · 420 unmodified lines | ||
| 1350 | 1340 | gt->steering_table[MSLICE] = NULL; |
| 1351 | 1341 | } |
| 1352 | 1342 | |
| 1353 | − if (IS_XEHPSDV(gt->i915) && slice_mask & BIT(0)) | |
| 1354 | − gt->steering_table[GAM] = NULL; | |
| 1355 | − | |
| 1356 | 1343 | slice = __ffs(slice_mask); |
| 1357 | 1344 | subslice = intel_sseu_find_first_xehp_dss(sseu, GEN_DSS_PER_GSLICE, slice) % |
| 1358 | 1345 | GEN_DSS_PER_GSLICE; |
| @@ -1379,20 +1366,6 @@ xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) · 20 unmodified lines | ||
| 1379 | 1366 | __set_mcr_steering(wal, GAM_MCR_SELECTOR, 1, 0); |
| 1380 | 1367 | } |
| 1381 | 1368 | |
| 1382 | −static void | |
| 1383 | −pvc_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) | |
| 1384 | −{ | |
| 1385 | − unsigned int dss; | |
| 1386 | − | |
| 1387 | − /* | |
| 1388 | − * Setup implicit steering for COMPUTE and DSS ranges to the first | |
| 1389 | − * non-fused-off DSS. All other types of MCR registers will be | |
| 1390 | − * explicitly steered. | |
| 1391 | − */ | |
| 1392 | − dss = intel_sseu_find_first_xehp_dss(>->info.sseu, 0, 0); | |
| 1393 | − __add_mcr_wa(gt, wal, dss / GEN_DSS_PER_CSLICE, dss % GEN_DSS_PER_CSLICE); | |
| 1394 | −} | |
| 1395 | − | |
| 1396 | 1369 | static void |
| 1397 | 1370 | icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) |
| 1398 | 1371 | { |
| @@ -1519,76 +1492,6 @@ dg1_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) · 120 unmodified lines | ||
| 1519 | 1492 | wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2, VSUNIT_CLKGATE_DIS_TGL); |
| 1520 | 1493 | } |
| 1521 | 1494 | |
| 1522 | −static void | |
| 1523 | −xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) | |
| 1524 | −{ | |
| 1525 | − struct drm_i915_private *i915 = gt->i915; | |
| 1526 | − | |
| 1527 | − xehp_init_mcr(gt, wal); | |
| 1528 | − | |
| 1529 | − /* Wa_1409757795:xehpsdv */ | |
| 1530 | − wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); | |
| 1531 | − | |
| 1532 | − /* Wa_18011725039:xehpsdv */ | |
| 1533 | − if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A1, STEP_B0)) { | |
| 1534 | − wa_mcr_masked_dis(wal, MLTICTXCTL, TDONRENDER); | |
| 1535 | − wa_mcr_write_or(wal, L3SQCREG1_CCS0, FLUSHALLNONCOH); | |
| 1536 | − } | |
| 1537 | − | |
| 1538 | − /* Wa_16011155590:xehpsdv */ | |
| 1539 | − if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A0, STEP_B0)) | |
| 1540 | − wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE, | |
| 1541 | − TSGUNIT_CLKGATE_DIS); | |
| 1542 | − | |
| 1543 | − /* Wa_14011780169:xehpsdv */ | |
| 1544 | − if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_B0, STEP_FOREVER)) { | |
| 1545 | − wa_write_or(wal, UNSLCGCTL9440, GAMTLBOACS_CLKGATE_DIS | | |
| 1546 | − GAMTLBVDBOX7_CLKGATE_DIS | | |
| 1547 | − GAMTLBVDBOX6_CLKGATE_DIS | | |
| 1548 | − GAMTLBVDBOX5_CLKGATE_DIS | | |
| 1549 | − GAMTLBVDBOX4_CLKGATE_DIS | | |
| 1550 | − GAMTLBVDBOX3_CLKGATE_DIS | | |
| 1551 | − GAMTLBVDBOX2_CLKGATE_DIS | | |
| 1552 | − GAMTLBVDBOX1_CLKGATE_DIS | | |
| 1553 | − GAMTLBVDBOX0_CLKGATE_DIS | | |
| 1554 | − GAMTLBKCR_CLKGATE_DIS | | |
| 1555 | − GAMTLBGUC_CLKGATE_DIS | | |
| 1556 | − GAMTLBBLT_CLKGATE_DIS); | |
| 1557 | − wa_write_or(wal, UNSLCGCTL9444, GAMTLBGFXA0_CLKGATE_DIS | | |
| 1558 | − GAMTLBGFXA1_CLKGATE_DIS | | |
| 1559 | − GAMTLBCOMPA0_CLKGATE_DIS | | |
| 1560 | − GAMTLBCOMPA1_CLKGATE_DIS | | |
| 1561 | − GAMTLBCOMPB0_CLKGATE_DIS | | |
| 1562 | − GAMTLBCOMPB1_CLKGATE_DIS | | |
| 1563 | − GAMTLBCOMPC0_CLKGATE_DIS | | |
| 1564 | − GAMTLBCOMPC1_CLKGATE_DIS | | |
| 1565 | − GAMTLBCOMPD0_CLKGATE_DIS | | |
| 1566 | − GAMTLBCOMPD1_CLKGATE_DIS | | |
| 1567 | − GAMTLBMERT_CLKGATE_DIS | | |
| 1568 | − GAMTLBVEBOX3_CLKGATE_DIS | | |
| 1569 | − GAMTLBVEBOX2_CLKGATE_DIS | | |
| 1570 | − GAMTLBVEBOX1_CLKGATE_DIS | | |
| 1571 | − GAMTLBVEBOX0_CLKGATE_DIS); | |
| 1572 | − } | |
| 1573 | − | |
| 1574 | − /* Wa_16012725990:xehpsdv */ | |
| 1575 | − if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A1, STEP_FOREVER)) | |
| 1576 | − wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE, VFUNIT_CLKGATE_DIS); | |
| 1577 | − | |
| 1578 | − /* Wa_14011060649:xehpsdv */ | |
| 1579 | − wa_14011060649(gt, wal); | |
| 1580 | − | |
| 1581 | − /* Wa_14012362059:xehpsdv */ | |
| 1582 | − wa_mcr_write_or(wal, XEHP_MERT_MOD_CTRL, FORCE_MISS_FTLB); | |
| 1583 | − | |
| 1584 | − /* Wa_14014368820:xehpsdv */ | |
| 1585 | − wa_mcr_write_or(wal, XEHP_GAMCNTRL_CTRL, | |
| 1586 | − INVALIDATION_BROADCAST_MODE_DIS | GLOBAL_INVALIDATION_MODE); | |
| 1587 | − | |
| 1588 | − /* Wa_14010670810:xehpsdv */ | |
| 1589 | − wa_mcr_write_or(wal, XEHP_L3NODEARBCFG, XEHP_LNESPARE); | |
| 1590 | −} | |
| 1591 | − | |
| 1592 | 1495 | static void |
| 1593 | 1496 | dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) |
| 1594 | 1497 | { |
| @@ -1631,24 +1534,6 @@ dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) · 36 unmodified lines | ||
| 1631 | 1534 | wa_mcr_write_or(wal, XEHP_L3NODEARBCFG, XEHP_LNESPARE); |
| 1632 | 1535 | } |
| 1633 | 1536 | |
| 1634 | −static void | |
| 1635 | −pvc_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) | |
| 1636 | −{ | |
| 1637 | − pvc_init_mcr(gt, wal); | |
| 1638 | − | |
| 1639 | − /* Wa_14015795083 */ | |
| 1640 | − wa_write_clr(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE); | |
| 1641 | − | |
| 1642 | − /* Wa_18018781329 */ | |
| 1643 | − wa_mcr_write_or(wal, RENDER_MOD_CTRL, FORCE_MISS_FTLB); | |
| 1644 | − wa_mcr_write_or(wal, COMP_MOD_CTRL, FORCE_MISS_FTLB); | |
| 1645 | − wa_mcr_write_or(wal, XEHP_VDBX_MOD_CTRL, FORCE_MISS_FTLB); | |
| 1646 | − wa_mcr_write_or(wal, XEHP_VEBX_MOD_CTRL, FORCE_MISS_FTLB); | |
| 1647 | − | |
| 1648 | − /* Wa_16016694945 */ | |
| 1649 | − wa_mcr_masked_en(wal, XEHPC_LNCFMISCCFGREG0, XEHPC_OVRLSCCC); | |
| 1650 | −} | |
| 1651 | − | |
| 1652 | 1537 | static void |
| 1653 | 1538 | xelpg_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) |
| 1654 | 1539 | { |
| @@ -1725,12 +1610,6 @@ static void gt_tuning_settings(struct intel_gt *gt, struct i915_wa_list *wal) · 70 unmodified lines | ||
| 1725 | 1610 | wa_mcr_write_or(wal, XEHP_SQCM, EN_32B_ACCESS); |
| 1726 | 1611 | } |
| 1727 | 1612 | |
| 1728 | − if (IS_PONTEVECCHIO(gt->i915)) { | |
| 1729 | − wa_mcr_write(wal, XEHPC_L3SCRUB, | |
| 1730 | − SCRUB_CL_DWNGRADE_SHARED | SCRUB_RATE_4B_PER_CLK); | |
| 1731 | − wa_mcr_masked_en(wal, XEHPC_LNCFMISCCFGREG0, XEHPC_HOSTCACHEEN); | |
| 1732 | − } | |
| 1733 | − | |
| 1734 | 1613 | if (IS_DG2(gt->i915)) { |
| 1735 | 1614 | wa_mcr_write_or(wal, XEHP_L3SCQREG7, BLEND_FILL_CACHING_OPT_DIS); |
| 1736 | 1615 | wa_mcr_write_or(wal, XEHP_SQCM, EN_32B_ACCESS); |
| @@ -1755,12 +1634,8 @@ gt_init_workarounds(struct intel_gt *gt, struct i915_wa_list *wal) · 18 unmodified lines | ||
| 1755 | 1634 | |
| 1756 | 1635 | if (IS_GFX_GT_IP_RANGE(gt, IP_VER(12, 70), IP_VER(12, 74))) |
| 1757 | 1636 | xelpg_gt_workarounds_init(gt, wal); |
| 1758 | − else if (IS_PONTEVECCHIO(i915)) | |
| 1759 | − pvc_gt_workarounds_init(gt, wal); | |
| 1760 | 1637 | else if (IS_DG2(i915)) |
| 1761 | 1638 | dg2_gt_workarounds_init(gt, wal); |
| 1762 | − else if (IS_XEHPSDV(i915)) | |
| 1763 | − xehpsdv_gt_workarounds_init(gt, wal); | |
| 1764 | 1639 | else if (IS_DG1(i915)) |
| 1765 | 1640 | dg1_gt_workarounds_init(gt, wal); |
| 1766 | 1641 | else if (GRAPHICS_VER(i915) == 12) |
| @@ -2178,30 +2053,6 @@ static void dg2_whitelist_build(struct intel_engine_cs *engine) · 411 unmodified lines | ||
| 2178 | 2053 | } |
| 2179 | 2054 | } |
| 2180 | 2055 | |
| 2181 | −static void blacklist_trtt(struct intel_engine_cs *engine) | |
| 2182 | −{ | |
| 2183 | − struct i915_wa_list *w = &engine->whitelist; | |
| 2184 | − | |
| 2185 | − /* | |
| 2186 | − * Prevent read/write access to [0x4400, 0x4600) which covers | |
| 2187 | − * the TRTT range across all engines. Note that normally userspace | |
| 2188 | − * cannot access the other engines' trtt control, but for simplicity | |
| 2189 | − * we cover the entire range on each engine. | |
| 2190 | − */ | |
| 2191 | − whitelist_reg_ext(w, _MMIO(0x4400), | |
| 2192 | − RING_FORCE_TO_NONPRIV_DENY | | |
| 2193 | − RING_FORCE_TO_NONPRIV_RANGE_64); | |
| 2194 | − whitelist_reg_ext(w, _MMIO(0x4500), | |
| 2195 | − RING_FORCE_TO_NONPRIV_DENY | | |
| 2196 | − RING_FORCE_TO_NONPRIV_RANGE_64); | |
| 2197 | −} | |
| 2198 | − | |
| 2199 | −static void pvc_whitelist_build(struct intel_engine_cs *engine) | |
| 2200 | −{ | |
| 2201 | − /* Wa_16014440446:pvc */ | |
| 2202 | − blacklist_trtt(engine); | |
| 2203 | −} | |
| 2204 | − | |
| 2205 | 2056 | static void xelpg_whitelist_build(struct intel_engine_cs *engine) |
| 2206 | 2057 | { |
| 2207 | 2058 | struct i915_wa_list *w = &engine->whitelist; |
| @@ -2228,12 +2079,8 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine) · 20 unmodified lines | ||
| 2228 | 2079 | ; /* none yet */ |
| 2229 | 2080 | else if (IS_GFX_GT_IP_RANGE(engine->gt, IP_VER(12, 70), IP_VER(12, 74))) |
| 2230 | 2081 | xelpg_whitelist_build(engine); |
| 2231 | − else if (IS_PONTEVECCHIO(i915)) | |
| 2232 | − pvc_whitelist_build(engine); | |
| 2233 | 2082 | else if (IS_DG2(i915)) |
| 2234 | 2083 | dg2_whitelist_build(engine); |
| 2235 | − else if (IS_XEHPSDV(i915)) | |
| 2236 | − ; /* none needed */ | |
| 2237 | 2084 | else if (GRAPHICS_VER(i915) == 12) |
| 2238 | 2085 | tgl_whitelist_build(engine); |
| 2239 | 2086 | else if (GRAPHICS_VER(i915) == 11) |
| @@ -2814,10 +2661,7 @@ xcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) · 574 unmodified lines | ||
| 2814 | 2661 | static void |
| 2815 | 2662 | ccs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) |
| 2816 | 2663 | { |
| 2817 | − if (IS_PVC_CT_STEP(engine->i915, STEP_A0, STEP_C0)) { | |
| 2818 | − /* Wa_14014999345:pvc */ | |
| 2819 | − wa_mcr_masked_en(wal, GEN10_CACHE_MODE_SS, DISABLE_ECC); | |
| 2820 | − } | |
| 2664 | + /* boilerplate for any CCS engine workaround */ | |
| 2821 | 2665 | } |
| 2822 | 2666 | |
| 2823 | 2667 | /* |
| @@ -2850,7 +2694,7 @@ add_render_compute_tuning_settings(struct intel_gt *gt, · 26 unmodified lines | ||
| 2850 | 2694 | wa_mcr_masked_field_set(wal, GEN9_ROW_CHICKEN4, THREAD_EX_ARB_MODE, |
| 2851 | 2695 | THREAD_EX_ARB_MODE_RR_AFTER_DEP); |
| 2852 | 2696 | |
| 2853 | − if (GRAPHICS_VER(i915) == 12 && GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) | |
| 2697 | + if (GRAPHICS_VER(i915) == 12 && GRAPHICS_VER_FULL(i915) < IP_VER(12, 55)) | |
| 2854 | 2698 | wa_write_clr(wal, GEN8_GARBCNTL, GEN12_BUS_HASH_CTL_BIT_EXC); |
| 2855 | 2699 | } |
| 2856 | 2700 | |
| @@ -2923,21 +2767,18 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li · 66 unmodified lines | ||
| 2923 | 2767 | |
| 2924 | 2768 | if (IS_GFX_GT_IP_STEP(gt, IP_VER(12, 70), STEP_A0, STEP_B0) || |
| 2925 | 2769 | IS_GFX_GT_IP_STEP(gt, IP_VER(12, 71), STEP_A0, STEP_B0) || |
| 2926 | − IS_PONTEVECCHIO(i915) || | |
| 2927 | 2770 | IS_DG2(i915)) { |
| 2928 | 2771 | /* Wa_22014226127 */ |
| 2929 | 2772 | wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0, DISABLE_D8_D16_COASLESCE); |
| 2930 | 2773 | } |
| 2931 | 2774 | |
| 2932 | − if (IS_PONTEVECCHIO(i915) || IS_DG2(i915)) { | |
| 2775 | + if (IS_DG2(i915)) { | |
| 2933 | 2776 | /* Wa_14015227452:dg2,pvc */ |
| 2934 | 2777 | wa_mcr_masked_en(wal, GEN9_ROW_CHICKEN4, XEHP_DIS_BBL_SYSPIPE); |
| 2935 | 2778 | |
| 2936 | 2779 | /* Wa_16015675438:dg2,pvc */ |
| 2937 | 2780 | wa_masked_en(wal, FF_SLICE_CS_CHICKEN2, GEN12_PERF_FIX_BALANCING_CFE_DISABLE); |
| 2938 | − } | |
| 2939 | 2781 | |
| 2940 | − if (IS_DG2(i915)) { | |
| 2941 | 2782 | /* |
| 2942 | 2783 | * Wa_16011620976:dg2_g11 |
| 2943 | 2784 | * Wa_22015475538:dg2 |
| @@ -2973,22 +2814,6 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li · 29 unmodified lines | ||
| 2973 | 2814 | 0 /* write-only, so skip validation */, |
| 2974 | 2815 | true); |
| 2975 | 2816 | } |
| 2976 | − | |
| 2977 | − if (IS_XEHPSDV(i915)) { | |
| 2978 | − /* Wa_1409954639 */ | |
| 2979 | − wa_mcr_masked_en(wal, | |
| 2980 | − GEN8_ROW_CHICKEN, | |
| 2981 | − SYSTOLIC_DOP_CLOCK_GATING_DIS); | |
| 2982 | − | |
| 2983 | − /* Wa_1607196519 */ | |
| 2984 | − wa_mcr_masked_en(wal, | |
| 2985 | − GEN9_ROW_CHICKEN4, | |
| 2986 | − GEN12_DISABLE_GRF_CLEAR); | |
| 2987 | − | |
| 2988 | − /* Wa_14010449647:xehpsdv */ | |
| 2989 | − wa_mcr_masked_en(wal, GEN8_HALF_SLICE_CHICKEN1, | |
| 2990 | − GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE); | |
| 2991 | − } | |
| 2992 | 2817 | } |
| 2993 | 2818 | |
| 2994 | 2819 | static void |
| @@ -3069,7 +2894,7 @@ static bool mcr_range(struct drm_i915_private *i915, u32 offset) · 74 unmodified lines | ||
| 3069 | 2894 | const struct i915_range *mcr_ranges; |
| 3070 | 2895 | int i; |
| 3071 | 2896 | |
| 3072 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 2897 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 3073 | 2898 | mcr_ranges = mcr_ranges_xehp; |
| 3074 | 2899 | else if (GRAPHICS_VER(i915) >= 12) |
| 3075 | 2900 | mcr_ranges = mcr_ranges_gen12; |
| @@ -286,7 +286,7 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc) · 285 unmodified lines | ||
| 286 | 286 | |
| 287 | 287 | /* Wa_22012773006:gen11,gen12 < XeHP */ |
| 288 | 288 | if (GRAPHICS_VER(gt->i915) >= 11 && |
| 289 | − GRAPHICS_VER_FULL(gt->i915) < IP_VER(12, 50)) | |
| 289 | + GRAPHICS_VER_FULL(gt->i915) < IP_VER(12, 55)) | |
| 290 | 290 | flags |= GUC_WA_POLLCS; |
| 291 | 291 | |
| 292 | 292 | /* Wa_14014475959 */ |
| @@ -315,13 +315,9 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc) · 22 unmodified lines | ||
| 315 | 315 | if (IS_DG2_G11(gt->i915)) |
| 316 | 316 | flags |= GUC_WA_CONTEXT_ISOLATION; |
| 317 | 317 | |
| 318 | − /* Wa_16015675438 */ | |
| 319 | − if (!RCS_MASK(gt)) | |
| 320 | − flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST; | |
| 321 | − | |
| 322 | 318 | /* Wa_14018913170 */ |
| 323 | 319 | if (GUC_FIRMWARE_VER(guc) >= MAKE_GUC_VER(70, 7, 0)) { |
| 324 | − if (IS_DG2(gt->i915) || IS_METEORLAKE(gt->i915) || IS_PONTEVECCHIO(gt->i915)) | |
| 320 | + if (IS_DG2(gt->i915) || IS_METEORLAKE(gt->i915)) | |
| 325 | 321 | flags |= GUC_WA_ENABLE_TSC_CHECK_ON_RC6; |
| 326 | 322 | } |
| 327 | 323 | |
| @@ -393,7 +393,7 @@ static int guc_mmio_regset_init(struct temp_regset *regset, · 392 unmodified lines | ||
| 393 | 393 | |
| 394 | 394 | /* add in local MOCS registers */ |
| 395 | 395 | for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) |
| 396 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 396 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) | |
| 397 | 397 | ret |= GUC_MCR_REG_ADD(gt, regset, XEHP_LNCFCMOCS(i), false); |
| 398 | 398 | else |
| 399 | 399 | ret |= GUC_MMIO_REG_ADD(gt, regset, GEN9_LNCFCMOCS(i), false); |
| @@ -503,7 +503,7 @@ static void fill_engine_enable_masks(struct intel_gt *gt, · 103 unmodified lines | ||
| 503 | 503 | |
| 504 | 504 | #define LR_HW_CONTEXT_SIZE (80 * sizeof(u32)) |
| 505 | 505 | #define XEHP_LR_HW_CONTEXT_SIZE (96 * sizeof(u32)) |
| 506 | −#define LR_HW_CONTEXT_SZ(i915) (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50) ? \ | |
| 506 | +#define LR_HW_CONTEXT_SZ(i915) (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55) ? \ | |
| 507 | 507 | XEHP_LR_HW_CONTEXT_SIZE : \ |
| 508 | 508 | LR_HW_CONTEXT_SIZE) |
| 509 | 509 | #define LRC_SKIP_SIZE(i915) (LRC_PPHWSP_SZ * PAGE_SIZE + LR_HW_CONTEXT_SZ(i915)) |
| @@ -26,7 +26,7 @@ static void guc_prepare_xfer(struct intel_gt *gt) · 25 unmodified lines | ||
| 26 | 26 | GUC_ENABLE_READ_CACHE_FOR_WOPCM_DATA | |
| 27 | 27 | GUC_ENABLE_MIA_CLOCK_GATING; |
| 28 | 28 | |
| 29 | − if (GRAPHICS_VER_FULL(uncore->i915) < IP_VER(12, 50)) | |
| 29 | + if (GRAPHICS_VER_FULL(uncore->i915) < IP_VER(12, 55)) | |
| 30 | 30 | shim_flags |= GUC_DISABLE_SRAM_INIT_TO_ZEROES | |
| 31 | 31 | GUC_ENABLE_MIA_CACHING; |
| 32 | 32 | |
| @@ -4507,7 +4507,7 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine) · 4506 unmodified lines | ||
| 4507 | 4507 | */ |
| 4508 | 4508 | |
| 4509 | 4509 | engine->emit_bb_start = gen8_emit_bb_start; |
| 4510 | − if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) | |
| 4510 | + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55)) | |
| 4511 | 4511 | engine->emit_bb_start = xehp_emit_bb_start; |
| 4512 | 4512 | } |
| 4513 | 4513 | |
| @@ -50,10 +50,6 @@ static void uc_expand_default_options(struct intel_uc *uc) · 49 unmodified lines | ||
| 50 | 50 | |
| 51 | 51 | /* Default: enable HuC authentication and GuC submission */ |
| 52 | 52 | i915->params.enable_guc = ENABLE_GUC_LOAD_HUC | ENABLE_GUC_SUBMISSION; |
| 53 | − | |
| 54 | − /* XEHPSDV and PVC do not use HuC */ | |
| 55 | − if (IS_XEHPSDV(i915) || IS_PONTEVECCHIO(i915)) | |
| 56 | − i915->params.enable_guc &= ~ENABLE_GUC_LOAD_HUC; | |
| 57 | 53 | } |
| 58 | 54 | |
| 59 | 55 | /* Reset GuC providing us with fresh state for both GuC and HuC. |
| @@ -156,18 +156,6 @@ static const char *i915_cache_level_str(struct drm_i915_gem_object *obj) · 155 unmodified lines | ||
| 156 | 156 | case 4: return " WB (2-Way Coh)"; |
| 157 | 157 | default: return " not defined"; |
| 158 | 158 | } |
| 159 | − } else if (IS_PONTEVECCHIO(i915)) { | |
| 160 | − switch (obj->pat_index) { | |
| 161 | − case 0: return " UC"; | |
| 162 | − case 1: return " WC"; | |
| 163 | − case 2: return " WT"; | |
| 164 | − case 3: return " WB"; | |
| 165 | − case 4: return " WT (CLOS1)"; | |
| 166 | − case 5: return " WB (CLOS1)"; | |
| 167 | − case 6: return " WT (CLOS2)"; | |
| 168 | − case 7: return " WT (CLOS2)"; | |
| 169 | − default: return " not defined"; | |
| 170 | − } | |
| 171 | 159 | } else if (GRAPHICS_VER(i915) >= 12) { |
| 172 | 160 | switch (obj->pat_index) { |
| 173 | 161 | case 0: return " WB"; |
| @@ -235,25 +235,17 @@ struct drm_i915_private { · 234 unmodified lines | ||
| 235 | 235 | /* protects the irq masks */ |
| 236 | 236 | spinlock_t irq_lock; |
| 237 | 237 | |
| 238 | − bool display_irqs_enabled; | |
| 239 | − | |
| 240 | 238 | /* Sideband mailbox protection */ |
| 241 | 239 | struct mutex sb_lock; |
| 242 | 240 | struct pm_qos_request sb_qos; |
| 243 | 241 | |
| 244 | 242 | /** Cached value of IMR to avoid reads in updating the bitfield */ |
| 245 | − union { | |
| 246 | − u32 irq_mask; | |
| 247 | − u32 de_irq_mask[I915_MAX_PIPES]; | |
| 248 | − }; | |
| 249 | − u32 pipestat_irq_mask[I915_MAX_PIPES]; | |
| 243 | + u32 irq_mask; | |
| 250 | 244 | |
| 251 | 245 | bool preserve_bios_swizzle; |
| 252 | 246 | |
| 253 | 247 | unsigned int fsb_freq, mem_freq, is_ddr3; |
| 254 | − unsigned int skl_preferred_vco_freq; | |
| 255 | 248 | |
| 256 | − unsigned int max_dotclk_freq; | |
| 257 | 249 | unsigned int hpll_freq; |
| 258 | 250 | unsigned int czclk_freq; |
| 259 | 251 | |
| @@ -350,9 +342,6 @@ struct drm_i915_private { · 90 unmodified lines | ||
| 350 | 342 | |
| 351 | 343 | struct intel_pxp *pxp; |
| 352 | 344 | |
| 353 | − /* For i915gm/i945gm vblank irq workaround */ | |
| 354 | − u8 vblank_enabled; | |
| 355 | − | |
| 356 | 345 | bool irq_enabled; |
| 357 | 346 | |
| 358 | 347 | struct i915_pmu pmu; |
| @@ -544,9 +533,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, · 185 unmodified lines | ||
| 544 | 533 | #define IS_DG1(i915) IS_PLATFORM(i915, INTEL_DG1) |
| 545 | 534 | #define IS_ALDERLAKE_S(i915) IS_PLATFORM(i915, INTEL_ALDERLAKE_S) |
| 546 | 535 | #define IS_ALDERLAKE_P(i915) IS_PLATFORM(i915, INTEL_ALDERLAKE_P) |
| 547 | −#define IS_XEHPSDV(i915) IS_PLATFORM(i915, INTEL_XEHPSDV) | |
| 548 | 536 | #define IS_DG2(i915) IS_PLATFORM(i915, INTEL_DG2) |
| 549 | −#define IS_PONTEVECCHIO(i915) IS_PLATFORM(i915, INTEL_PONTEVECCHIO) | |
| 550 | 537 | #define IS_METEORLAKE(i915) IS_PLATFORM(i915, INTEL_METEORLAKE) |
| 551 | 538 | #define IS_LUNARLAKE(i915) 0 |
| 552 | 539 | |
| @@ -621,17 +608,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, · 68 unmodified lines | ||
| 621 | 608 | #define IS_TIGERLAKE_UY(i915) \ |
| 622 | 609 | IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY) |
| 623 | 610 | |
| 624 | −#define IS_XEHPSDV_GRAPHICS_STEP(__i915, since, until) \ | |
| 625 | − (IS_XEHPSDV(__i915) && IS_GRAPHICS_STEP(__i915, since, until)) | |
| 626 | − | |
| 627 | −#define IS_PVC_BD_STEP(__i915, since, until) \ | |
| 628 | − (IS_PONTEVECCHIO(__i915) && \ | |
| 629 | − IS_BASEDIE_STEP(__i915, since, until)) | |
| 630 | − | |
| 631 | −#define IS_PVC_CT_STEP(__i915, since, until) \ | |
| 632 | − (IS_PONTEVECCHIO(__i915) && \ | |
| 633 | − IS_GRAPHICS_STEP(__i915, since, until)) | |
| 634 | − | |
| 635 | 611 | #define IS_LP(i915) (INTEL_INFO(i915)->is_lp) |
| 636 | 612 | #define IS_GEN9_LP(i915) (GRAPHICS_VER(i915) == 9 && IS_LP(i915)) |
| 637 | 613 | #define IS_GEN9_BC(i915) (GRAPHICS_VER(i915) == 9 && !IS_LP(i915)) |
| @@ -160,7 +160,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, · 159 unmodified lines | ||
| 160 | 160 | break; |
| 161 | 161 | case I915_PARAM_SLICE_MASK: |
| 162 | 162 | /* Not supported from Xe_HP onward; use topology queries */ |
| 163 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 163 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 164 | 164 | return -EINVAL; |
| 165 | 165 | |
| 166 | 166 | value = sseu->slice_mask; |
| @@ -169,7 +169,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, · 2 unmodified lines | ||
| 169 | 169 | break; |
| 170 | 170 | case I915_PARAM_SUBSLICE_MASK: |
| 171 | 171 | /* Not supported from Xe_HP onward; use topology queries */ |
| 172 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 172 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 173 | 173 | return -EINVAL; |
| 174 | 174 | |
| 175 | 175 | /* Only copy bits from the first slice */ |
| @@ -1245,8 +1245,7 @@ static void engine_record_registers(struct intel_engine_coredump *ee) · 1244 unmodified lines | ||
| 1245 | 1245 | if (MEDIA_VER(i915) >= 13 && engine->gt->type == GT_MEDIA) |
| 1246 | 1246 | ee->fault_reg = intel_uncore_read(engine->uncore, |
| 1247 | 1247 | XELPMP_RING_FAULT_REG); |
| 1248 | − | |
| 1249 | − else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 1248 | + else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 1250 | 1249 | ee->fault_reg = intel_gt_mcr_read_any(engine->gt, |
| 1251 | 1250 | XEHP_RING_FAULT_REG); |
| 1252 | 1251 | else if (GRAPHICS_VER(i915) >= 12) |
| @@ -1852,7 +1851,7 @@ static void gt_record_global_regs(struct intel_gt_coredump *gt) · 599 unmodified lines | ||
| 1852 | 1851 | if (GRAPHICS_VER(i915) == 7) |
| 1853 | 1852 | gt->err_int = intel_uncore_read(uncore, GEN7_ERR_INT); |
| 1854 | 1853 | |
| 1855 | − if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) { | |
| 1854 | + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) { | |
| 1856 | 1855 | gt->fault_data0 = intel_gt_mcr_read_any((struct intel_gt *)gt->_gt, |
| 1857 | 1856 | XEHP_FAULT_TLB_DATA0); |
| 1858 | 1857 | gt->fault_data1 = intel_gt_mcr_read_any((struct intel_gt *)gt->_gt, |
| @@ -739,12 +739,6 @@ hwm_get_preregistration_info(struct drm_i915_private *i915) · 738 unmodified lines | ||
| 739 | 739 | hwmon->rg.pkg_rapl_limit = PCU_PACKAGE_RAPL_LIMIT; |
| 740 | 740 | hwmon->rg.energy_status_all = PCU_PACKAGE_ENERGY_STATUS; |
| 741 | 741 | hwmon->rg.energy_status_tile = INVALID_MMIO_REG; |
| 742 | − } else if (IS_XEHPSDV(i915)) { | |
| 743 | − hwmon->rg.pkg_power_sku_unit = GT0_PACKAGE_POWER_SKU_UNIT; | |
| 744 | − hwmon->rg.pkg_power_sku = INVALID_MMIO_REG; | |
| 745 | − hwmon->rg.pkg_rapl_limit = GT0_PACKAGE_RAPL_LIMIT; | |
| 746 | − hwmon->rg.energy_status_all = GT0_PLATFORM_ENERGY_STATUS; | |
| 747 | − hwmon->rg.energy_status_tile = GT0_PACKAGE_ENERGY_STATUS; | |
| 748 | 742 | } else { |
| 749 | 743 | hwmon->rg.pkg_power_sku_unit = INVALID_MMIO_REG; |
| 750 | 744 | hwmon->rg.pkg_power_sku = INVALID_MMIO_REG; |
| @@ -702,7 +702,7 @@ static void valleyview_irq_reset(struct drm_i915_private *dev_priv) · 701 unmodified lines | ||
| 702 | 702 | gen5_gt_irq_reset(to_gt(dev_priv)); |
| 703 | 703 | |
| 704 | 704 | spin_lock_irq(&dev_priv->irq_lock); |
| 705 | − if (dev_priv->display_irqs_enabled) | |
| 705 | + if (dev_priv->display.irq.display_irqs_enabled) | |
| 706 | 706 | vlv_display_irq_reset(dev_priv); |
| 707 | 707 | spin_unlock_irq(&dev_priv->irq_lock); |
| 708 | 708 | } |
| @@ -767,7 +767,7 @@ static void cherryview_irq_reset(struct drm_i915_private *dev_priv) · 58 unmodified lines | ||
| 767 | 767 | GEN3_IRQ_RESET(uncore, GEN8_PCU_); |
| 768 | 768 | |
| 769 | 769 | spin_lock_irq(&dev_priv->irq_lock); |
| 770 | − if (dev_priv->display_irqs_enabled) | |
| 770 | + if (dev_priv->display.irq.display_irqs_enabled) | |
| 771 | 771 | vlv_display_irq_reset(dev_priv); |
| 772 | 772 | spin_unlock_irq(&dev_priv->irq_lock); |
| 773 | 773 | } |
| @@ -784,7 +784,7 @@ static void valleyview_irq_postinstall(struct drm_i915_private *dev_priv) · 10 unmodified lines | ||
| 784 | 784 | gen5_gt_irq_postinstall(to_gt(dev_priv)); |
| 785 | 785 | |
| 786 | 786 | spin_lock_irq(&dev_priv->irq_lock); |
| 787 | − if (dev_priv->display_irqs_enabled) | |
| 787 | + if (dev_priv->display.irq.display_irqs_enabled) | |
| 788 | 788 | vlv_display_irq_postinstall(dev_priv); |
| 789 | 789 | spin_unlock_irq(&dev_priv->irq_lock); |
| 790 | 790 | |
| @@ -838,7 +838,7 @@ static void cherryview_irq_postinstall(struct drm_i915_private *dev_priv) · 47 unmodified lines | ||
| 838 | 838 | gen8_gt_irq_postinstall(to_gt(dev_priv)); |
| 839 | 839 | |
| 840 | 840 | spin_lock_irq(&dev_priv->irq_lock); |
| 841 | − if (dev_priv->display_irqs_enabled) | |
| 841 | + if (dev_priv->display.irq.display_irqs_enabled) | |
| 842 | 842 | vlv_display_irq_postinstall(dev_priv); |
| 843 | 843 | spin_unlock_irq(&dev_priv->irq_lock); |
| 844 | 844 | |
| @@ -38,6 +38,9 @@ · 37 unmodified lines | ||
| 38 | 38 | #include "i915_reg.h" |
| 39 | 39 | #include "intel_pci_config.h" |
| 40 | 40 | |
| 41 | +__diag_push(); | |
| 42 | +__diag_ignore_all("-Woverride-init", "Allow field initialization overrides for device info"); | |
| 43 | + | |
| 41 | 44 | #define PLATFORM(x) .platform = (x) |
| 42 | 45 | #define GEN(x) \ |
| 43 | 46 | .__runtime.graphics.ip.ver = (x), \ |
| @@ -59,14 +62,6 @@ · 15 unmodified lines | ||
| 59 | 62 | [I915_CACHE_WT] = 2, \ |
| 60 | 63 | } |
| 61 | 64 | |
| 62 | −#define PVC_CACHELEVEL \ | |
| 63 | − .cachelevel_to_pat = { \ | |
| 64 | − [I915_CACHE_NONE] = 0, \ | |
| 65 | − [I915_CACHE_LLC] = 3, \ | |
| 66 | − [I915_CACHE_L3_LLC] = 3, \ | |
| 67 | − [I915_CACHE_WT] = 2, \ | |
| 68 | − } | |
| 69 | − | |
| 70 | 65 | #define MTL_CACHELEVEL \ |
| 71 | 66 | .cachelevel_to_pat = { \ |
| 72 | 67 | [I915_CACHE_NONE] = 2, \ |
| @@ -705,8 +700,6 @@ static const struct intel_device_info adl_p_info = { · 632 unmodified lines | ||
| 705 | 700 | I915_GTT_PAGE_SIZE_2M |
| 706 | 701 | |
| 707 | 702 | #define XE_HP_FEATURES \ |
| 708 | − .__runtime.graphics.ip.ver = 12, \ | |
| 709 | − .__runtime.graphics.ip.rel = 50, \ | |
| 710 | 703 | XE_HP_PAGE_SIZES, \ |
| 711 | 704 | TGL_CACHELEVEL, \ |
| 712 | 705 | .dma_mask_size = 46, \ |
| @@ -730,32 +723,12 @@ static const struct intel_device_info adl_p_info = { · 17 unmodified lines | ||
| 730 | 723 | .__runtime.ppgtt_size = 48, \ |
| 731 | 724 | .__runtime.ppgtt_type = INTEL_PPGTT_FULL |
| 732 | 725 | |
| 733 | −#define XE_HPM_FEATURES \ | |
| 734 | − .__runtime.media.ip.ver = 12, \ | |
| 735 | − .__runtime.media.ip.rel = 50 | |
| 736 | − | |
| 737 | −__maybe_unused | |
| 738 | −static const struct intel_device_info xehpsdv_info = { | |
| 739 | − XE_HP_FEATURES, | |
| 740 | − XE_HPM_FEATURES, | |
| 741 | − DGFX_FEATURES, | |
| 742 | − PLATFORM(INTEL_XEHPSDV), | |
| 743 | − .has_64k_pages = 1, | |
| 744 | − .has_media_ratio_mode = 1, | |
| 745 | − .platform_engine_mask = | |
| 746 | − BIT(RCS0) | BIT(BCS0) | | |
| 747 | − BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) | | |
| 748 | − BIT(VCS0) | BIT(VCS1) | BIT(VCS2) | BIT(VCS3) | | |
| 749 | − BIT(VCS4) | BIT(VCS5) | BIT(VCS6) | BIT(VCS7) | | |
| 750 | − BIT(CCS0) | BIT(CCS1) | BIT(CCS2) | BIT(CCS3), | |
| 751 | − .require_force_probe = 1, | |
| 752 | −}; | |
| 753 | − | |
| 754 | 726 | #define DG2_FEATURES \ |
| 755 | 727 | XE_HP_FEATURES, \ |
| 756 | − XE_HPM_FEATURES, \ | |
| 757 | 728 | DGFX_FEATURES, \ |
| 729 | + .__runtime.graphics.ip.ver = 12, \ | |
| 758 | 730 | .__runtime.graphics.ip.rel = 55, \ |
| 731 | + .__runtime.media.ip.ver = 12, \ | |
| 759 | 732 | .__runtime.media.ip.rel = 55, \ |
| 760 | 733 | PLATFORM(INTEL_DG2), \ |
| 761 | 734 | .has_64k_pages = 1, \ |
| @@ -778,33 +751,6 @@ static const struct intel_device_info ats_m_info = { · 16 unmodified lines | ||
| 778 | 751 | .tuning_thread_rr_after_dep = 1, |
| 779 | 752 | }; |
| 780 | 753 | |
| 781 | −#define XE_HPC_FEATURES \ | |
| 782 | − XE_HP_FEATURES, \ | |
| 783 | − .dma_mask_size = 52, \ | |
| 784 | − .has_3d_pipeline = 0, \ | |
| 785 | − .has_guc_deprivilege = 1, \ | |
| 786 | − .has_l3_ccs_read = 1, \ | |
| 787 | − .has_mslice_steering = 0, \ | |
| 788 | − .has_one_eu_per_fuse_bit = 1 | |
| 789 | − | |
| 790 | −__maybe_unused | |
| 791 | −static const struct intel_device_info pvc_info = { | |
| 792 | − XE_HPC_FEATURES, | |
| 793 | − XE_HPM_FEATURES, | |
| 794 | − DGFX_FEATURES, | |
| 795 | − .__runtime.graphics.ip.rel = 60, | |
| 796 | − .__runtime.media.ip.rel = 60, | |
| 797 | − PLATFORM(INTEL_PONTEVECCHIO), | |
| 798 | − .has_flat_ccs = 0, | |
| 799 | − .max_pat_index = 7, | |
| 800 | − .platform_engine_mask = | |
| 801 | − BIT(BCS0) | | |
| 802 | − BIT(VCS0) | | |
| 803 | − BIT(CCS0) | BIT(CCS1) | BIT(CCS2) | BIT(CCS3), | |
| 804 | − .require_force_probe = 1, | |
| 805 | − PVC_CACHELEVEL, | |
| 806 | −}; | |
| 807 | − | |
| 808 | 754 | static const struct intel_gt_definition xelpmp_extra_gt[] = { |
| 809 | 755 | { |
| 810 | 756 | .type = GT_MEDIA, |
| @@ -842,6 +788,8 @@ static const struct intel_device_info mtl_info = { · 31 unmodified lines | ||
| 842 | 788 | |
| 843 | 789 | #undef PLATFORM |
| 844 | 790 | |
| 791 | +__diag_pop(); | |
| 792 | + | |
| 845 | 793 | /* |
| 846 | 794 | * Make sure any device matches here are from most specific to most |
| 847 | 795 | * general. For example, since the Quanta match is based on the subsystem |
| @@ -292,7 +292,7 @@ static u32 i915_perf_stream_paranoid = true; · 291 unmodified lines | ||
| 292 | 292 | #define OAREPORT_REASON_CTX_SWITCH (1<<3) |
| 293 | 293 | #define OAREPORT_REASON_CLK_RATIO (1<<5) |
| 294 | 294 | |
| 295 | −#define HAS_MI_SET_PREDICATE(i915) (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) | |
| 295 | +#define HAS_MI_SET_PREDICATE(i915) (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) | |
| 296 | 296 | |
| 297 | 297 | /* For sysctl proc_dointvec_minmax of i915_oa_max_sample_rate |
| 298 | 298 | * |
| @@ -817,7 +817,7 @@ static int gen8_append_oa_reports(struct i915_perf_stream *stream, · 518 unmodified lines | ||
| 817 | 817 | */ |
| 818 | 818 | |
| 819 | 819 | if (oa_report_ctx_invalid(stream, report) && |
| 820 | − GRAPHICS_VER_FULL(stream->engine->i915) < IP_VER(12, 50)) { | |
| 820 | + GRAPHICS_VER_FULL(stream->engine->i915) < IP_VER(12, 55)) { | |
| 821 | 821 | ctx_id = INVALID_CTX_ID; |
| 822 | 822 | oa_context_id_squash(stream, report32); |
| 823 | 823 | } |
| @@ -1419,7 +1419,7 @@ static int gen12_get_render_context_id(struct i915_perf_stream *stream) · 595 unmodified lines | ||
| 1419 | 1419 | |
| 1420 | 1420 | mask = ((1U << GEN12_GUC_SW_CTX_ID_WIDTH) - 1) << |
| 1421 | 1421 | (GEN12_GUC_SW_CTX_ID_SHIFT - 32); |
| 1422 | − } else if (GRAPHICS_VER_FULL(stream->engine->i915) >= IP_VER(12, 50)) { | |
| 1422 | + } else if (GRAPHICS_VER_FULL(stream->engine->i915) >= IP_VER(12, 55)) { | |
| 1423 | 1423 | ctx_id = (XEHP_MAX_CONTEXT_HW_ID - 1) << |
| 1424 | 1424 | (XEHP_SW_CTX_ID_SHIFT - 32); |
| 1425 | 1425 | |
| @@ -2881,11 +2881,11 @@ gen12_enable_metric_set(struct i915_perf_stream *stream, · 1455 unmodified lines | ||
| 2881 | 2881 | int ret; |
| 2882 | 2882 | |
| 2883 | 2883 | /* |
| 2884 | − * Wa_1508761755:xehpsdv, dg2 | |
| 2884 | + * Wa_1508761755 | |
| 2885 | 2885 | * EU NOA signals behave incorrectly if EU clock gating is enabled. |
| 2886 | 2886 | * Disable thread stall DOP gating and EU DOP gating. |
| 2887 | 2887 | */ |
| 2888 | − if (IS_XEHPSDV(i915) || IS_DG2(i915)) { | |
| 2888 | + if (IS_DG2(i915)) { | |
| 2889 | 2889 | intel_gt_mcr_multicast_write(uncore->gt, GEN8_ROW_CHICKEN, |
| 2890 | 2890 | _MASKED_BIT_ENABLE(STALL_DOP_GATING_DISABLE)); |
| 2891 | 2891 | intel_uncore_write(uncore, GEN7_ROW_CHICKEN2, |
| @@ -2911,7 +2911,7 @@ gen12_enable_metric_set(struct i915_perf_stream *stream, · 19 unmodified lines | ||
| 2911 | 2911 | /* |
| 2912 | 2912 | * Initialize Super Queue Internal Cnt Register |
| 2913 | 2913 | * Set PMON Enable in order to collect valid metrics. |
| 2914 | − * Enable byets per clock reporting in OA for XEHPSDV onward. | |
| 2914 | + * Enable bytes per clock reporting in OA. | |
| 2915 | 2915 | */ |
| 2916 | 2916 | sqcnt1 = GEN12_SQCNT1_PMON_ENABLE | |
| 2917 | 2917 | (HAS_OA_BPC_REPORTING(i915) ? GEN12_SQCNT1_OABPC : 0); |
| @@ -2971,10 +2971,9 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream) · 53 unmodified lines | ||
| 2971 | 2971 | u32 sqcnt1; |
| 2972 | 2972 | |
| 2973 | 2973 | /* |
| 2974 | − * Wa_1508761755:xehpsdv, dg2 | |
| 2975 | − * Enable thread stall DOP gating and EU DOP gating. | |
| 2974 | + * Wa_1508761755: Enable thread stall DOP gating and EU DOP gating. | |
| 2976 | 2975 | */ |
| 2977 | − if (IS_XEHPSDV(i915) || IS_DG2(i915)) { | |
| 2976 | + if (IS_DG2(i915)) { | |
| 2978 | 2977 | intel_gt_mcr_multicast_write(uncore->gt, GEN8_ROW_CHICKEN, |
| 2979 | 2978 | _MASKED_BIT_DISABLE(STALL_DOP_GATING_DISABLE)); |
| 2980 | 2979 | intel_uncore_write(uncore, GEN7_ROW_CHICKEN2, |
| @@ -4123,7 +4122,7 @@ static int read_properties_unlocked(struct i915_perf *perf, · 1142 unmodified lines | ||
| 4123 | 4122 | props->hold_preemption = !!value; |
| 4124 | 4123 | break; |
| 4125 | 4124 | case DRM_I915_PERF_PROP_GLOBAL_SSEU: { |
| 4126 | − if (GRAPHICS_VER_FULL(perf->i915) >= IP_VER(12, 50)) { | |
| 4125 | + if (GRAPHICS_VER_FULL(perf->i915) >= IP_VER(12, 55)) { | |
| 4127 | 4126 | drm_dbg(&perf->i915->drm, |
| 4128 | 4127 | "SSEU config not supported on gfx %x\n", |
| 4129 | 4128 | GRAPHICS_VER_FULL(perf->i915)); |
| @@ -105,7 +105,7 @@ static int query_geometry_subslices(struct drm_i915_private *i915, · 104 unmodified lines | ||
| 105 | 105 | struct intel_engine_cs *engine; |
| 106 | 106 | struct i915_engine_class_instance classinstance; |
| 107 | 107 | |
| 108 | − if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) | |
| 108 | + if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 55)) | |
| 109 | 109 | return -ENODEV; |
| 110 | 110 | |
| 111 | 111 | classinstance = *((struct i915_engine_class_instance *)&query_item->flags); |
| @@ -1750,8 +1750,6 @@ · 1749 unmodified lines | ||
| 1750 | 1750 | |
| 1751 | 1751 | #define BXT_RP_STATE_CAP _MMIO(0x138170) |
| 1752 | 1752 | #define GEN9_RP_STATE_LIMITS _MMIO(0x138148) |
| 1753 | −#define XEHPSDV_RP_STATE_CAP _MMIO(0x250014) | |
| 1754 | −#define PVC_RP_STATE_CAP _MMIO(0x281014) | |
| 1755 | 1753 | |
| 1756 | 1754 | #define MTL_RP_STATE_CAP _MMIO(0x138000) |
| 1757 | 1755 | #define MTL_MEDIAP_STATE_CAP _MMIO(0x138020) |
| @@ -2095,6 +2093,13 @@ · 337 unmodified lines | ||
| 2095 | 2093 | #define TRANS_PUSH_EN REG_BIT(31) |
| 2096 | 2094 | #define TRANS_PUSH_SEND REG_BIT(30) |
| 2097 | 2095 | |
| 2096 | +#define _TRANS_VRR_VSYNC_A 0x60078 | |
| 2097 | +#define TRANS_VRR_VSYNC(trans) _MMIO_TRANS2(trans, _TRANS_VRR_VSYNC_A) | |
| 2098 | +#define VRR_VSYNC_END_MASK REG_GENMASK(28, 16) | |
| 2099 | +#define VRR_VSYNC_END(vsync_end) REG_FIELD_PREP(VRR_VSYNC_END_MASK, (vsync_end)) | |
| 2100 | +#define VRR_VSYNC_START_MASK REG_GENMASK(12, 0) | |
| 2101 | +#define VRR_VSYNC_START(vsync_start) REG_FIELD_PREP(VRR_VSYNC_START_MASK, (vsync_start)) | |
| 2102 | + | |
| 2098 | 2103 | /* VGA port control */ |
| 2099 | 2104 | #define ADPA _MMIO(0x61100) |
| 2100 | 2105 | #define PCH_ADPA _MMIO(0xe1100) |
| @@ -2312,6 +2317,7 @@ · 211 unmodified lines | ||
| 2312 | 2317 | * (Haswell and newer) to see which VIDEO_DIP_DATA byte corresponds to each byte |
| 2313 | 2318 | * of the infoframe structure specified by CEA-861. */ |
| 2314 | 2319 | #define VIDEO_DIP_DATA_SIZE 32 |
| 2320 | +#define VIDEO_DIP_ASYNC_DATA_SIZE 36 | |
| 2315 | 2321 | #define VIDEO_DIP_GMP_DATA_SIZE 36 |
| 2316 | 2322 | #define VIDEO_DIP_VSC_DATA_SIZE 36 |
| 2317 | 2323 | #define VIDEO_DIP_PPS_DATA_SIZE 132 |
| @@ -2350,6 +2356,8 @@ · 32 unmodified lines | ||
| 2350 | 2356 | #define VIDEO_DIP_ENABLE_VS_HSW (1 << 8) |
| 2351 | 2357 | #define VIDEO_DIP_ENABLE_GMP_HSW (1 << 4) |
| 2352 | 2358 | #define VIDEO_DIP_ENABLE_SPD_HSW (1 << 0) |
| 2359 | +/* ADL and later: */ | |
| 2360 | +#define VIDEO_DIP_ENABLE_AS_ADL REG_BIT(23) | |
| 2353 | 2361 | |
| 2354 | 2362 | /* Panel fitting */ |
| 2355 | 2363 | #define PFIT_CONTROL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61230) |
| @@ -2588,6 +2596,9 @@ · 232 unmodified lines | ||
| 2588 | 2596 | #define TRANSCONF_DITHER_TYPE_ST1 REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 1) |
| 2589 | 2597 | #define TRANSCONF_DITHER_TYPE_ST2 REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 2) |
| 2590 | 2598 | #define TRANSCONF_DITHER_TYPE_TEMP REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 3) |
| 2599 | +#define TRANSCONF_PIXEL_COUNT_SCALING_MASK REG_GENMASK(1, 0) | |
| 2600 | +#define TRANSCONF_PIXEL_COUNT_SCALING_X4 1 | |
| 2601 | + | |
| 2591 | 2602 | #define _PIPEASTAT 0x70024 |
| 2592 | 2603 | #define PIPE_FIFO_UNDERRUN_STATUS (1UL << 31) |
| 2593 | 2604 | #define SPRITE1_FLIP_DONE_INT_EN_VLV (1UL << 30) |
| @@ -3053,6 +3064,7 @@ · 459 unmodified lines | ||
| 3053 | 3064 | #define MCURSOR_MODE_DISABLE 0x00 |
| 3054 | 3065 | #define MCURSOR_MODE_128_32B_AX 0x02 |
| 3055 | 3066 | #define MCURSOR_MODE_256_32B_AX 0x03 |
| 3067 | +#define MCURSOR_MODE_64_2B 0x04 | |
| 3056 | 3068 | #define MCURSOR_MODE_64_32B_AX 0x07 |
| 3057 | 3069 | #define MCURSOR_MODE_128_ARGB_AX (0x20 | MCURSOR_MODE_128_32B_AX) |
| 3058 | 3070 | #define MCURSOR_MODE_256_ARGB_AX (0x20 | MCURSOR_MODE_256_32B_AX) |
| @@ -4555,6 +4567,11 @@ · 1496 unmodified lines | ||
| 4555 | 4567 | #define GLK_CL1_PWR_DOWN REG_BIT(11) |
| 4556 | 4568 | #define GLK_CL0_PWR_DOWN REG_BIT(10) |
| 4557 | 4569 | |
| 4570 | +#define CHICKEN_MISC_3 _MMIO(0x42088) | |
| 4571 | +#define DP_MST_DPT_DPTP_ALIGN_WA(trans) REG_BIT(9 + (trans) - TRANSCODER_A) | |
| 4572 | +#define DP_MST_SHORT_HBLANK_WA(trans) REG_BIT(5 + (trans) - TRANSCODER_A) | |
| 4573 | +#define DP_MST_FEC_BS_JITTER_WA(trans) REG_BIT(0 + (trans) - TRANSCODER_A) | |
| 4574 | + | |
| 4558 | 4575 | #define CHICKEN_MISC_4 _MMIO(0x4208c) |
| 4559 | 4576 | #define CHICKEN_FBC_STRIDE_OVERRIDE REG_BIT(13) |
| 4560 | 4577 | #define CHICKEN_FBC_STRIDE_MASK REG_GENMASK(12, 0) |
| @@ -4611,7 +4628,9 @@ · 50 unmodified lines | ||
| 4611 | 4628 | #define DDIE_TRAINING_OVERRIDE_ENABLE REG_BIT(17) /* CHICKEN_TRANS_A only */ |
| 4612 | 4629 | #define DDIE_TRAINING_OVERRIDE_VALUE REG_BIT(16) /* CHICKEN_TRANS_A only */ |
| 4613 | 4630 | #define PSR2_ADD_VERTICAL_LINE_COUNT REG_BIT(15) |
| 4631 | +#define DP_FEC_BS_JITTER_WA REG_BIT(15) | |
| 4614 | 4632 | #define PSR2_VSC_ENABLE_PROG_HEADER REG_BIT(12) |
| 4633 | +#define DP_DSC_INSERT_SF_AT_EOL_WA REG_BIT(4) | |
| 4615 | 4634 | |
| 4616 | 4635 | #define DISP_ARB_CTL _MMIO(0x45000) |
| 4617 | 4636 | #define DISP_FBC_MEMORY_WAKE REG_BIT(31) |
| @@ -5040,6 +5059,7 @@ · 422 unmodified lines | ||
| 5040 | 5059 | #define _HSW_VIDEO_DIP_SPD_DATA_A 0x602A0 |
| 5041 | 5060 | #define _HSW_VIDEO_DIP_GMP_DATA_A 0x602E0 |
| 5042 | 5061 | #define _HSW_VIDEO_DIP_VSC_DATA_A 0x60320 |
| 5062 | +#define _ADL_VIDEO_DIP_AS_DATA_A 0x60484 | |
| 5043 | 5063 | #define _GLK_VIDEO_DIP_DRM_DATA_A 0x60440 |
| 5044 | 5064 | #define _HSW_VIDEO_DIP_AVI_ECC_A 0x60240 |
| 5045 | 5065 | #define _HSW_VIDEO_DIP_VS_ECC_A 0x60280 |
| @@ -5054,6 +5074,7 @@ · 8 unmodified lines | ||
| 5054 | 5074 | #define _HSW_VIDEO_DIP_SPD_DATA_B 0x612A0 |
| 5055 | 5075 | #define _HSW_VIDEO_DIP_GMP_DATA_B 0x612E0 |
| 5056 | 5076 | #define _HSW_VIDEO_DIP_VSC_DATA_B 0x61320 |
| 5077 | +#define _ADL_VIDEO_DIP_AS_DATA_B 0x61484 | |
| 5057 | 5078 | #define _GLK_VIDEO_DIP_DRM_DATA_B 0x61440 |
| 5058 | 5079 | #define _HSW_VIDEO_DIP_BVI_ECC_B 0x61240 |
| 5059 | 5080 | #define _HSW_VIDEO_DIP_VS_ECC_B 0x61280 |
| @@ -5083,6 +5104,9 @@ · 23 unmodified lines | ||
| 5083 | 5104 | #define GLK_TVIDEO_DIP_DRM_DATA(trans, i) _MMIO_TRANS2(trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4) |
| 5084 | 5105 | #define ICL_VIDEO_DIP_PPS_DATA(trans, i) _MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_DATA_A + (i) * 4) |
| 5085 | 5106 | #define ICL_VIDEO_DIP_PPS_ECC(trans, i) _MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_ECC_A + (i) * 4) |
| 5107 | +/*ADLP and later: */ | |
| 5108 | +#define ADL_TVIDEO_DIP_AS_SDP_DATA(trans, i) _MMIO_TRANS2(trans,\ | |
| 5109 | + _ADL_VIDEO_DIP_AS_DATA_A + (i) * 4) | |
| 5086 | 5110 | |
| 5087 | 5111 | #define _HSW_STEREO_3D_CTL_A 0x70020 |
| 5088 | 5112 | #define S3D_ENABLE (1 << 31) |
| @@ -5401,7 +5425,7 @@ · 312 unmodified lines | ||
| 5401 | 5425 | #define POWER_SETUP_I1_SHIFT 6 /* 10.6 fixed point format */ |
| 5402 | 5426 | #define POWER_SETUP_I1_DATA_MASK REG_GENMASK(15, 0) |
| 5403 | 5427 | #define GEN12_PCODE_READ_SAGV_BLOCK_TIME_US 0x23 |
| 5404 | −#define XEHP_PCODE_FREQUENCY_CONFIG 0x6e /* xehpsdv, pvc */ | |
| 5428 | +#define XEHP_PCODE_FREQUENCY_CONFIG 0x6e /* pvc */ | |
| 5405 | 5429 | /* XEHP_PCODE_FREQUENCY_CONFIG sub-commands (param1) */ |
| 5406 | 5430 | #define PCODE_MBOX_FC_SC_READ_FUSED_P0 0x0 |
| 5407 | 5431 | #define PCODE_MBOX_FC_SC_READ_FUSED_PN 0x1 |
| @@ -5566,15 +5590,6 @@ enum skl_power_gate { · 158 unmodified lines | ||
| 5566 | 5590 | ((pw_idx) - ICL_PW_CTL_IDX_PW_1 + SKL_PG1) |
| 5567 | 5591 | #define SKL_FUSE_PG_DIST_STATUS(pg) (1 << (27 - (pg))) |
| 5568 | 5592 | |
| 5569 | −#define _ICL_AUX_REG_IDX(pw_idx) ((pw_idx) - ICL_PW_CTL_IDX_AUX_A) | |
| 5570 | −#define _ICL_AUX_ANAOVRD1_A 0x162398 | |
| 5571 | −#define _ICL_AUX_ANAOVRD1_B 0x6C398 | |
| 5572 | −#define ICL_AUX_ANAOVRD1(pw_idx) _MMIO(_PICK(_ICL_AUX_REG_IDX(pw_idx), \ | |
| 5573 | − _ICL_AUX_ANAOVRD1_A, \ | |
| 5574 | − _ICL_AUX_ANAOVRD1_B)) | |
| 5575 | −#define ICL_AUX_ANAOVRD1_LDO_BYPASS (1 << 7) | |
| 5576 | −#define ICL_AUX_ANAOVRD1_ENABLE (1 << 0) | |
| 5577 | − | |
| 5578 | 5593 | /* Per-pipe DDI Function Control */ |
| 5579 | 5594 | #define _TRANS_DDI_FUNC_CTL_A 0x60400 |
| 5580 | 5595 | #define _TRANS_DDI_FUNC_CTL_B 0x61400 |
| @@ -5900,7 +5915,9 @@ enum skl_power_gate { · 319 unmodified lines | ||
| 5900 | 5915 | #define CDCLK_FREQ_540 REG_FIELD_PREP(CDCLK_FREQ_SEL_MASK, 1) |
| 5901 | 5916 | #define CDCLK_FREQ_337_308 REG_FIELD_PREP(CDCLK_FREQ_SEL_MASK, 2) |
| 5902 | 5917 | #define CDCLK_FREQ_675_617 REG_FIELD_PREP(CDCLK_FREQ_SEL_MASK, 3) |
| 5903 | −#define MDCLK_SOURCE_SEL_CDCLK_PLL REG_BIT(25) | |
| 5918 | +#define MDCLK_SOURCE_SEL_MASK REG_GENMASK(25, 25) | |
| 5919 | +#define MDCLK_SOURCE_SEL_CD2XCLK REG_FIELD_PREP(MDCLK_SOURCE_SEL_MASK, 0) | |
| 5920 | +#define MDCLK_SOURCE_SEL_CDCLK_PLL REG_FIELD_PREP(MDCLK_SOURCE_SEL_MASK, 1) | |
| 5904 | 5921 | #define BXT_CDCLK_CD2X_DIV_SEL_MASK REG_GENMASK(23, 22) |
| 5905 | 5922 | #define BXT_CDCLK_CD2X_DIV_SEL_1 REG_FIELD_PREP(BXT_CDCLK_CD2X_DIV_SEL_MASK, 0) |
| 5906 | 5923 | #define BXT_CDCLK_CD2X_DIV_SEL_1_5 REG_FIELD_PREP(BXT_CDCLK_CD2X_DIV_SEL_MASK, 1) |
| @@ -73,20 +73,6 @@ bool i915_error_injected(void); · 72 unmodified lines | ||
| 73 | 73 | __i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \ |
| 74 | 74 | fmt, ##__VA_ARGS__) |
| 75 | 75 | |
| 76 | −#if defined(GCC_VERSION) && GCC_VERSION >= 70000 | |
| 77 | −#define add_overflows_t(T, A, B) \ | |
| 78 | − __builtin_add_overflow_p((A), (B), (T)0) | |
| 79 | −#else | |
| 80 | −#define add_overflows_t(T, A, B) ({ \ | |
| 81 | − typeof(A) a = (A); \ | |
| 82 | − typeof(B) b = (B); \ | |
| 83 | − (T)(a + b) < a; \ | |
| 84 | −}) | |
| 85 | −#endif | |
| 86 | − | |
| 87 | −#define add_overflows(A, B) \ | |
| 88 | − add_overflows_t(typeof((A) + (B)), (A), (B)) | |
| 89 | − | |
| 90 | 76 | #define range_overflows(start, size, max) ({ \ |
| 91 | 77 | typeof(start) start__ = (start); \ |
| 92 | 78 | typeof(size) size__ = (size); \ |
| @@ -105,12 +105,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *i915) · 104 unmodified lines | ||
| 105 | 105 | * Display WA #0562: bxt |
| 106 | 106 | */ |
| 107 | 107 | intel_uncore_rmw(&i915->uncore, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); |
| 108 | − | |
| 109 | − /* | |
| 110 | − * WaFbcHighMemBwCorruptionAvoidance:bxt | |
| 111 | − * Display WA #0883: bxt | |
| 112 | − */ | |
| 113 | − intel_uncore_rmw(&i915->uncore, ILK_DPFC_CHICKEN(INTEL_FBC_A), 0, DPFC_DISABLE_DUMMY0); | |
| 114 | 108 | } |
| 115 | 109 | |
| 116 | 110 | static void glk_init_clock_gating(struct drm_i915_private *i915) |
| @@ -349,13 +343,6 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *i915, · 232 unmodified lines | ||
| 349 | 343 | intel_uncore_write(&i915->uncore, GEN7_MISCCPCTL, misccpctl); |
| 350 | 344 | } |
| 351 | 345 | |
| 352 | −static void xehpsdv_init_clock_gating(struct drm_i915_private *i915) | |
| 353 | −{ | |
| 354 | − /* Wa_22010146351:xehpsdv */ | |
| 355 | − if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A0, STEP_B0)) | |
| 356 | − intel_uncore_rmw(&i915->uncore, XEHP_CLOCK_GATE_DIS, 0, SGR_DIS); | |
| 357 | −} | |
| 358 | − | |
| 359 | 346 | static void dg2_init_clock_gating(struct drm_i915_private *i915) |
| 360 | 347 | { |
| 361 | 348 | /* Wa_22010954014:dg2 */ |
| @@ -363,17 +350,6 @@ static void dg2_init_clock_gating(struct drm_i915_private *i915) · 1 unmodified line | ||
| 363 | 350 | SGSI_SIDECLK_DIS); |
| 364 | 351 | } |
| 365 | 352 | |
| 366 | −static void pvc_init_clock_gating(struct drm_i915_private *i915) | |
| 367 | −{ | |
| 368 | − /* Wa_14012385139:pvc */ | |
| 369 | − if (IS_PVC_BD_STEP(i915, STEP_A0, STEP_B0)) | |
| 370 | − intel_uncore_rmw(&i915->uncore, XEHP_CLOCK_GATE_DIS, 0, SGR_DIS); | |
| 371 | − | |
| 372 | − /* Wa_22010954014:pvc */ | |
| 373 | − if (IS_PVC_BD_STEP(i915, STEP_A0, STEP_B0)) | |
| 374 | − intel_uncore_rmw(&i915->uncore, XEHP_CLOCK_GATE_DIS, 0, SGSI_SIDECLK_DIS); | |
| 375 | −} | |
| 376 | − | |
| 377 | 353 | static void cnp_init_clock_gating(struct drm_i915_private *i915) |
| 378 | 354 | { |
| 379 | 355 | if (!HAS_PCH_CNP(i915)) |
| @@ -396,13 +372,6 @@ static void cfl_init_clock_gating(struct drm_i915_private *i915) · 16 unmodified lines | ||
| 396 | 372 | * Display WA #0562: cfl |
| 397 | 373 | */ |
| 398 | 374 | intel_uncore_rmw(&i915->uncore, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); |
| 399 | − | |
| 400 | − /* | |
| 401 | − * WaFbcNukeOnHostModify:cfl | |
| 402 | − * Display WA #0873: cfl | |
| 403 | − */ | |
| 404 | − intel_uncore_rmw(&i915->uncore, ILK_DPFC_CHICKEN(INTEL_FBC_A), | |
| 405 | − 0, DPFC_NUKE_ON_ANY_MODIFICATION); | |
| 406 | 375 | } |
| 407 | 376 | |
| 408 | 377 | static void kbl_init_clock_gating(struct drm_i915_private *i915) |
| @@ -427,13 +396,6 @@ static void kbl_init_clock_gating(struct drm_i915_private *i915) · 18 unmodified lines | ||
| 427 | 396 | * Display WA #0562: kbl |
| 428 | 397 | */ |
| 429 | 398 | intel_uncore_rmw(&i915->uncore, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); |
| 430 | − | |
| 431 | − /* | |
| 432 | − * WaFbcNukeOnHostModify:kbl | |
| 433 | − * Display WA #0873: kbl | |
| 434 | − */ | |
| 435 | − intel_uncore_rmw(&i915->uncore, ILK_DPFC_CHICKEN(INTEL_FBC_A), | |
| 436 | − 0, DPFC_NUKE_ON_ANY_MODIFICATION); | |
| 437 | 399 | } |
| 438 | 400 | |
| 439 | 401 | static void skl_init_clock_gating(struct drm_i915_private *i915) |
| @@ -452,19 +414,6 @@ static void skl_init_clock_gating(struct drm_i915_private *i915) · 12 unmodified lines | ||
| 452 | 414 | * Display WA #0562: skl |
| 453 | 415 | */ |
| 454 | 416 | intel_uncore_rmw(&i915->uncore, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); |
| 455 | − | |
| 456 | − /* | |
| 457 | − * WaFbcNukeOnHostModify:skl | |
| 458 | − * Display WA #0873: skl | |
| 459 | − */ | |
| 460 | − intel_uncore_rmw(&i915->uncore, ILK_DPFC_CHICKEN(INTEL_FBC_A), | |
| 461 | − 0, DPFC_NUKE_ON_ANY_MODIFICATION); | |
| 462 | − | |
| 463 | − /* | |
| 464 | − * WaFbcHighMemBwCorruptionAvoidance:skl | |
| 465 | − * Display WA #0883: skl | |
| 466 | − */ | |
| 467 | − intel_uncore_rmw(&i915->uncore, ILK_DPFC_CHICKEN(INTEL_FBC_A), 0, DPFC_DISABLE_DUMMY0); | |
| 468 | 417 | } |
| 469 | 418 | |
| 470 | 419 | static void bdw_init_clock_gating(struct drm_i915_private *i915) |
| @@ -762,9 +711,7 @@ static const struct drm_i915_clock_gating_funcs platform##_clock_gating_funcs = · 291 unmodified lines | ||
| 762 | 711 | .init_clock_gating = platform##_init_clock_gating, \ |
| 763 | 712 | } |
| 764 | 713 | |
| 765 | −CG_FUNCS(pvc); | |
| 766 | 714 | CG_FUNCS(dg2); |
| 767 | −CG_FUNCS(xehpsdv); | |
| 768 | 715 | CG_FUNCS(cfl); |
| 769 | 716 | CG_FUNCS(skl); |
| 770 | 717 | CG_FUNCS(kbl); |
| @@ -797,12 +744,8 @@ CG_FUNCS(nop); · 26 unmodified lines | ||
| 797 | 744 | */ |
| 798 | 745 | void intel_clock_gating_hooks_init(struct drm_i915_private *i915) |
| 799 | 746 | { |
| 800 | − if (IS_PONTEVECCHIO(i915)) | |
| 801 | − i915->clock_gating_funcs = &pvc_clock_gating_funcs; | |
| 802 | − else if (IS_DG2(i915)) | |
| 747 | + if (IS_DG2(i915)) | |
| 803 | 748 | i915->clock_gating_funcs = &dg2_clock_gating_funcs; |
| 804 | − else if (IS_XEHPSDV(i915)) | |
| 805 | − i915->clock_gating_funcs = &xehpsdv_clock_gating_funcs; | |
| 806 | 749 | else if (IS_COFFEELAKE(i915) || IS_COMETLAKE(i915)) |
| 807 | 750 | i915->clock_gating_funcs = &cfl_clock_gating_funcs; |
| 808 | 751 | else if (IS_SKYLAKE(i915)) |
| @@ -70,9 +70,7 @@ static const char * const platform_names[] = { · 69 unmodified lines | ||
| 70 | 70 | PLATFORM_NAME(DG1), |
| 71 | 71 | PLATFORM_NAME(ALDERLAKE_S), |
| 72 | 72 | PLATFORM_NAME(ALDERLAKE_P), |
| 73 | − PLATFORM_NAME(XEHPSDV), | |
| 74 | 73 | PLATFORM_NAME(DG2), |
| 75 | − PLATFORM_NAME(PONTEVECCHIO), | |
| 76 | 74 | PLATFORM_NAME(METEORLAKE), |
| 77 | 75 | }; |
| 78 | 76 | #undef PLATFORM_NAME |
| @@ -87,9 +87,7 @@ enum intel_platform { · 86 unmodified lines | ||
| 87 | 87 | INTEL_DG1, |
| 88 | 88 | INTEL_ALDERLAKE_S, |
| 89 | 89 | INTEL_ALDERLAKE_P, |
| 90 | − INTEL_XEHPSDV, | |
| 91 | 90 | INTEL_DG2, |
| 92 | − INTEL_PONTEVECCHIO, | |
| 93 | 91 | INTEL_METEORLAKE, |
| 94 | 92 | INTEL_MAX_PLATFORMS |
| 95 | 93 | }; |
| @@ -102,13 +102,6 @@ static const struct intel_step_info adlp_revids[] = { · 101 unmodified lines | ||
| 102 | 102 | [0xC] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_D0 }, |
| 103 | 103 | }; |
| 104 | 104 | |
| 105 | −static const struct intel_step_info xehpsdv_revids[] = { | |
| 106 | − [0x0] = { COMMON_GT_MEDIA_STEP(A0) }, | |
| 107 | − [0x1] = { COMMON_GT_MEDIA_STEP(A1) }, | |
| 108 | − [0x4] = { COMMON_GT_MEDIA_STEP(B0) }, | |
| 109 | − [0x8] = { COMMON_GT_MEDIA_STEP(C0) }, | |
| 110 | −}; | |
| 111 | − | |
| 112 | 105 | static const struct intel_step_info dg2_g10_revid_step_tbl[] = { |
| 113 | 106 | [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_A0 }, |
| 114 | 107 | [0x1] = { COMMON_GT_MEDIA_STEP(A1), .display_step = STEP_A0 }, |
| @@ -153,8 +146,6 @@ static u8 gmd_to_intel_step(struct drm_i915_private *i915, · 38 unmodified lines | ||
| 153 | 146 | return step; |
| 154 | 147 | } |
| 155 | 148 | |
| 156 | −static void pvc_step_init(struct drm_i915_private *i915, int pci_revid); | |
| 157 | − | |
| 158 | 149 | void intel_step_init(struct drm_i915_private *i915) |
| 159 | 150 | { |
| 160 | 151 | const struct intel_step_info *revids = NULL; |
| @@ -178,10 +169,7 @@ void intel_step_init(struct drm_i915_private *i915) · 17 unmodified lines | ||
| 178 | 169 | return; |
| 179 | 170 | } |
| 180 | 171 | |
| 181 | − if (IS_PONTEVECCHIO(i915)) { | |
| 182 | − pvc_step_init(i915, revid); | |
| 183 | − return; | |
| 184 | − } else if (IS_DG2_G10(i915)) { | |
| 172 | + if (IS_DG2_G10(i915)) { | |
| 185 | 173 | revids = dg2_g10_revid_step_tbl; |
| 186 | 174 | size = ARRAY_SIZE(dg2_g10_revid_step_tbl); |
| 187 | 175 | } else if (IS_DG2_G11(i915)) { |
| @@ -190,9 +178,6 @@ void intel_step_init(struct drm_i915_private *i915) · 2 unmodified lines | ||
| 190 | 178 | } else if (IS_DG2_G12(i915)) { |
| 191 | 179 | revids = dg2_g12_revid_step_tbl; |
| 192 | 180 | size = ARRAY_SIZE(dg2_g12_revid_step_tbl); |
| 193 | − } else if (IS_XEHPSDV(i915)) { | |
| 194 | − revids = xehpsdv_revids; | |
| 195 | − size = ARRAY_SIZE(xehpsdv_revids); | |
| 196 | 181 | } else if (IS_ALDERLAKE_P_N(i915)) { |
| 197 | 182 | revids = adlp_n_revids; |
| 198 | 183 | size = ARRAY_SIZE(adlp_n_revids); |
| @@ -277,69 +262,6 @@ void intel_step_init(struct drm_i915_private *i915) · 78 unmodified lines | ||
| 277 | 262 | RUNTIME_INFO(i915)->step = step; |
| 278 | 263 | } |
| 279 | 264 | |
| 280 | −#define PVC_BD_REVID GENMASK(5, 3) | |
| 281 | −#define PVC_CT_REVID GENMASK(2, 0) | |
| 282 | − | |
| 283 | −static const int pvc_bd_subids[] = { | |
| 284 | − [0x0] = STEP_A0, | |
| 285 | − [0x3] = STEP_B0, | |
| 286 | − [0x4] = STEP_B1, | |
| 287 | − [0x5] = STEP_B3, | |
| 288 | −}; | |
| 289 | − | |
| 290 | −static const int pvc_ct_subids[] = { | |
| 291 | − [0x3] = STEP_A0, | |
| 292 | − [0x5] = STEP_B0, | |
| 293 | − [0x6] = STEP_B1, | |
| 294 | − [0x7] = STEP_C0, | |
| 295 | −}; | |
| 296 | − | |
| 297 | −static int | |
| 298 | −pvc_step_lookup(struct drm_i915_private *i915, const char *type, | |
| 299 | − const int *table, int size, int subid) | |
| 300 | −{ | |
| 301 | − if (subid < size && table[subid] != STEP_NONE) | |
| 302 | − return table[subid]; | |
| 303 | − | |
| 304 | − drm_warn(&i915->drm, "Unknown %s id 0x%02x\n", type, subid); | |
| 305 | − | |
| 306 | − /* | |
| 307 | − * As on other platforms, try to use the next higher ID if we land on a | |
| 308 | − * gap in the table. | |
| 309 | − */ | |
| 310 | − while (subid < size && table[subid] == STEP_NONE) | |
| 311 | − subid++; | |
| 312 | − | |
| 313 | − if (subid < size) { | |
| 314 | − drm_dbg(&i915->drm, "Using steppings for %s id 0x%02x\n", | |
| 315 | − type, subid); | |
| 316 | − return table[subid]; | |
| 317 | − } | |
| 318 | − | |
| 319 | − drm_dbg(&i915->drm, "Using future steppings\n"); | |
| 320 | − return STEP_FUTURE; | |
| 321 | −} | |
| 322 | − | |
| 323 | −/* | |
| 324 | − * PVC needs special handling since we don't lookup the | |
| 325 | − * revid in a table, but rather specific bitfields within | |
| 326 | − * the revid for various components. | |
| 327 | − */ | |
| 328 | −static void pvc_step_init(struct drm_i915_private *i915, int pci_revid) | |
| 329 | −{ | |
| 330 | − int ct_subid, bd_subid; | |
| 331 | − | |
| 332 | − bd_subid = FIELD_GET(PVC_BD_REVID, pci_revid); | |
| 333 | − ct_subid = FIELD_GET(PVC_CT_REVID, pci_revid); | |
| 334 | − | |
| 335 | − RUNTIME_INFO(i915)->step.basedie_step = | |
| 336 | − pvc_step_lookup(i915, "Base Die", pvc_bd_subids, | |
| 337 | − ARRAY_SIZE(pvc_bd_subids), bd_subid); | |
| 338 | − RUNTIME_INFO(i915)->step.graphics_step = | |
| 339 | − pvc_step_lookup(i915, "Compute Tile", pvc_ct_subids, | |
| 340 | − ARRAY_SIZE(pvc_ct_subids), ct_subid); | |
| 341 | −} | |
| 342 | − | |
| 343 | 265 | #define STEP_NAME_CASE(name) \ |
| 344 | 266 | case STEP_##name: \ |
| 345 | 267 | return #name; |
| @@ -1106,45 +1106,6 @@ static const struct i915_range dg2_shadowed_regs[] = { · 1105 unmodified lines | ||
| 1106 | 1106 | { .start = 0x1F8510, .end = 0x1F8550 }, |
| 1107 | 1107 | }; |
| 1108 | 1108 | |
| 1109 | −static const struct i915_range pvc_shadowed_regs[] = { | |
| 1110 | − { .start = 0x2030, .end = 0x2030 }, | |
| 1111 | − { .start = 0x2510, .end = 0x2550 }, | |
| 1112 | − { .start = 0xA008, .end = 0xA00C }, | |
| 1113 | − { .start = 0xA188, .end = 0xA188 }, | |
| 1114 | − { .start = 0xA278, .end = 0xA278 }, | |
| 1115 | − { .start = 0xA540, .end = 0xA56C }, | |
| 1116 | − { .start = 0xC4C8, .end = 0xC4C8 }, | |
| 1117 | − { .start = 0xC4E0, .end = 0xC4E0 }, | |
| 1118 | − { .start = 0xC600, .end = 0xC600 }, | |
| 1119 | − { .start = 0xC658, .end = 0xC658 }, | |
| 1120 | − { .start = 0x22030, .end = 0x22030 }, | |
| 1121 | − { .start = 0x22510, .end = 0x22550 }, | |
| 1122 | − { .start = 0x1C0030, .end = 0x1C0030 }, | |
| 1123 | − { .start = 0x1C0510, .end = 0x1C0550 }, | |
| 1124 | − { .start = 0x1C4030, .end = 0x1C4030 }, | |
| 1125 | − { .start = 0x1C4510, .end = 0x1C4550 }, | |
| 1126 | − { .start = 0x1C8030, .end = 0x1C8030 }, | |
| 1127 | − { .start = 0x1C8510, .end = 0x1C8550 }, | |
| 1128 | − { .start = 0x1D0030, .end = 0x1D0030 }, | |
| 1129 | − { .start = 0x1D0510, .end = 0x1D0550 }, | |
| 1130 | − { .start = 0x1D4030, .end = 0x1D4030 }, | |
| 1131 | − { .start = 0x1D4510, .end = 0x1D4550 }, | |
| 1132 | − { .start = 0x1D8030, .end = 0x1D8030 }, | |
| 1133 | − { .start = 0x1D8510, .end = 0x1D8550 }, | |
| 1134 | − { .start = 0x1E0030, .end = 0x1E0030 }, | |
| 1135 | − { .start = 0x1E0510, .end = 0x1E0550 }, | |
| 1136 | − { .start = 0x1E4030, .end = 0x1E4030 }, | |
| 1137 | − { .start = 0x1E4510, .end = 0x1E4550 }, | |
| 1138 | − { .start = 0x1E8030, .end = 0x1E8030 }, | |
| 1139 | − { .start = 0x1E8510, .end = 0x1E8550 }, | |
| 1140 | − { .start = 0x1F0030, .end = 0x1F0030 }, | |
| 1141 | − { .start = 0x1F0510, .end = 0x1F0550 }, | |
| 1142 | − { .start = 0x1F4030, .end = 0x1F4030 }, | |
| 1143 | − { .start = 0x1F4510, .end = 0x1F4550 }, | |
| 1144 | − { .start = 0x1F8030, .end = 0x1F8030 }, | |
| 1145 | − { .start = 0x1F8510, .end = 0x1F8550 }, | |
| 1146 | −}; | |
| 1147 | − | |
| 1148 | 1109 | static const struct i915_range mtl_shadowed_regs[] = { |
| 1149 | 1110 | { .start = 0x2030, .end = 0x2030 }, |
| 1150 | 1111 | { .start = 0x2510, .end = 0x2550 }, |
| @@ -1471,195 +1432,31 @@ static const struct intel_forcewake_range __gen12_fw_ranges[] = { · 320 unmodified lines | ||
| 1471 | 1432 | 0x1d3f00 - 0x1d3fff: VD2 */ |
| 1472 | 1433 | }; |
| 1473 | 1434 | |
| 1474 | −/* | |
| 1475 | − * Graphics IP version 12.55 brings a slight change to the 0xd800 range, | |
| 1476 | − * switching it from the GT domain to the render domain. | |
| 1477 | − */ | |
| 1478 | −#define XEHP_FWRANGES(FW_RANGE_D800) \ | |
| 1479 | − GEN_FW_RANGE(0x0, 0x1fff, 0), /* \ | |
| 1480 | − 0x0 - 0xaff: reserved \ | |
| 1481 | − 0xb00 - 0x1fff: always on */ \ | |
| 1482 | − GEN_FW_RANGE(0x2000, 0x26ff, FORCEWAKE_RENDER), \ | |
| 1483 | − GEN_FW_RANGE(0x2700, 0x4aff, FORCEWAKE_GT), \ | |
| 1484 | − GEN_FW_RANGE(0x4b00, 0x51ff, 0), /* \ | |
| 1485 | − 0x4b00 - 0x4fff: reserved \ | |
| 1486 | − 0x5000 - 0x51ff: always on */ \ | |
| 1487 | − GEN_FW_RANGE(0x5200, 0x7fff, FORCEWAKE_RENDER), \ | |
| 1488 | − GEN_FW_RANGE(0x8000, 0x813f, FORCEWAKE_GT), \ | |
| 1489 | − GEN_FW_RANGE(0x8140, 0x815f, FORCEWAKE_RENDER), \ | |
| 1490 | − GEN_FW_RANGE(0x8160, 0x81ff, 0), /* \ | |
| 1491 | − 0x8160 - 0x817f: reserved \ | |
| 1492 | − 0x8180 - 0x81ff: always on */ \ | |
| 1493 | − GEN_FW_RANGE(0x8200, 0x82ff, FORCEWAKE_GT), \ | |
| 1494 | − GEN_FW_RANGE(0x8300, 0x84ff, FORCEWAKE_RENDER), \ | |
| 1495 | − GEN_FW_RANGE(0x8500, 0x8cff, FORCEWAKE_GT), /* \ | |
| 1496 | − 0x8500 - 0x87ff: gt \ | |
| 1497 | − 0x8800 - 0x8c7f: reserved \ | |
| 1498 | − 0x8c80 - 0x8cff: gt (DG2 only) */ \ | |
| 1499 | − GEN_FW_RANGE(0x8d00, 0x8fff, FORCEWAKE_RENDER), /* \ | |
| 1500 | − 0x8d00 - 0x8dff: render (DG2 only) \ | |
| 1501 | − 0x8e00 - 0x8fff: reserved */ \ | |
| 1502 | − GEN_FW_RANGE(0x9000, 0x94cf, FORCEWAKE_GT), /* \ | |
| 1503 | − 0x9000 - 0x947f: gt \ | |
| 1504 | − 0x9480 - 0x94cf: reserved */ \ | |
| 1505 | − GEN_FW_RANGE(0x94d0, 0x955f, FORCEWAKE_RENDER), \ | |
| 1506 | − GEN_FW_RANGE(0x9560, 0x967f, 0), /* \ | |
| 1507 | − 0x9560 - 0x95ff: always on \ | |
| 1508 | − 0x9600 - 0x967f: reserved */ \ | |
| 1509 | − GEN_FW_RANGE(0x9680, 0x97ff, FORCEWAKE_RENDER), /* \ | |
| 1510 | − 0x9680 - 0x96ff: render (DG2 only) \ | |
| 1511 | − 0x9700 - 0x97ff: reserved */ \ | |
| 1512 | − GEN_FW_RANGE(0x9800, 0xcfff, FORCEWAKE_GT), /* \ | |
| 1513 | − 0x9800 - 0xb4ff: gt \ | |
| 1514 | − 0xb500 - 0xbfff: reserved \ | |
| 1515 | − 0xc000 - 0xcfff: gt */ \ | |
| 1516 | − GEN_FW_RANGE(0xd000, 0xd7ff, 0), \ | |
| 1517 | − GEN_FW_RANGE(0xd800, 0xd87f, FW_RANGE_D800), \ | |
| 1518 | − GEN_FW_RANGE(0xd880, 0xdbff, FORCEWAKE_GT), \ | |
| 1519 | − GEN_FW_RANGE(0xdc00, 0xdcff, FORCEWAKE_RENDER), \ | |
| 1520 | − GEN_FW_RANGE(0xdd00, 0xde7f, FORCEWAKE_GT), /* \ | |
| 1521 | − 0xdd00 - 0xddff: gt \ | |
| 1522 | − 0xde00 - 0xde7f: reserved */ \ | |
| 1523 | − GEN_FW_RANGE(0xde80, 0xe8ff, FORCEWAKE_RENDER), /* \ | |
| 1524 | − 0xde80 - 0xdfff: render \ | |
| 1525 | − 0xe000 - 0xe0ff: reserved \ | |
| 1526 | − 0xe100 - 0xe8ff: render */ \ | |
| 1527 | − GEN_FW_RANGE(0xe900, 0xffff, FORCEWAKE_GT), /* \ | |
| 1528 | − 0xe900 - 0xe9ff: gt \ | |
| 1529 | − 0xea00 - 0xefff: reserved \ | |
| 1530 | − 0xf000 - 0xffff: gt */ \ | |
| 1531 | − GEN_FW_RANGE(0x10000, 0x12fff, 0), /* \ | |
| 1532 | − 0x10000 - 0x11fff: reserved \ | |
| 1533 | − 0x12000 - 0x127ff: always on \ | |
| 1534 | − 0x12800 - 0x12fff: reserved */ \ | |
| 1535 | − GEN_FW_RANGE(0x13000, 0x131ff, FORCEWAKE_MEDIA_VDBOX0), /* DG2 only */ \ | |
| 1536 | − GEN_FW_RANGE(0x13200, 0x13fff, FORCEWAKE_MEDIA_VDBOX2), /* \ | |
| 1537 | − 0x13200 - 0x133ff: VD2 (DG2 only) \ | |
| 1538 | − 0x13400 - 0x13fff: reserved */ \ | |
| 1539 | − GEN_FW_RANGE(0x14000, 0x141ff, FORCEWAKE_MEDIA_VDBOX0), /* XEHPSDV only */ \ | |
| 1540 | − GEN_FW_RANGE(0x14200, 0x143ff, FORCEWAKE_MEDIA_VDBOX2), /* XEHPSDV only */ \ | |
| 1541 | − GEN_FW_RANGE(0x14400, 0x145ff, FORCEWAKE_MEDIA_VDBOX4), /* XEHPSDV only */ \ | |
| 1542 | − GEN_FW_RANGE(0x14600, 0x147ff, FORCEWAKE_MEDIA_VDBOX6), /* XEHPSDV only */ \ | |
| 1543 | − GEN_FW_RANGE(0x14800, 0x14fff, FORCEWAKE_RENDER), \ | |
| 1544 | − GEN_FW_RANGE(0x15000, 0x16dff, FORCEWAKE_GT), /* \ | |
| 1545 | − 0x15000 - 0x15fff: gt (DG2 only) \ | |
| 1546 | − 0x16000 - 0x16dff: reserved */ \ | |
| 1547 | − GEN_FW_RANGE(0x16e00, 0x1ffff, FORCEWAKE_RENDER), \ | |
| 1548 | − GEN_FW_RANGE(0x20000, 0x21fff, FORCEWAKE_MEDIA_VDBOX0), /* \ | |
| 1549 | − 0x20000 - 0x20fff: VD0 (XEHPSDV only) \ | |
| 1550 | − 0x21000 - 0x21fff: reserved */ \ | |
| 1551 | − GEN_FW_RANGE(0x22000, 0x23fff, FORCEWAKE_GT), \ | |
| 1552 | − GEN_FW_RANGE(0x24000, 0x2417f, 0), /* \ | |
| 1553 | − 0x24000 - 0x2407f: always on \ | |
| 1554 | − 0x24080 - 0x2417f: reserved */ \ | |
| 1555 | − GEN_FW_RANGE(0x24180, 0x249ff, FORCEWAKE_GT), /* \ | |
| 1556 | − 0x24180 - 0x241ff: gt \ | |
| 1557 | − 0x24200 - 0x249ff: reserved */ \ | |
| 1558 | − GEN_FW_RANGE(0x24a00, 0x251ff, FORCEWAKE_RENDER), /* \ | |
| 1559 | − 0x24a00 - 0x24a7f: render \ | |
| 1560 | − 0x24a80 - 0x251ff: reserved */ \ | |
| 1561 | − GEN_FW_RANGE(0x25200, 0x25fff, FORCEWAKE_GT), /* \ | |
| 1562 | − 0x25200 - 0x252ff: gt \ | |
| 1563 | − 0x25300 - 0x25fff: reserved */ \ | |
| 1564 | − GEN_FW_RANGE(0x26000, 0x2ffff, FORCEWAKE_RENDER), /* \ | |
| 1565 | − 0x26000 - 0x27fff: render \ | |
| 1566 | − 0x28000 - 0x29fff: reserved \ | |
| 1567 | − 0x2a000 - 0x2ffff: undocumented */ \ | |
| 1568 | − GEN_FW_RANGE(0x30000, 0x3ffff, FORCEWAKE_GT), \ | |
| 1569 | − GEN_FW_RANGE(0x40000, 0x1bffff, 0), \ | |
| 1570 | − GEN_FW_RANGE(0x1c0000, 0x1c3fff, FORCEWAKE_MEDIA_VDBOX0), /* \ | |
| 1571 | − 0x1c0000 - 0x1c2bff: VD0 \ | |
| 1572 | − 0x1c2c00 - 0x1c2cff: reserved \ | |
| 1573 | − 0x1c2d00 - 0x1c2dff: VD0 \ | |
| 1574 | − 0x1c2e00 - 0x1c3eff: VD0 (DG2 only) \ | |
| 1575 | − 0x1c3f00 - 0x1c3fff: VD0 */ \ | |
| 1576 | − GEN_FW_RANGE(0x1c4000, 0x1c7fff, FORCEWAKE_MEDIA_VDBOX1), /* \ | |
| 1577 | − 0x1c4000 - 0x1c6bff: VD1 \ | |
| 1578 | − 0x1c6c00 - 0x1c6cff: reserved \ | |
| 1579 | − 0x1c6d00 - 0x1c6dff: VD1 \ | |
| 1580 | − 0x1c6e00 - 0x1c7fff: reserved */ \ | |
| 1581 | − GEN_FW_RANGE(0x1c8000, 0x1cbfff, FORCEWAKE_MEDIA_VEBOX0), /* \ | |
| 1582 | − 0x1c8000 - 0x1ca0ff: VE0 \ | |
| 1583 | − 0x1ca100 - 0x1cbfff: reserved */ \ | |
| 1584 | − GEN_FW_RANGE(0x1cc000, 0x1ccfff, FORCEWAKE_MEDIA_VDBOX0), \ | |
| 1585 | − GEN_FW_RANGE(0x1cd000, 0x1cdfff, FORCEWAKE_MEDIA_VDBOX2), \ | |
| 1586 | − GEN_FW_RANGE(0x1ce000, 0x1cefff, FORCEWAKE_MEDIA_VDBOX4), \ | |
| 1587 | − GEN_FW_RANGE(0x1cf000, 0x1cffff, FORCEWAKE_MEDIA_VDBOX6), \ | |
| 1588 | − GEN_FW_RANGE(0x1d0000, 0x1d3fff, FORCEWAKE_MEDIA_VDBOX2), /* \ | |
| 1589 | − 0x1d0000 - 0x1d2bff: VD2 \ | |
| 1590 | − 0x1d2c00 - 0x1d2cff: reserved \ | |
| 1591 | − 0x1d2d00 - 0x1d2dff: VD2 \ | |
| 1592 | − 0x1d2e00 - 0x1d3dff: VD2 (DG2 only) \ | |
| 1593 | − 0x1d3e00 - 0x1d3eff: reserved \ | |
| 1594 | − 0x1d3f00 - 0x1d3fff: VD2 */ \ | |
| 1595 | − GEN_FW_RANGE(0x1d4000, 0x1d7fff, FORCEWAKE_MEDIA_VDBOX3), /* \ | |
| 1596 | − 0x1d4000 - 0x1d6bff: VD3 \ | |
| 1597 | − 0x1d6c00 - 0x1d6cff: reserved \ | |
| 1598 | − 0x1d6d00 - 0x1d6dff: VD3 \ | |
| 1599 | − 0x1d6e00 - 0x1d7fff: reserved */ \ | |
| 1600 | − GEN_FW_RANGE(0x1d8000, 0x1dffff, FORCEWAKE_MEDIA_VEBOX1), /* \ | |
| 1601 | − 0x1d8000 - 0x1da0ff: VE1 \ | |
| 1602 | − 0x1da100 - 0x1dffff: reserved */ \ | |
| 1603 | − GEN_FW_RANGE(0x1e0000, 0x1e3fff, FORCEWAKE_MEDIA_VDBOX4), /* \ | |
| 1604 | − 0x1e0000 - 0x1e2bff: VD4 \ | |
| 1605 | − 0x1e2c00 - 0x1e2cff: reserved \ | |
| 1606 | − 0x1e2d00 - 0x1e2dff: VD4 \ | |
| 1607 | − 0x1e2e00 - 0x1e3eff: reserved \ | |
| 1608 | − 0x1e3f00 - 0x1e3fff: VD4 */ \ | |
| 1609 | − GEN_FW_RANGE(0x1e4000, 0x1e7fff, FORCEWAKE_MEDIA_VDBOX5), /* \ | |
| 1610 | − 0x1e4000 - 0x1e6bff: VD5 \ | |
| 1611 | − 0x1e6c00 - 0x1e6cff: reserved \ | |
| 1612 | − 0x1e6d00 - 0x1e6dff: VD5 \ | |
| 1613 | − 0x1e6e00 - 0x1e7fff: reserved */ \ | |
| 1614 | − GEN_FW_RANGE(0x1e8000, 0x1effff, FORCEWAKE_MEDIA_VEBOX2), /* \ | |
| 1615 | − 0x1e8000 - 0x1ea0ff: VE2 \ | |
| 1616 | − 0x1ea100 - 0x1effff: reserved */ \ | |
| 1617 | − GEN_FW_RANGE(0x1f0000, 0x1f3fff, FORCEWAKE_MEDIA_VDBOX6), /* \ | |
| 1618 | − 0x1f0000 - 0x1f2bff: VD6 \ | |
| 1619 | − 0x1f2c00 - 0x1f2cff: reserved \ | |
| 1620 | − 0x1f2d00 - 0x1f2dff: VD6 \ | |
| 1621 | − 0x1f2e00 - 0x1f3eff: reserved \ | |
| 1622 | − 0x1f3f00 - 0x1f3fff: VD6 */ \ | |
| 1623 | − GEN_FW_RANGE(0x1f4000, 0x1f7fff, FORCEWAKE_MEDIA_VDBOX7), /* \ | |
| 1624 | − 0x1f4000 - 0x1f6bff: VD7 \ | |
| 1625 | − 0x1f6c00 - 0x1f6cff: reserved \ | |
| 1626 | − 0x1f6d00 - 0x1f6dff: VD7 \ | |
| 1627 | − 0x1f6e00 - 0x1f7fff: reserved */ \ | |
| 1628 | − GEN_FW_RANGE(0x1f8000, 0x1fa0ff, FORCEWAKE_MEDIA_VEBOX3), | |
| 1629 | − | |
| 1630 | −static const struct intel_forcewake_range __xehp_fw_ranges[] = { | |
| 1631 | − XEHP_FWRANGES(FORCEWAKE_GT) | |
| 1632 | −}; | |
| 1633 | − | |
| 1634 | 1435 | static const struct intel_forcewake_range __dg2_fw_ranges[] = { |
| 1635 | − XEHP_FWRANGES(FORCEWAKE_RENDER) | |
| 1636 | −}; | |
| 1637 | − | |
| 1638 | −static const struct intel_forcewake_range __pvc_fw_ranges[] = { | |
| 1639 | − GEN_FW_RANGE(0x0, 0xaff, 0), | |
| 1640 | − GEN_FW_RANGE(0xb00, 0xbff, FORCEWAKE_GT), | |
| 1641 | − GEN_FW_RANGE(0xc00, 0xfff, 0), | |
| 1642 | − GEN_FW_RANGE(0x1000, 0x1fff, FORCEWAKE_GT), | |
| 1436 | + GEN_FW_RANGE(0x0, 0x1fff, 0), /* | |
| 1437 | + 0x0 - 0xaff: reserved | |
| 1438 | + 0xb00 - 0x1fff: always on */ | |
| 1643 | 1439 | GEN_FW_RANGE(0x2000, 0x26ff, FORCEWAKE_RENDER), |
| 1644 | − GEN_FW_RANGE(0x2700, 0x2fff, FORCEWAKE_GT), | |
| 1645 | − GEN_FW_RANGE(0x3000, 0x3fff, FORCEWAKE_RENDER), | |
| 1646 | − GEN_FW_RANGE(0x4000, 0x813f, FORCEWAKE_GT), /* | |
| 1647 | − 0x4000 - 0x4aff: gt | |
| 1440 | + GEN_FW_RANGE(0x2700, 0x4aff, FORCEWAKE_GT), | |
| 1441 | + GEN_FW_RANGE(0x4b00, 0x51ff, 0), /* | |
| 1648 | 1442 | 0x4b00 - 0x4fff: reserved |
| 1649 | − 0x5000 - 0x51ff: gt | |
| 1650 | − 0x5200 - 0x52ff: reserved | |
| 1651 | − 0x5300 - 0x53ff: gt | |
| 1652 | − 0x5400 - 0x7fff: reserved | |
| 1653 | − 0x8000 - 0x813f: gt */ | |
| 1654 | − GEN_FW_RANGE(0x8140, 0x817f, FORCEWAKE_RENDER), | |
| 1655 | − GEN_FW_RANGE(0x8180, 0x81ff, 0), | |
| 1656 | − GEN_FW_RANGE(0x8200, 0x94cf, FORCEWAKE_GT), /* | |
| 1657 | − 0x8200 - 0x82ff: gt | |
| 1658 | − 0x8300 - 0x84ff: reserved | |
| 1659 | − 0x8500 - 0x887f: gt | |
| 1660 | − 0x8880 - 0x8a7f: reserved | |
| 1661 | − 0x8a80 - 0x8aff: gt | |
| 1662 | − 0x8b00 - 0x8fff: reserved | |
| 1443 | + 0x5000 - 0x51ff: always on */ | |
| 1444 | + GEN_FW_RANGE(0x5200, 0x7fff, FORCEWAKE_RENDER), | |
| 1445 | + GEN_FW_RANGE(0x8000, 0x813f, FORCEWAKE_GT), | |
| 1446 | + GEN_FW_RANGE(0x8140, 0x815f, FORCEWAKE_RENDER), | |
| 1447 | + GEN_FW_RANGE(0x8160, 0x81ff, 0), /* | |
| 1448 | + 0x8160 - 0x817f: reserved | |
| 1449 | + 0x8180 - 0x81ff: always on */ | |
| 1450 | + GEN_FW_RANGE(0x8200, 0x82ff, FORCEWAKE_GT), | |
| 1451 | + GEN_FW_RANGE(0x8300, 0x84ff, FORCEWAKE_RENDER), | |
| 1452 | + GEN_FW_RANGE(0x8500, 0x8cff, FORCEWAKE_GT), /* | |
| 1453 | + 0x8500 - 0x87ff: gt | |
| 1454 | + 0x8800 - 0x8c7f: reserved | |
| 1455 | + 0x8c80 - 0x8cff: gt (DG2 only) */ | |
| 1456 | + GEN_FW_RANGE(0x8d00, 0x8fff, FORCEWAKE_RENDER), /* | |
| 1457 | + 0x8d00 - 0x8dff: render (DG2 only) | |
| 1458 | + 0x8e00 - 0x8fff: reserved */ | |
| 1459 | + GEN_FW_RANGE(0x9000, 0x94cf, FORCEWAKE_GT), /* | |
| 1663 | 1460 | 0x9000 - 0x947f: gt |
| 1664 | 1461 | 0x9480 - 0x94cf: reserved */ |
| 1665 | 1462 | GEN_FW_RANGE(0x94d0, 0x955f, FORCEWAKE_RENDER), |
| @@ -1673,65 +1470,114 @@ static const struct intel_forcewake_range __pvc_fw_ranges[] = { · 7 unmodified lines | ||
| 1673 | 1470 | 0x9800 - 0xb4ff: gt |
| 1674 | 1471 | 0xb500 - 0xbfff: reserved |
| 1675 | 1472 | 0xc000 - 0xcfff: gt */ |
| 1676 | − GEN_FW_RANGE(0xd000, 0xd3ff, 0), | |
| 1677 | − GEN_FW_RANGE(0xd400, 0xdbff, FORCEWAKE_GT), | |
| 1473 | + GEN_FW_RANGE(0xd000, 0xd7ff, 0), | |
| 1474 | + GEN_FW_RANGE(0xd800, 0xd87f, FORCEWAKE_RENDER), | |
| 1475 | + GEN_FW_RANGE(0xd880, 0xdbff, FORCEWAKE_GT), | |
| 1678 | 1476 | GEN_FW_RANGE(0xdc00, 0xdcff, FORCEWAKE_RENDER), |
| 1679 | 1477 | GEN_FW_RANGE(0xdd00, 0xde7f, FORCEWAKE_GT), /* |
| 1680 | 1478 | 0xdd00 - 0xddff: gt |
| 1681 | 1479 | 0xde00 - 0xde7f: reserved */ |
| 1682 | 1480 | GEN_FW_RANGE(0xde80, 0xe8ff, FORCEWAKE_RENDER), /* |
| 1683 | − 0xde80 - 0xdeff: render | |
| 1684 | − 0xdf00 - 0xe1ff: reserved | |
| 1685 | − 0xe200 - 0xe7ff: render | |
| 1686 | − 0xe800 - 0xe8ff: reserved */ | |
| 1687 | − GEN_FW_RANGE(0xe900, 0x11fff, FORCEWAKE_GT), /* | |
| 1688 | − 0xe900 - 0xe9ff: gt | |
| 1689 | − 0xea00 - 0xebff: reserved | |
| 1690 | − 0xec00 - 0xffff: gt | |
| 1691 | − 0x10000 - 0x11fff: reserved */ | |
| 1692 | − GEN_FW_RANGE(0x12000, 0x12fff, 0), /* | |
| 1481 | + 0xde80 - 0xdfff: render | |
| 1482 | + 0xe000 - 0xe0ff: reserved | |
| 1483 | + 0xe100 - 0xe8ff: render */ | |
| 1484 | + GEN_FW_RANGE(0xe900, 0xffff, FORCEWAKE_GT), /* | |
| 1485 | + 0xe900 - 0xe9ff: gt | |
| 1486 | + 0xea00 - 0xefff: reserved | |
| 1487 | + 0xf000 - 0xffff: gt */ | |
| 1488 | + GEN_FW_RANGE(0x10000, 0x12fff, 0), /* | |
| 1489 | + 0x10000 - 0x11fff: reserved | |
| 1693 | 1490 | 0x12000 - 0x127ff: always on |
| 1694 | 1491 | 0x12800 - 0x12fff: reserved */ |
| 1695 | − GEN_FW_RANGE(0x13000, 0x19fff, FORCEWAKE_GT), /* | |
| 1696 | − 0x13000 - 0x135ff: gt | |
| 1697 | − 0x13600 - 0x147ff: reserved | |
| 1698 | − 0x14800 - 0x153ff: gt | |
| 1699 | − 0x15400 - 0x19fff: reserved */ | |
| 1700 | − GEN_FW_RANGE(0x1a000, 0x21fff, FORCEWAKE_RENDER), /* | |
| 1701 | − 0x1a000 - 0x1ffff: render | |
| 1492 | + GEN_FW_RANGE(0x13000, 0x131ff, FORCEWAKE_MEDIA_VDBOX0), | |
| 1493 | + GEN_FW_RANGE(0x13200, 0x147ff, FORCEWAKE_MEDIA_VDBOX2), /* | |
| 1494 | + 0x13200 - 0x133ff: VD2 (DG2 only) | |
| 1495 | + 0x13400 - 0x147ff: reserved */ | |
| 1496 | + GEN_FW_RANGE(0x14800, 0x14fff, FORCEWAKE_RENDER), | |
| 1497 | + GEN_FW_RANGE(0x15000, 0x16dff, FORCEWAKE_GT), /* | |
| 1498 | + 0x15000 - 0x15fff: gt (DG2 only) | |
| 1499 | + 0x16000 - 0x16dff: reserved */ | |
| 1500 | + GEN_FW_RANGE(0x16e00, 0x21fff, FORCEWAKE_RENDER), /* | |
| 1501 | + 0x16e00 - 0x1ffff: render | |
| 1702 | 1502 | 0x20000 - 0x21fff: reserved */ |
| 1703 | 1503 | GEN_FW_RANGE(0x22000, 0x23fff, FORCEWAKE_GT), |
| 1704 | 1504 | GEN_FW_RANGE(0x24000, 0x2417f, 0), /* |
| 1705 | − 24000 - 0x2407f: always on | |
| 1706 | − 24080 - 0x2417f: reserved */ | |
| 1707 | − GEN_FW_RANGE(0x24180, 0x25fff, FORCEWAKE_GT), /* | |
| 1505 | + 0x24000 - 0x2407f: always on | |
| 1506 | + 0x24080 - 0x2417f: reserved */ | |
| 1507 | + GEN_FW_RANGE(0x24180, 0x249ff, FORCEWAKE_GT), /* | |
| 1708 | 1508 | 0x24180 - 0x241ff: gt |
| 1709 | − 0x24200 - 0x251ff: reserved | |
| 1509 | + 0x24200 - 0x249ff: reserved */ | |
| 1510 | + GEN_FW_RANGE(0x24a00, 0x251ff, FORCEWAKE_RENDER), /* | |
| 1511 | + 0x24a00 - 0x24a7f: render | |
| 1512 | + 0x24a80 - 0x251ff: reserved */ | |
| 1513 | + GEN_FW_RANGE(0x25200, 0x25fff, FORCEWAKE_GT), /* | |
| 1710 | 1514 | 0x25200 - 0x252ff: gt |
| 1711 | 1515 | 0x25300 - 0x25fff: reserved */ |
| 1712 | 1516 | GEN_FW_RANGE(0x26000, 0x2ffff, FORCEWAKE_RENDER), /* |
| 1713 | 1517 | 0x26000 - 0x27fff: render |
| 1714 | − 0x28000 - 0x2ffff: reserved */ | |
| 1518 | + 0x28000 - 0x29fff: reserved | |
| 1519 | + 0x2a000 - 0x2ffff: undocumented */ | |
| 1715 | 1520 | GEN_FW_RANGE(0x30000, 0x3ffff, FORCEWAKE_GT), |
| 1716 | 1521 | GEN_FW_RANGE(0x40000, 0x1bffff, 0), |
| 1717 | 1522 | GEN_FW_RANGE(0x1c0000, 0x1c3fff, FORCEWAKE_MEDIA_VDBOX0), /* |
| 1718 | 1523 | 0x1c0000 - 0x1c2bff: VD0 |
| 1719 | 1524 | 0x1c2c00 - 0x1c2cff: reserved |
| 1720 | 1525 | 0x1c2d00 - 0x1c2dff: VD0 |
| 1721 | − 0x1c2e00 - 0x1c3eff: reserved | |
| 1526 | + 0x1c2e00 - 0x1c3eff: VD0 | |
| 1722 | 1527 | 0x1c3f00 - 0x1c3fff: VD0 */ |
| 1723 | − GEN_FW_RANGE(0x1c4000, 0x1cffff, FORCEWAKE_MEDIA_VDBOX1), /* | |
| 1724 | − 0x1c4000 - 0x1c6aff: VD1 | |
| 1725 | − 0x1c6b00 - 0x1c7eff: reserved | |
| 1726 | − 0x1c7f00 - 0x1c7fff: VD1 | |
| 1727 | − 0x1c8000 - 0x1cffff: reserved */ | |
| 1728 | − GEN_FW_RANGE(0x1d0000, 0x23ffff, FORCEWAKE_MEDIA_VDBOX2), /* | |
| 1729 | − 0x1d0000 - 0x1d2aff: VD2 | |
| 1730 | − 0x1d2b00 - 0x1d3eff: reserved | |
| 1731 | − 0x1d3f00 - 0x1d3fff: VD2 | |
| 1732 | − 0x1d4000 - 0x23ffff: reserved */ | |
| 1733 | − GEN_FW_RANGE(0x240000, 0x3dffff, 0), | |
| 1734 | − GEN_FW_RANGE(0x3e0000, 0x3effff, FORCEWAKE_GT), | |
| 1528 | + GEN_FW_RANGE(0x1c4000, 0x1c7fff, FORCEWAKE_MEDIA_VDBOX1), /* | |
| 1529 | + 0x1c4000 - 0x1c6bff: VD1 | |
| 1530 | + 0x1c6c00 - 0x1c6cff: reserved | |
| 1531 | + 0x1c6d00 - 0x1c6dff: VD1 | |
| 1532 | + 0x1c6e00 - 0x1c7fff: reserved */ | |
| 1533 | + GEN_FW_RANGE(0x1c8000, 0x1cbfff, FORCEWAKE_MEDIA_VEBOX0), /* | |
| 1534 | + 0x1c8000 - 0x1ca0ff: VE0 | |
| 1535 | + 0x1ca100 - 0x1cbfff: reserved */ | |
| 1536 | + GEN_FW_RANGE(0x1cc000, 0x1ccfff, FORCEWAKE_MEDIA_VDBOX0), | |
| 1537 | + GEN_FW_RANGE(0x1cd000, 0x1cdfff, FORCEWAKE_MEDIA_VDBOX2), | |
| 1538 | + GEN_FW_RANGE(0x1ce000, 0x1cefff, FORCEWAKE_MEDIA_VDBOX4), | |
| 1539 | + GEN_FW_RANGE(0x1cf000, 0x1cffff, FORCEWAKE_MEDIA_VDBOX6), | |
| 1540 | + GEN_FW_RANGE(0x1d0000, 0x1d3fff, FORCEWAKE_MEDIA_VDBOX2), /* | |
| 1541 | + 0x1d0000 - 0x1d2bff: VD2 | |
| 1542 | + 0x1d2c00 - 0x1d2cff: reserved | |
| 1543 | + 0x1d2d00 - 0x1d2dff: VD2 | |
| 1544 | + 0x1d2e00 - 0x1d3dff: VD2 | |
| 1545 | + 0x1d3e00 - 0x1d3eff: reserved | |
| 1546 | + 0x1d3f00 - 0x1d3fff: VD2 */ | |
| 1547 | + GEN_FW_RANGE(0x1d4000, 0x1d7fff, FORCEWAKE_MEDIA_VDBOX3), /* | |
| 1548 | + 0x1d4000 - 0x1d6bff: VD3 | |
| 1549 | + 0x1d6c00 - 0x1d6cff: reserved | |
| 1550 | + 0x1d6d00 - 0x1d6dff: VD3 | |
| 1551 | + 0x1d6e00 - 0x1d7fff: reserved */ | |
| 1552 | + GEN_FW_RANGE(0x1d8000, 0x1dffff, FORCEWAKE_MEDIA_VEBOX1), /* | |
| 1553 | + 0x1d8000 - 0x1da0ff: VE1 | |
| 1554 | + 0x1da100 - 0x1dffff: reserved */ | |
| 1555 | + GEN_FW_RANGE(0x1e0000, 0x1e3fff, FORCEWAKE_MEDIA_VDBOX4), /* | |
| 1556 | + 0x1e0000 - 0x1e2bff: VD4 | |
| 1557 | + 0x1e2c00 - 0x1e2cff: reserved | |
| 1558 | + 0x1e2d00 - 0x1e2dff: VD4 | |
| 1559 | + 0x1e2e00 - 0x1e3eff: reserved | |
| 1560 | + 0x1e3f00 - 0x1e3fff: VD4 */ | |
| 1561 | + GEN_FW_RANGE(0x1e4000, 0x1e7fff, FORCEWAKE_MEDIA_VDBOX5), /* | |
| 1562 | + 0x1e4000 - 0x1e6bff: VD5 | |
| 1563 | + 0x1e6c00 - 0x1e6cff: reserved | |
| 1564 | + 0x1e6d00 - 0x1e6dff: VD5 | |
| 1565 | + 0x1e6e00 - 0x1e7fff: reserved */ | |
| 1566 | + GEN_FW_RANGE(0x1e8000, 0x1effff, FORCEWAKE_MEDIA_VEBOX2), /* | |
| 1567 | + 0x1e8000 - 0x1ea0ff: VE2 | |
| 1568 | + 0x1ea100 - 0x1effff: reserved */ | |
| 1569 | + GEN_FW_RANGE(0x1f0000, 0x1f3fff, FORCEWAKE_MEDIA_VDBOX6), /* | |
| 1570 | + 0x1f0000 - 0x1f2bff: VD6 | |
| 1571 | + 0x1f2c00 - 0x1f2cff: reserved | |
| 1572 | + 0x1f2d00 - 0x1f2dff: VD6 | |
| 1573 | + 0x1f2e00 - 0x1f3eff: reserved | |
| 1574 | + 0x1f3f00 - 0x1f3fff: VD6 */ | |
| 1575 | + GEN_FW_RANGE(0x1f4000, 0x1f7fff, FORCEWAKE_MEDIA_VDBOX7), /* | |
| 1576 | + 0x1f4000 - 0x1f6bff: VD7 | |
| 1577 | + 0x1f6c00 - 0x1f6cff: reserved | |
| 1578 | + 0x1f6d00 - 0x1f6dff: VD7 | |
| 1579 | + 0x1f6e00 - 0x1f7fff: reserved */ | |
| 1580 | + GEN_FW_RANGE(0x1f8000, 0x1fa0ff, FORCEWAKE_MEDIA_VEBOX3), | |
| 1735 | 1581 | }; |
| 1736 | 1582 | |
| 1737 | 1583 | static const struct intel_forcewake_range __mtl_fw_ranges[] = { |
| @@ -2576,18 +2422,10 @@ static int uncore_forcewake_init(struct intel_uncore *uncore) · 838 unmodified lines | ||
| 2576 | 2422 | ASSIGN_FW_DOMAINS_TABLE(uncore, __mtl_fw_ranges); |
| 2577 | 2423 | ASSIGN_SHADOW_TABLE(uncore, mtl_shadowed_regs); |
| 2578 | 2424 | ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); |
| 2579 | − } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 60)) { | |
| 2580 | − ASSIGN_FW_DOMAINS_TABLE(uncore, __pvc_fw_ranges); | |
| 2581 | − ASSIGN_SHADOW_TABLE(uncore, pvc_shadowed_regs); | |
| 2582 | − ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); | |
| 2583 | 2425 | } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) { |
| 2584 | 2426 | ASSIGN_FW_DOMAINS_TABLE(uncore, __dg2_fw_ranges); |
| 2585 | 2427 | ASSIGN_SHADOW_TABLE(uncore, dg2_shadowed_regs); |
| 2586 | 2428 | ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); |
| 2587 | − } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) { | |
| 2588 | − ASSIGN_FW_DOMAINS_TABLE(uncore, __xehp_fw_ranges); | |
| 2589 | − ASSIGN_SHADOW_TABLE(uncore, gen12_shadowed_regs); | |
| 2590 | − ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); | |
| 2591 | 2429 | } else if (GRAPHICS_VER(i915) >= 12) { |
| 2592 | 2430 | ASSIGN_FW_DOMAINS_TABLE(uncore, __gen12_fw_ranges); |
| 2593 | 2431 | ASSIGN_SHADOW_TABLE(uncore, gen12_shadowed_regs); |
| @@ -2734,7 +2572,7 @@ void intel_uncore_prune_engine_fw_domains(struct intel_uncore *uncore, · 140 unmodified lines | ||
| 2734 | 2572 | * the forcewake domain if any of the other engines |
| 2735 | 2573 | * in the same media slice are present. |
| 2736 | 2574 | */ |
| 2737 | − if (GRAPHICS_VER_FULL(uncore->i915) >= IP_VER(12, 50) && i % 2 == 0) { | |
| 2575 | + if (GRAPHICS_VER_FULL(uncore->i915) >= IP_VER(12, 55) && i % 2 == 0) { | |
| 2738 | 2576 | if ((i + 1 < I915_MAX_VCS) && HAS_ENGINE(gt, _VCS(i + 1))) |
| 2739 | 2577 | continue; |
| 2740 | 2578 | |
| @@ -71,7 +71,6 @@ static int intel_shadow_table_check(void) · 70 unmodified lines | ||
| 71 | 71 | { gen11_shadowed_regs, ARRAY_SIZE(gen11_shadowed_regs) }, |
| 72 | 72 | { gen12_shadowed_regs, ARRAY_SIZE(gen12_shadowed_regs) }, |
| 73 | 73 | { dg2_shadowed_regs, ARRAY_SIZE(dg2_shadowed_regs) }, |
| 74 | − { pvc_shadowed_regs, ARRAY_SIZE(pvc_shadowed_regs) }, | |
| 75 | 74 | { mtl_shadowed_regs, ARRAY_SIZE(mtl_shadowed_regs) }, |
| 76 | 75 | { xelpmp_shadowed_regs, ARRAY_SIZE(xelpmp_shadowed_regs) }, |
| 77 | 76 | }; |
| @@ -119,8 +118,6 @@ int intel_uncore_mock_selftests(void) · 41 unmodified lines | ||
| 119 | 118 | { __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true }, |
| 120 | 119 | { __gen11_fw_ranges, ARRAY_SIZE(__gen11_fw_ranges), true }, |
| 121 | 120 | { __gen12_fw_ranges, ARRAY_SIZE(__gen12_fw_ranges), true }, |
| 122 | − { __xehp_fw_ranges, ARRAY_SIZE(__xehp_fw_ranges), true }, | |
| 123 | − { __pvc_fw_ranges, ARRAY_SIZE(__pvc_fw_ranges), true }, | |
| 124 | 121 | { __mtl_fw_ranges, ARRAY_SIZE(__mtl_fw_ranges), true }, |
| 125 | 122 | { __xelpmp_fw_ranges, ARRAY_SIZE(__xelpmp_fw_ranges), true }, |
| 126 | 123 | }; |
| @@ -181,7 +181,7 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector, · 180 unmodified lines | ||
| 181 | 181 | if (nouveau_mst) { |
| 182 | 182 | mstm = outp->dp.mstm; |
| 183 | 183 | if (mstm) |
| 184 | − mstm->can_mst = drm_dp_read_mst_cap(aux, dpcd); | |
| 184 | + mstm->can_mst = drm_dp_read_mst_cap(aux, dpcd) == DRM_DP_MST; | |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | if (nouveau_dp_has_sink_count(connector, outp)) { |
| @@ -172,9 +172,6 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ · 171 unmodified lines | ||
| 172 | 172 | -Ddrm_i915_gem_object=xe_bo \ |
| 173 | 173 | -Ddrm_i915_private=xe_device |
| 174 | 174 | |
| 175 | −CFLAGS_i915-display/intel_fbdev.o = -Wno-override-init | |
| 176 | −CFLAGS_i915-display/intel_display_device.o = -Wno-override-init | |
| 177 | − | |
| 178 | 175 | # Rule to build SOC code shared with i915 |
| 179 | 176 | $(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCE |
| 180 | 177 | $(call cmd,force_checksrc) |
| @@ -278,6 +275,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ · 97 unmodified lines | ||
| 278 | 275 | i915-display/intel_vdsc.o \ |
| 279 | 276 | i915-display/intel_vga.o \ |
| 280 | 277 | i915-display/intel_vrr.o \ |
| 278 | + i915-display/intel_dmc_wl.o \ | |
| 281 | 279 | i915-display/intel_wm.o \ |
| 282 | 280 | i915-display/skl_scaler.o \ |
| 283 | 281 | i915-display/skl_universal_plane.o \ |
| @@ -19,14 +19,12 @@ · 18 unmodified lines | ||
| 19 | 19 | #include "xe_bo.h" |
| 20 | 20 | #include "xe_pm.h" |
| 21 | 21 | #include "xe_step.h" |
| 22 | −#include "i915_gem.h" | |
| 23 | 22 | #include "i915_gem_stolen.h" |
| 24 | 23 | #include "i915_gpu_error.h" |
| 25 | 24 | #include "i915_reg_defs.h" |
| 26 | 25 | #include "i915_utils.h" |
| 27 | 26 | #include "intel_gt_types.h" |
| 28 | 27 | #include "intel_step.h" |
| 29 | −#include "intel_uc_fw.h" | |
| 30 | 28 | #include "intel_uncore.h" |
| 31 | 29 | #include "intel_runtime_pm.h" |
| 32 | 30 | #include <linux/pm_runtime.h> |
| @@ -41,12 +39,8 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) · 8 unmodified lines | ||
| 41 | 39 | return dev_get_drvdata(kdev); |
| 42 | 40 | } |
| 43 | 41 | |
| 44 | − | |
| 45 | −#define INTEL_JASPERLAKE 0 | |
| 46 | −#define INTEL_ELKHARTLAKE 0 | |
| 47 | 42 | #define IS_PLATFORM(xe, x) ((xe)->info.platform == x) |
| 48 | 43 | #define INTEL_INFO(dev_priv) (&((dev_priv)->info)) |
| 49 | −#define INTEL_DEVID(dev_priv) ((dev_priv)->info.devid) | |
| 50 | 44 | #define IS_I830(dev_priv) (dev_priv && 0) |
| 51 | 45 | #define IS_I845G(dev_priv) (dev_priv && 0) |
| 52 | 46 | #define IS_I85X(dev_priv) (dev_priv && 0) |
| @@ -85,9 +79,7 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) · 32 unmodified lines | ||
| 85 | 79 | #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, XE_DG1) |
| 86 | 80 | #define IS_ALDERLAKE_S(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_S) |
| 87 | 81 | #define IS_ALDERLAKE_P(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_P) |
| 88 | −#define IS_XEHPSDV(dev_priv) (dev_priv && 0) | |
| 89 | 82 | #define IS_DG2(dev_priv) IS_PLATFORM(dev_priv, XE_DG2) |
| 90 | −#define IS_PONTEVECCHIO(dev_priv) IS_PLATFORM(dev_priv, XE_PVC) | |
| 91 | 83 | #define IS_METEORLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_METEORLAKE) |
| 92 | 84 | #define IS_LUNARLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_LUNARLAKE) |
| 93 | 85 | |
| @@ -97,19 +89,12 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) · 3 unmodified lines | ||
| 97 | 89 | |
| 98 | 90 | #define IP_VER(ver, rel) ((ver) << 8 | (rel)) |
| 99 | 91 | |
| 100 | −#define INTEL_DISPLAY_ENABLED(xe) (HAS_DISPLAY((xe)) && !intel_opregion_headless_sku((xe))) | |
| 101 | − | |
| 102 | −#define IS_GRAPHICS_VER(xe, first, last) \ | |
| 103 | − ((xe)->info.graphics_verx100 >= first * 100 && \ | |
| 104 | − (xe)->info.graphics_verx100 <= (last*100 + 99)) | |
| 105 | 92 | #define IS_MOBILE(xe) (xe && 0) |
| 106 | −#define HAS_LLC(xe) (!IS_DGFX((xe))) | |
| 107 | 93 | |
| 108 | 94 | #define HAS_GMD_ID(xe) GRAPHICS_VERx100(xe) >= 1270 |
| 109 | 95 | |
| 110 | 96 | /* Workarounds not handled yet */ |
| 111 | 97 | #define IS_DISPLAY_STEP(xe, first, last) ({u8 __step = (xe)->info.step.display; first <= __step && __step <= last; }) |
| 112 | −#define IS_GRAPHICS_STEP(xe, first, last) ({u8 __step = (xe)->info.step.graphics; first <= __step && __step <= last; }) | |
| 113 | 98 | |
| 114 | 99 | #define IS_LP(xe) (0) |
| 115 | 100 | #define IS_GEN9_LP(xe) (0) |
| @@ -126,27 +111,6 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) · 10 unmodified lines | ||
| 126 | 111 | #define IS_KABYLAKE_ULT(xe) (xe && 0) |
| 127 | 112 | #define IS_SKYLAKE_ULT(xe) (xe && 0) |
| 128 | 113 | |
| 129 | −#define IS_DG1_GRAPHICS_STEP(xe, first, last) (IS_DG1(xe) && IS_GRAPHICS_STEP(xe, first, last)) | |
| 130 | −#define IS_DG2_GRAPHICS_STEP(xe, variant, first, last) \ | |
| 131 | − ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_ ## variant && \ | |
| 132 | − IS_GRAPHICS_STEP(xe, first, last)) | |
| 133 | −#define IS_XEHPSDV_GRAPHICS_STEP(xe, first, last) (IS_XEHPSDV(xe) && IS_GRAPHICS_STEP(xe, first, last)) | |
| 134 | − | |
| 135 | −/* XXX: No basedie stepping support yet */ | |
| 136 | −#define IS_PVC_BD_STEP(xe, first, last) (!WARN_ON(1) && IS_PONTEVECCHIO(xe)) | |
| 137 | − | |
| 138 | −#define IS_TIGERLAKE_DISPLAY_STEP(xe, first, last) (IS_TIGERLAKE(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 139 | −#define IS_ROCKETLAKE_DISPLAY_STEP(xe, first, last) (IS_ROCKETLAKE(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 140 | −#define IS_DG1_DISPLAY_STEP(xe, first, last) (IS_DG1(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 141 | −#define IS_DG2_DISPLAY_STEP(xe, first, last) (IS_DG2(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 142 | −#define IS_ADLP_DISPLAY_STEP(xe, first, last) (IS_ALDERLAKE_P(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 143 | −#define IS_ADLS_DISPLAY_STEP(xe, first, last) (IS_ALDERLAKE_S(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 144 | −#define IS_JSL_EHL_DISPLAY_STEP(xe, first, last) (IS_JSL_EHL(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 145 | −#define IS_MTL_DISPLAY_STEP(xe, first, last) (IS_METEORLAKE(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 146 | − | |
| 147 | −/* FIXME: Add subplatform here */ | |
| 148 | −#define IS_MTL_GRAPHICS_STEP(xe, sub, first, last) (IS_METEORLAKE(xe) && IS_DISPLAY_STEP(xe, first, last)) | |
| 149 | − | |
| 150 | 114 | #define IS_DG2_G10(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_G10) |
| 151 | 115 | #define IS_DG2_G11(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_G11) |
| 152 | 116 | #define IS_DG2_G12(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_G12) |
| @@ -154,12 +118,9 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) · 1 unmodified line | ||
| 154 | 118 | #define IS_ICL_WITH_PORT_F(xe) (xe && 0) |
| 155 | 119 | #define HAS_FLAT_CCS(xe) (xe_device_has_flat_ccs(xe)) |
| 156 | 120 | #define to_intel_bo(x) gem_to_xe_bo((x)) |
| 157 | −#define mkwrite_device_info(xe) (INTEL_INFO(xe)) | |
| 158 | 121 | |
| 159 | 122 | #define HAS_128_BYTE_Y_TILING(xe) (xe || 1) |
| 160 | 123 | |
| 161 | −#define intel_has_gpu_reset(a) (a && 0) | |
| 162 | − | |
| 163 | 124 | #include "intel_wakeref.h" |
| 164 | 125 | |
| 165 | 126 | static inline intel_wakeref_t intel_runtime_pm_get(struct xe_runtime_pm *pm) |
| @@ -217,7 +178,6 @@ struct i915_sched_attr { · 51 unmodified lines | ||
| 217 | 178 | #define RUNTIME_INFO(xe) (&(xe)->info.i915_runtime) |
| 218 | 179 | |
| 219 | 180 | #define FORCEWAKE_ALL XE_FORCEWAKE_ALL |
| 220 | −#define HPD_STORM_DEFAULT_THRESHOLD 50 | |
| 221 | 181 | |
| 222 | 182 | #ifdef CONFIG_ARM64 |
| 223 | 183 | /* |
| @@ -1,6 +0,0 @@ | ||
| 1 | −/* SPDX-License-Identifier: MIT */ | |
| 2 | −/* | |
| 3 | − * Copyright © 2023 Intel Corporation | |
| 4 | − */ | |
| 5 | − | |
| 6 | −#include "../../i915/i915_fixed.h" | |
| @@ -1,9 +0,0 @@ | ||
| 1 | −/* SPDX-License-Identifier: MIT */ | |
| 2 | −/* | |
| 3 | − * Copyright © 2023 Intel Corporation | |
| 4 | − */ | |
| 5 | − | |
| 6 | −#ifndef __I915_GEM_H__ | |
| 7 | −#define __I915_GEM_H__ | |
| 8 | −#define GEM_BUG_ON | |
| 9 | −#endif | |
| @@ -9,36 +9,10 @@ · 8 unmodified lines | ||
| 9 | 9 | #include <linux/types.h> |
| 10 | 10 | |
| 11 | 11 | struct drm_i915_private; |
| 12 | −struct i915_ggtt; | |
| 13 | 12 | |
| 14 | −static inline void intel_vgpu_detect(struct drm_i915_private *i915) | |
| 15 | −{ | |
| 16 | −} | |
| 17 | 13 | static inline bool intel_vgpu_active(struct drm_i915_private *i915) |
| 18 | 14 | { |
| 19 | 15 | return false; |
| 20 | 16 | } |
| 21 | −static inline void intel_vgpu_register(struct drm_i915_private *i915) | |
| 22 | −{ | |
| 23 | −} | |
| 24 | −static inline bool intel_vgpu_has_full_ppgtt(struct drm_i915_private *i915) | |
| 25 | −{ | |
| 26 | − return false; | |
| 27 | −} | |
| 28 | −static inline bool intel_vgpu_has_hwsp_emulation(struct drm_i915_private *i915) | |
| 29 | −{ | |
| 30 | − return false; | |
| 31 | −} | |
| 32 | −static inline bool intel_vgpu_has_huge_gtt(struct drm_i915_private *i915) | |
| 33 | −{ | |
| 34 | − return false; | |
| 35 | −} | |
| 36 | −static inline int intel_vgt_balloon(struct i915_ggtt *ggtt) | |
| 37 | −{ | |
| 38 | − return 0; | |
| 39 | −} | |
| 40 | −static inline void intel_vgt_deballoon(struct i915_ggtt *ggtt) | |
| 41 | −{ | |
| 42 | −} | |
| 43 | 17 | |
| 44 | 18 | #endif /* _I915_VGPU_H_ */ |
| @@ -1,11 +0,0 @@ | ||
| 1 | −/* SPDX-License-Identifier: MIT */ | |
| 2 | −/* | |
| 3 | − * Copyright © 2023 Intel Corporation | |
| 4 | − */ | |
| 5 | − | |
| 6 | −#ifndef _INTEL_UC_FW_H_ | |
| 7 | −#define _INTEL_UC_FW_H_ | |
| 8 | − | |
| 9 | −#define INTEL_UC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" | |
| 10 | − | |
| 11 | −#endif | |
| @@ -497,20 +497,9 @@ struct xe_device { · 496 unmodified lines | ||
| 497 | 497 | /* For pcode */ |
| 498 | 498 | struct mutex sb_lock; |
| 499 | 499 | |
| 500 | − /* Should be in struct intel_display */ | |
| 501 | − u32 skl_preferred_vco_freq, max_dotclk_freq, hti_state; | |
| 502 | − u8 snps_phy_failed_calibration; | |
| 503 | − struct drm_atomic_state *modeset_restore_state; | |
| 504 | − struct list_head global_obj_list; | |
| 505 | − | |
| 506 | − union { | |
| 507 | − /* only to allow build, not used functionally */ | |
| 508 | − u32 irq_mask; | |
| 509 | − u32 de_irq_mask[I915_MAX_PIPES]; | |
| 510 | − }; | |
| 511 | − u32 pipestat_irq_mask[I915_MAX_PIPES]; | |
| 500 | + /* only to allow build, not used functionally */ | |
| 501 | + u32 irq_mask; | |
| 512 | 502 | |
| 513 | − bool display_irqs_enabled; | |
| 514 | 503 | u32 enabled_irq_mask; |
| 515 | 504 | |
| 516 | 505 | struct intel_uncore { |
| @@ -522,7 +511,6 @@ struct xe_device { · 5 unmodified lines | ||
| 522 | 511 | unsigned int hpll_freq; |
| 523 | 512 | unsigned int czclk_freq; |
| 524 | 513 | unsigned int fsb_freq, mem_freq, is_ddr3; |
| 525 | − u8 vblank_enabled; | |
| 526 | 514 | }; |
| 527 | 515 | struct { |
| 528 | 516 | const char *dmc_firmware_path; |
| @@ -333,6 +333,7 @@ static const struct xe_device_desc mtl_desc = { · 332 unmodified lines | ||
| 333 | 333 | |
| 334 | 334 | static const struct xe_device_desc lnl_desc = { |
| 335 | 335 | PLATFORM(XE_LUNARLAKE), |
| 336 | + .has_display = true, | |
| 336 | 337 | .require_force_probe = true, |
| 337 | 338 | }; |
| 338 | 339 | |
| @@ -1150,6 +1150,8 @@ · 1149 unmodified lines | ||
| 1150 | 1150 | |
| 1151 | 1151 | #define DP_DPRX_FEATURE_ENUMERATION_LIST_CONT_1 0x2214 /* 2.0 E11 */ |
| 1152 | 1152 | # define DP_ADAPTIVE_SYNC_SDP_SUPPORTED (1 << 0) |
| 1153 | +# define DP_ADAPTIVE_SYNC_SDP_OPERATION_MODE GENMASK(1, 0) | |
| 1154 | +# define DP_ADAPTIVE_SYNC_SDP_LENGTH GENMASK(5, 0) | |
| 1153 | 1155 | # define DP_AS_SDP_FIRST_HALF_LINE_OR_3840_PIXEL_CYCLE_WINDOW_NOT_SUPPORTED (1 << 1) |
| 1154 | 1156 | # define DP_VSC_EXT_SDP_FRAMEWORK_VERSION_1_SUPPORTED (1 << 4) |
| 1155 | 1157 | |
| @@ -1639,10 +1641,12 @@ enum drm_dp_phy { · 483 unmodified lines | ||
| 1639 | 1641 | #define DP_SDP_AUDIO_COPYMANAGEMENT 0x05 /* DP 1.2 */ |
| 1640 | 1642 | #define DP_SDP_ISRC 0x06 /* DP 1.2 */ |
| 1641 | 1643 | #define DP_SDP_VSC 0x07 /* DP 1.2 */ |
| 1644 | +#define DP_SDP_ADAPTIVE_SYNC 0x22 /* DP 1.4 */ | |
| 1642 | 1645 | #define DP_SDP_CAMERA_GENERIC(i) (0x08 + (i)) /* 0-7, DP 1.3 */ |
| 1643 | 1646 | #define DP_SDP_PPS 0x10 /* DP 1.4 */ |
| 1644 | 1647 | #define DP_SDP_VSC_EXT_VESA 0x20 /* DP 1.4 */ |
| 1645 | 1648 | #define DP_SDP_VSC_EXT_CEA 0x21 /* DP 1.4 */ |
| 1649 | + | |
| 1646 | 1650 | /* 0x80+ CEA-861 infoframe types */ |
| 1647 | 1651 | |
| 1648 | 1652 | #define DP_SDP_AUDIO_INFOFRAME_HB2 0x1b |
| @@ -1798,4 +1802,11 @@ enum dp_content_type { · 149 unmodified lines | ||
| 1798 | 1802 | DP_CONTENT_TYPE_GAME = 0x04, |
| 1799 | 1803 | }; |
| 1800 | 1804 | |
| 1805 | +enum operation_mode { | |
| 1806 | + DP_AS_SDP_AVT_DYNAMIC_VTOTAL = 0x00, | |
| 1807 | + DP_AS_SDP_AVT_FIXED_VTOTAL = 0x01, | |
| 1808 | + DP_AS_SDP_FAVT_TRR_NOT_REACHED = 0x02, | |
| 1809 | + DP_AS_SDP_FAVT_TRR_REACHED = 0x03 | |
| 1810 | +}; | |
| 1811 | + | |
| 1801 | 1812 | #endif /* _DRM_DP_H_ */ |
| @@ -98,9 +98,39 @@ struct drm_dp_vsc_sdp { · 97 unmodified lines | ||
| 98 | 98 | enum dp_content_type content_type; |
| 99 | 99 | }; |
| 100 | 100 | |
| 101 | +/** | |
| 102 | + * struct drm_dp_as_sdp - drm DP Adaptive Sync SDP | |
| 103 | + * | |
| 104 | + * This structure represents a DP AS SDP of drm | |
| 105 | + * It is based on DP 2.1 spec [Table 2-126: Adaptive-Sync SDP Header Bytes] and | |
| 106 | + * [Table 2-127: Adaptive-Sync SDP Payload for DB0 through DB8] | |
| 107 | + * | |
| 108 | + * @sdp_type: Secondary-data packet type | |
| 109 | + * @revision: Revision Number | |
| 110 | + * @length: Number of valid data bytes | |
| 111 | + * @vtotal: Minimum Vertical Vtotal | |
| 112 | + * @target_rr: Target Refresh | |
| 113 | + * @duration_incr_ms: Successive frame duration increase | |
| 114 | + * @duration_decr_ms: Successive frame duration decrease | |
| 115 | + * @operation_mode: Adaptive Sync Operation Mode | |
| 116 | + */ | |
| 117 | +struct drm_dp_as_sdp { | |
| 118 | + unsigned char sdp_type; | |
| 119 | + unsigned char revision; | |
| 120 | + unsigned char length; | |
| 121 | + int vtotal; | |
| 122 | + int target_rr; | |
| 123 | + int duration_incr_ms; | |
| 124 | + int duration_decr_ms; | |
| 125 | + enum operation_mode mode; | |
| 126 | +}; | |
| 127 | + | |
| 128 | +void drm_dp_as_sdp_log(struct drm_printer *p, | |
| 129 | + const struct drm_dp_as_sdp *as_sdp); | |
| 101 | 130 | void drm_dp_vsc_sdp_log(struct drm_printer *p, const struct drm_dp_vsc_sdp *vsc); |
| 102 | 131 | |
| 103 | 132 | bool drm_dp_vsc_sdp_supported(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]); |
| 133 | +bool drm_dp_as_sdp_supported(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]); | |
| 104 | 134 | |
| 105 | 135 | int drm_dp_psr_setup_time(const u8 psr_cap[EDP_PSR_RECEIVER_CAP_SIZE]); |
| 106 | 136 | |
| @@ -817,7 +817,28 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, · 816 unmodified lines | ||
| 817 | 817 | |
| 818 | 818 | void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr); |
| 819 | 819 | |
| 820 | −bool drm_dp_read_mst_cap(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]); | |
| 820 | +/** | |
| 821 | + * enum drm_dp_mst_mode - sink's MST mode capability | |
| 822 | + */ | |
| 823 | +enum drm_dp_mst_mode { | |
| 824 | + /** | |
| 825 | + * @DRM_DP_SST: The sink does not support MST nor single stream sideband | |
| 826 | + * messaging. | |
| 827 | + */ | |
| 828 | + DRM_DP_SST, | |
| 829 | + /** | |
| 830 | + * @DRM_DP_MST: Sink supports MST, more than one stream and single | |
| 831 | + * stream sideband messaging. | |
| 832 | + */ | |
| 833 | + DRM_DP_MST, | |
| 834 | + /** | |
| 835 | + * @DRM_DP_SST_SIDEBAND_MSG: Sink supports only one stream and single | |
| 836 | + * stream sideband messaging. | |
| 837 | + */ | |
| 838 | + DRM_DP_SST_SIDEBAND_MSG, | |
| 839 | +}; | |
| 840 | + | |
| 841 | +enum drm_dp_mst_mode drm_dp_read_mst_cap(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]); | |
| 821 | 842 | int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool mst_state); |
| 822 | 843 | |
| 823 | 844 | int drm_dp_mst_hpd_irq_handle_event(struct drm_dp_mst_topology_mgr *mgr, |
| @@ -711,7 +711,9 @@ · 710 unmodified lines | ||
| 711 | 711 | INTEL_VGA_DEVICE(0x5692, info), \ |
| 712 | 712 | INTEL_VGA_DEVICE(0x56A0, info), \ |
| 713 | 713 | INTEL_VGA_DEVICE(0x56A1, info), \ |
| 714 | − INTEL_VGA_DEVICE(0x56A2, info) | |
| 714 | + INTEL_VGA_DEVICE(0x56A2, info), \ | |
| 715 | + INTEL_VGA_DEVICE(0x56BE, info), \ | |
| 716 | + INTEL_VGA_DEVICE(0x56BF, info) | |
| 715 | 717 | |
| 716 | 718 | #define INTEL_DG2_G11_IDS(info) \ |
| 717 | 719 | INTEL_VGA_DEVICE(0x5693, info), \ |
| @@ -2623,19 +2623,29 @@ struct drm_i915_reg_read { · 2622 unmodified lines | ||
| 2623 | 2623 | * |
| 2624 | 2624 | */ |
| 2625 | 2625 | |
| 2626 | +/* | |
| 2627 | + * struct drm_i915_reset_stats - Return global reset and other context stats | |
| 2628 | + * | |
| 2629 | + * Driver keeps few stats for each contexts and also global reset count. | |
| 2630 | + * This struct can be used to query those stats. | |
| 2631 | + */ | |
| 2626 | 2632 | struct drm_i915_reset_stats { |
| 2633 | + /** @ctx_id: ID of the requested context */ | |
| 2627 | 2634 | __u32 ctx_id; |
| 2635 | + | |
| 2636 | + /** @flags: MBZ */ | |
| 2628 | 2637 | __u32 flags; |
| 2629 | 2638 | |
| 2630 | − /* All resets since boot/module reload, for all contexts */ | |
| 2639 | + /** @reset_count: All resets since boot/module reload, for all contexts */ | |
| 2631 | 2640 | __u32 reset_count; |
| 2632 | 2641 | |
| 2633 | − /* Number of batches lost when active in GPU, for this context */ | |
| 2642 | + /** @batch_active: Number of batches lost when active in GPU, for this context */ | |
| 2634 | 2643 | __u32 batch_active; |
| 2635 | 2644 | |
| 2636 | − /* Number of batches lost pending for execution, for this context */ | |
| 2645 | + /** @batch_pending: Number of batches lost pending for execution, for this context */ | |
| 2637 | 2646 | __u32 batch_pending; |
| 2638 | 2647 | |
| 2648 | + /** @pad: MBZ */ | |
| 2639 | 2649 | __u32 pad; |
| 2640 | 2650 | }; |
| 2641 | 2651 | |