diff mbox

[1/3] drm/edid: quirk Oculus Rift headsets as non-desktop

Message ID 20180219175938.20713-1-philipp.zabel@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Philipp Zabel Feb. 19, 2018, 5:59 p.m. UTC
This uses the EDID info from Oculus Rift DK1 (OVR-0001), DK2 (OVR-0003),
and CV1 (OVR-0004) to mark them as non-desktop.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
---
 drivers/gpu/drm/drm_edid.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Jani Nikula Feb. 20, 2018, 11:56 a.m. UTC | #1
On Mon, 19 Feb 2018, Philipp Zabel <philipp.zabel@gmail.com> wrote:
> This uses the EDID info from Oculus Rift DK1 (OVR-0001), DK2 (OVR-0003),
> and CV1 (OVR-0004) to mark them as non-desktop.

Not that I know anything about this stuff, but should this series be cc:
stable?

BR,
Jani.


> Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
> ---
>  drivers/gpu/drm/drm_edid.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index b1cb2627548f..15cae50f66ba 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -162,6 +162,11 @@ static const struct edid_quirk {
>  
>  	/* HTC Vive VR Headset */
>  	{ "HVR", 0xaa01, EDID_QUIRK_NON_DESKTOP },
> +
> +	/* Oculus Rift DK1, DK2, and CV1 VR Headsets */
> +	{ "OVR", 0x0001, EDID_QUIRK_NON_DESKTOP },
> +	{ "OVR", 0x0003, EDID_QUIRK_NON_DESKTOP },
> +	{ "OVR", 0x0004, EDID_QUIRK_NON_DESKTOP },
>  };
>  
>  /*
Philipp Zabel Feb. 20, 2018, 5:58 p.m. UTC | #2
On Tue, Feb 20, 2018 at 12:56 PM, Jani Nikula
<jani.nikula@linux.intel.com> wrote:
> On Mon, 19 Feb 2018, Philipp Zabel <philipp.zabel@gmail.com> wrote:
>> This uses the EDID info from Oculus Rift DK1 (OVR-0001), DK2 (OVR-0003),
>> and CV1 (OVR-0004) to mark them as non-desktop.
>
> Not that I know anything about this stuff, but should this series be cc:
> stable?

I guess it could be:

Cc: <stable@vger.kernel.org> # 4.15.x

Older kernels didn't receive the prerequisite patches
66660d4cf21b ("drm: add connector info/property for non-desktop displays [v2]"),
b5f053882ff1 ("drm/fb: add support for not enabling fbcon on
non-desktop displays [v2]"),
and acb1d8eee508 ("drm/edid: quirk HTC vive headset as non-desktop. [v2]").

Should these be backported to older kernels as well, to avoid burning
the fbdev console into VR headset OLED displays? Note that DRM leases
landed in v4.15 as well, so anybody trying to actually use these on
Linux will likely not run an older kernel.

regards
Philipp
Keith Packard Feb. 20, 2018, 10:12 p.m. UTC | #3
Philipp Zabel <philipp.zabel@gmail.com> writes:

> Should these be backported to older kernels as well, to avoid burning
> the fbdev console into VR headset OLED displays?

I don't think so; it's a bunch of code to backport, and the matching
code for the X desktop hasn't even landed upstream yet. Wayland doesn't
even have a proposed specification for this stuff yet.
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index b1cb2627548f..15cae50f66ba 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -162,6 +162,11 @@  static const struct edid_quirk {
 
 	/* HTC Vive VR Headset */
 	{ "HVR", 0xaa01, EDID_QUIRK_NON_DESKTOP },
+
+	/* Oculus Rift DK1, DK2, and CV1 VR Headsets */
+	{ "OVR", 0x0001, EDID_QUIRK_NON_DESKTOP },
+	{ "OVR", 0x0003, EDID_QUIRK_NON_DESKTOP },
+	{ "OVR", 0x0004, EDID_QUIRK_NON_DESKTOP },
 };
 
 /*