mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
linux (Generic): [V2] drm/i915/glk: Add Quirk for GLK NUC HDMI port issues
This commit is contained in:
parent
c7642d72ff
commit
e74f411447
@ -0,0 +1,75 @@
|
||||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
|
||||
index be8c2f0..da196b4 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_drv.h
|
||||
+++ b/drivers/gpu/drm/i915/i915_drv.h
|
||||
@@ -656,6 +656,7 @@ enum intel_sbi_destination {
|
||||
#define QUIRK_BACKLIGHT_PRESENT (1<<3)
|
||||
#define QUIRK_PIN_SWIZZLED_PAGES (1<<5)
|
||||
#define QUIRK_INCREASE_T12_DELAY (1<<6)
|
||||
+#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)
|
||||
|
||||
struct intel_fbdev;
|
||||
struct intel_fbc_work;
|
||||
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
|
||||
index ca73387..bc3d012 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_ddi.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_ddi.c
|
||||
@@ -1791,6 +1791,9 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
|
||||
I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);
|
||||
}
|
||||
|
||||
+/* Quirk time computed based on 24fps frame time of 41.25ms */
|
||||
+#define DDI_DISABLED_QUIRK_TIME 42
|
||||
+
|
||||
void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
|
||||
enum transcoder cpu_transcoder)
|
||||
{
|
||||
@@ -1800,6 +1803,11 @@ void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
|
||||
val &= ~(TRANS_DDI_FUNC_ENABLE | TRANS_DDI_PORT_MASK | TRANS_DDI_DP_VC_PAYLOAD_ALLOC);
|
||||
val |= TRANS_DDI_PORT_NONE;
|
||||
I915_WRITE(reg, val);
|
||||
+
|
||||
+ if (dev_priv->quirks & QUIRK_INCREASE_DDI_DISABLED_TIME) {
|
||||
+ msleep(DDI_DISABLED_QUIRK_TIME);
|
||||
+ DRM_DEBUG_KMS("Quirk Increase DDI disabled time\n");
|
||||
+ }
|
||||
}
|
||||
|
||||
int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,
|
||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
||||
index 8251e18..40e0306 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
||||
@@ -14749,6 +14749,17 @@ static void quirk_increase_t12_delay(struct drm_device *dev)
|
||||
DRM_INFO("Applying T12 delay quirk\n");
|
||||
}
|
||||
|
||||
+/* GeminiLake NUC HDMI outputs require additional off time
|
||||
+ * this allows the onboard retimer to correctly sync to signal
|
||||
+ */
|
||||
+static void quirk_increase_ddi_disabled_time(struct drm_device *dev)
|
||||
+{
|
||||
+ struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
+
|
||||
+ dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME;
|
||||
+ DRM_INFO("Applying Increase DDI Disabled quirk\n");
|
||||
+}
|
||||
+
|
||||
struct intel_quirk {
|
||||
int device;
|
||||
int subsystem_vendor;
|
||||
@@ -14835,6 +14846,14 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
|
||||
|
||||
/* Toshiba Satellite P50-C-18C */
|
||||
{ 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay },
|
||||
+
|
||||
+ /* GeminiLake NUC */
|
||||
+ { 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
|
||||
+ { 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
|
||||
+ /* ASRock ITX*/
|
||||
+ { 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
|
||||
+ { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
|
||||
+
|
||||
};
|
||||
|
||||
static void intel_init_quirks(struct drm_device *dev)
|
Loading…
x
Reference in New Issue
Block a user