Commit c55f79f3 authored by Matthew Auld's avatar Matthew Auld

drm/i915: disable fbc due to Wa_16023588340

On BMG-G21 we need to disable fbc due to complications around the WA.

v2:
 - Try to handle with i915_drv.h and compat layer. (Rodrigo)
v3:
 - For simplicity retreat back to the original design for now.
 - Drop the extra \ from the Makefile (Jani)
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Jonathan Cavitt <jonathan.cavitt@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Vinod Govindapillai <vinod.govindapillai@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240703124338.208220-4-matthew.auld@intel.com
parent 01570b44
...@@ -6,8 +6,16 @@ ...@@ -6,8 +6,16 @@
#ifndef __INTEL_DISPLAY_WA_H__ #ifndef __INTEL_DISPLAY_WA_H__
#define __INTEL_DISPLAY_WA_H__ #define __INTEL_DISPLAY_WA_H__
#include <linux/types.h>
struct drm_i915_private; struct drm_i915_private;
void intel_display_wa_apply(struct drm_i915_private *i915); void intel_display_wa_apply(struct drm_i915_private *i915);
#ifdef I915
static inline bool intel_display_needs_wa_16023588340(struct drm_i915_private *i915) { return false; }
#else
bool intel_display_needs_wa_16023588340(struct drm_i915_private *i915);
#endif
#endif #endif
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include "intel_display_device.h" #include "intel_display_device.h"
#include "intel_display_trace.h" #include "intel_display_trace.h"
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_display_wa.h"
#include "intel_fbc.h" #include "intel_fbc.h"
#include "intel_fbc_regs.h" #include "intel_fbc_regs.h"
#include "intel_frontbuffer.h" #include "intel_frontbuffer.h"
...@@ -1237,6 +1238,11 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state, ...@@ -1237,6 +1238,11 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
return 0; return 0;
} }
if (intel_display_needs_wa_16023588340(i915)) {
plane_state->no_fbc_reason = "Wa_16023588340";
return 0;
}
/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */ /* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
if (i915_vtd_active(i915) && (IS_SKYLAKE(i915) || IS_BROXTON(i915))) { if (i915_vtd_active(i915) && (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
plane_state->no_fbc_reason = "VT-d enabled"; plane_state->no_fbc_reason = "VT-d enabled";
......
...@@ -36,7 +36,8 @@ uses_generated_oob := \ ...@@ -36,7 +36,8 @@ uses_generated_oob := \
$(obj)/xe_ring_ops.o \ $(obj)/xe_ring_ops.o \
$(obj)/xe_vm.o \ $(obj)/xe_vm.o \
$(obj)/xe_wa.o \ $(obj)/xe_wa.o \
$(obj)/xe_ttm_stolen_mgr.o $(obj)/xe_ttm_stolen_mgr.o \
$(obj)/display/xe_display_wa.o
$(uses_generated_oob): $(generated_oob) $(uses_generated_oob): $(generated_oob)
...@@ -194,6 +195,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ ...@@ -194,6 +195,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
display/xe_display.o \ display/xe_display.o \
display/xe_display_misc.o \ display/xe_display_misc.o \
display/xe_display_rps.o \ display/xe_display_rps.o \
display/xe_display_wa.o \
display/xe_dsb_buffer.o \ display/xe_dsb_buffer.o \
display/xe_fb_pin.o \ display/xe_fb_pin.o \
display/xe_hdcp_gsc.o \ display/xe_hdcp_gsc.o \
......
// SPDX-License-Identifier: MIT
/*
* Copyright © 2024 Intel Corporation
*/
#include "intel_display_wa.h"
#include "xe_device.h"
#include "xe_wa.h"
#include <generated/xe_wa_oob.h>
bool intel_display_needs_wa_16023588340(struct drm_i915_private *i915)
{
return XE_WA(xe_root_mmio_gt(i915), 16023588340);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment