Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Lyude Paul <lyude@redhat.com>
To:     intel-gfx@lists.freedesktop.org
Cc:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Chris Wilson <chris@chris-wilson.co.uk>,
        Lee Shawn C <shawn.c.lee@intel.com>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] drm/i915: Force DPCD backlight mode on X1 Extreme 2nd Gen 4K AMOLED panel
Date:   Fri, 22 Nov 2019 18:16:03 -0500
Message-Id: <20191122231616.2574-6-lyude@redhat.com>
In-Reply-To: <20191122231616.2574-1-lyude@redhat.com>
References: <20191122231616.2574-1-lyude@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Annoyingly, the VBT on the ThinkPad X1 Extreme 2nd Gen indicates that
the system uses plain PWM based backlight controls, when in reality the
only backlight controls that work are the standard VESA eDP DPCD
backlight controls.

Honestly, this makes me wonder how many other systems have these issues
or lie about this in their VBT. Not sure we have any good way of finding
out until panels like this become more common place in the laptop
market. For now, just add a DRM DP quirk to indicate that this panel is
telling the truth and is being a good LCD.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D112376
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
 drivers/gpu/drm/drm_dp_helper.c                       |  4 ++++
 drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 10 ++++++++--
 include/drm/drm_dp_helper.h                           |  8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helpe=
r.c
index 2c7870aef469..ec7061e3a99b 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -1155,6 +1155,10 @@ static const struct dpcd_quirk dpcd_quirk_list[] =3D=
 {
 =09{ OUI(0x00, 0x10, 0xfa), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_NO_PSR=
) },
 =09/* CH7511 seems to leave SINK_COUNT zeroed */
 =09{ OUI(0x00, 0x00, 0x00), DEVICE_ID('C', 'H', '7', '5', '1', '1'), false=
, BIT(DP_DPCD_QUIRK_NO_SINK_COUNT) },
+=09/* Optional 4K AMOLED panel in the ThinkPad X1 Extreme 2nd Generation
+=09 * only supports DPCD backlight controls, despite advertising otherwise
+=09 */
+=09{ OUI(0xba, 0x41, 0x59), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_FORCE_=
DPCD_BACKLIGHT) },
 };
=20
 #undef OUI
diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/driver=
s/gpu/drm/i915/display/intel_dp_aux_backlight.c
index 87b59db9ffe3..3d61260b08ad 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
@@ -325,11 +325,17 @@ intel_dp_aux_display_control_capable(struct intel_con=
nector *connector)
 int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connec=
tor)
 {
 =09struct intel_panel *panel =3D &intel_connector->panel;
-=09struct drm_i915_private *dev_priv =3D to_i915(intel_connector->base.dev=
);
+=09struct intel_dp *intel_dp =3D
+=09=09enc_to_intel_dp(&intel_connector->encoder->base);
+=09struct drm_i915_private *dev_priv =3D
+=09=09to_i915(intel_connector->base.dev);
=20
 =09if (i915_modparams.enable_dpcd_backlight =3D=3D 0 ||
 =09    (i915_modparams.enable_dpcd_backlight =3D=3D -1 &&
-=09    dev_priv->vbt.backlight.type !=3D INTEL_BACKLIGHT_VESA_EDP_AUX_INTE=
RFACE))
+=09     dev_priv->vbt.backlight.type !=3D
+=09=09     INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE &&
+=09     !drm_dp_has_quirk(&intel_dp->desc,
+=09=09=09       DP_DPCD_QUIRK_FORCE_DPCD_BACKLIGHT)))
 =09=09return -ENODEV;
=20
 =09if (!intel_dp_aux_display_control_capable(intel_connector))
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 51ecb5112ef8..a444209cd54b 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -1520,6 +1520,14 @@ enum drm_dp_quirk {
 =09 * The driver should ignore SINK_COUNT during detection.
 =09 */
 =09DP_DPCD_QUIRK_NO_SINK_COUNT,
+=09/**
+=09 * @DP_DPCD_QUIRK_FORCE_DPCD_BACKLIGHT:
+=09 *
+=09 * The device is telling the truth when it says that it uses DPCD
+=09 * backlight controls, even if the system's firmware disagrees.
+=09 * The driver should honor the DPCD backlight capabilities advertised.
+=09 */
+=09DP_DPCD_QUIRK_FORCE_DPCD_BACKLIGHT,
 };
=20
 /**
--=20
2.21.0