All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alastair Bridgewater <alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: [PATCH v2 04/10] drm/nouveau: Add mechanism to convert HDMI InfoFrames to hardware format
Date: Mon, 27 Mar 2017 17:58:01 -0400	[thread overview]
Message-ID: <20170327215807.8461-5-alastair.bridgewater@gmail.com> (raw)
In-Reply-To: <20170327215807.8461-1-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

HDMI InfoFrames are passed to NVKM as bags of bytes, but the
hardware needs them to be packed into words.  Rather than having
four (or more) copies of the packing logic introduce a single copy
now, in a central place.

We currently need these for AVI and Vendor InfoFrames, but we may
also expect to need them for Audio InfoFrames at some point.

Signed-off-by: Alastair Bridgewater <alastair.bridgewater@gmail.com>
---
 drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild    |  1 +
 .../drm/nouveau/nvkm/engine/disp/hdmi_infoframe.c  | 66 ++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h    | 11 ++++
 3 files changed, 78 insertions(+)
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi_infoframe.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
index fa05d16..65ae870 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
@@ -29,6 +29,7 @@ nvkm-y += nvkm/engine/disp/conn.o
 nvkm-y += nvkm/engine/disp/hdagt215.o
 nvkm-y += nvkm/engine/disp/hdagf119.o
 
+nvkm-y += nvkm/engine/disp/hdmi_infoframe.o
 nvkm-y += nvkm/engine/disp/hdmig84.o
 nvkm-y += nvkm/engine/disp/hdmigt215.o
 nvkm-y += nvkm/engine/disp/hdmigf119.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi_infoframe.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi_infoframe.c
new file mode 100644
index 0000000..e04f2e8
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi_infoframe.c
@@ -0,0 +1,66 @@
+#include "nv50.h"
+
+void pack_hdmi_infoframe(struct packed_hdmi_infoframe *packed_frame,
+			 u8 *raw_frame, ssize_t len)
+{
+	u32 header = 0;
+	u32 subpack0_low = 0;
+	u32 subpack0_high = 0;
+	u32 subpack1_low = 0;
+	u32 subpack1_high = 0;
+
+	switch (len) {
+		/*
+		 * "When in doubt, use brute force."
+		 *     -- Ken Thompson.
+		 */
+	default:
+		/*
+		 * We presume that no valid frame is longer than 17
+		 * octets, including header...  And truncate to that
+		 * if it's longer.
+		 */
+	case 17:
+		subpack1_high = (raw_frame[16] << 16);
+	case 16:
+		subpack1_high |= (raw_frame[15] << 8);
+	case 15:
+		subpack1_high |= raw_frame[14];
+	case 14:
+		subpack1_low = (raw_frame[13] << 24);
+	case 13:
+		subpack1_low |= (raw_frame[12] << 16);
+	case 12:
+		subpack1_low |= (raw_frame[11] << 8);
+	case 11:
+		subpack1_low |= raw_frame[10];
+	case 10:
+		subpack0_high = (raw_frame[9] << 16);
+	case 9:
+		subpack0_high |= (raw_frame[8] << 8);
+	case 8:
+		subpack0_high |= raw_frame[7];
+	case 7:
+		subpack0_low = (raw_frame[6] << 24);
+	case 6:
+		subpack0_low |= (raw_frame[5] << 16);
+	case 5:
+		subpack0_low |= (raw_frame[4] << 8);
+	case 4:
+		subpack0_low |= raw_frame[3];
+	case 3:
+		header = (raw_frame[2] << 16);
+	case 2:
+		header |= (raw_frame[1] << 8);
+	case 1:
+		header |= raw_frame[0];
+	case 0:
+		break;
+	}
+
+	packed_frame->header = header;
+	packed_frame->subpack0_low = subpack0_low;
+	packed_frame->subpack0_high = subpack0_high;
+	packed_frame->subpack1_low = subpack1_low;
+	packed_frame->subpack1_high = subpack1_high;
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
index 1e1de6b..37ec2a1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
@@ -40,6 +40,17 @@ int nv50_dac_sense(NV50_DISP_MTHD_V1);
 int gt215_hda_eld(NV50_DISP_MTHD_V1);
 int gf119_hda_eld(NV50_DISP_MTHD_V1);
 
+struct packed_hdmi_infoframe {
+	u32 header;
+	u32 subpack0_low;
+	u32 subpack0_high;
+	u32 subpack1_low;
+	u32 subpack1_high;
+};
+
+void pack_hdmi_infoframe(struct packed_hdmi_infoframe *packed_frame,
+			 u8 *raw_frame, ssize_t len);
+
 int g84_hdmi_ctrl(NV50_DISP_MTHD_V1);
 int gt215_hdmi_ctrl(NV50_DISP_MTHD_V1);
 int gf119_hdmi_ctrl(NV50_DISP_MTHD_V1);
-- 
2.10.2

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

  parent reply	other threads:[~2017-03-27 21:58 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-17 22:41 [PATCH 0/6] drm/nouveau: Enable HDMI Stereoscopy Alastair Bridgewater
     [not found] ` <20170117224204.27516-1-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-01-17 22:41   ` [PATCH 1/6] drm/nouveau: Extend NVKM HDMI power control method to set InfoFrames Alastair Bridgewater
     [not found]     ` <20170117224204.27516-2-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-01-18  3:19       ` Ilia Mirkin
2017-01-17 22:42   ` [PATCH 2/6] drm/nouveau: Pass mode-dependent AVI and Vendor HDMI InfoFrames to NVKM Alastair Bridgewater
     [not found]     ` <20170117224204.27516-3-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-01-18  3:31       ` Ilia Mirkin
2017-01-17 22:42   ` [PATCH 3/6] drm/nouveau: Use supplied HDMI InfoFrames on GT215 hardware Alastair Bridgewater
2017-01-17 22:42   ` [PATCH 4/6] drm/nouveau: Use supplied HDMI InfoFrames on GK104 hardware Alastair Bridgewater
2017-01-17 22:42   ` [PATCH 5/6] drm: Delete "mandatory" stereographic modes Alastair Bridgewater
     [not found]     ` <20170117224204.27516-6-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-01-18  5:10       ` Ilia Mirkin
     [not found]         ` <CAKb7UvigMUdD93eqa=3bM9VHSGztV3DWgv-8hx8ho7EmHrhtqA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-18 11:45           ` Damien Lespiau
     [not found]             ` <20170118114554.GA6460-q+Y1yDQJ1rIB9AHHLWeGtNQXobZC6xk2@public.gmane.org>
2017-01-18 16:27               ` Ilia Mirkin
     [not found]                 ` <CAKb7Uvg0wgmZG+S39XNP-r0Qny6ikDhwvyy9TAspOZQ_dEp1RQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-18 16:33                   ` Damien Lespiau
     [not found]                     ` <20170118163343.GD6460-q+Y1yDQJ1rIB9AHHLWeGtNQXobZC6xk2@public.gmane.org>
2017-01-18 16:41                       ` Damien Lespiau
2017-01-18 16:57                         ` [Nouveau] " Ilia Mirkin
2017-01-18 18:48                           ` Ilia Mirkin
     [not found]                             ` <CAKb7UviODH0YPH-EMUmO9Ssu5BrBb3GVa82SGawbQbiO5NKXAw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-18 19:01                               ` Damien Lespiau
     [not found]                                 ` <20170118190119.GF6460-q+Y1yDQJ1rIB9AHHLWeGtNQXobZC6xk2@public.gmane.org>
2017-01-18 21:35                                   ` Alastair Bridgewater
2017-01-17 22:42   ` [PATCH 6/6] drm/nouveau: Enable stereoscopic 3D output over HDMI Alastair Bridgewater
2017-03-27 21:57   ` [PATCH v2 00/10] Enable HDMI Stereoscopy Alastair Bridgewater
     [not found]     ` <20170327215807.8461-1-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-27 21:57       ` [PATCH v2 01/10] drm/nouveau: Use drm_mode_set_crtcinfo() to compensate for vscan / ilace Alastair Bridgewater
2017-03-27 21:57       ` [PATCH v2 02/10] drm/nouveau: Extend NVKM HDMI power control method to set InfoFrames Alastair Bridgewater
2017-03-27 21:58       ` [PATCH v2 03/10] drm/nouveau: Pass mode-dependent AVI and Vendor HDMI InfoFrames to NVKM Alastair Bridgewater
2017-03-27 21:58       ` Alastair Bridgewater [this message]
2017-03-27 21:58       ` [PATCH v2 05/10] drm/nouveau: Use supplied HDMI InfoFrames on G84 hardware Alastair Bridgewater
2017-03-27 21:58       ` [PATCH v2 06/10] drm/nouveau: Use supplied HDMI InfoFrames on GT215 hardware Alastair Bridgewater
2017-03-27 21:58       ` [PATCH v2 07/10] drm/nouveau: Use supplied HDMI InfoFrames on GF119 hardware Alastair Bridgewater
2017-03-27 21:58       ` [PATCH v2 08/10] drm/nouveau: Use supplied HDMI InfoFrames on GK104 hardware Alastair Bridgewater
2017-03-27 21:58       ` [PATCH v2 09/10] drm/nouveau: Handle frame-packing mode geometry and timing effects Alastair Bridgewater
     [not found]         ` <20170327215807.8461-10-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-28  1:54           ` kbuild test robot
2017-03-27 21:58       ` [PATCH v2 10/10] drm/nouveau: Enable stereoscopic 3D output over HDMI Alastair Bridgewater
2017-03-29 12:02       ` [PATCH v2 00/10] Enable HDMI Stereoscopy Ville Syrjälä
     [not found]         ` <20170329120247.GX30290-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-03-29 14:24           ` Alastair Bridgewater
     [not found]             ` <CAEcYz2Qb74b27efw=s+ZSSO4SEQQ2_mVKXz4D3za1GkVh_AHgg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-03-29 14:42               ` Ville Syrjälä
2017-03-29 14:48               ` Ilia Mirkin
2017-04-11 17:11   ` [PATCH v3 00/10] drm/nouveau " Alastair Bridgewater
     [not found]     ` <20170411171125.10496-1-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-04-11 17:11       ` [PATCH v3 01/10] drm/nouveau: Clean up nv50_head_atomic_check_mode() and fix blankus calculation Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 02/10] drm/nouveau: Extend NVKM HDMI power control method to set InfoFrames Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 03/10] drm/nouveau: Pass mode-dependent AVI and Vendor HDMI InfoFrames to NVKM Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 04/10] drm/nouveau: Add mechanism to convert HDMI InfoFrames to hardware format Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 05/10] drm/nouveau: Use supplied HDMI InfoFrames on G84 hardware Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 06/10] drm/nouveau: Use supplied HDMI InfoFrames on GT215 hardware Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 07/10] drm/nouveau: Use supplied HDMI InfoFrames on GF119 hardware Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 08/10] drm/nouveau: Use supplied HDMI InfoFrames on GK104 hardware Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 09/10] drm/nouveau: Handle frame-packing mode geometry and timing effects Alastair Bridgewater
2017-04-11 17:11       ` [PATCH v3 10/10] drm/nouveau: Enable stereoscopic 3D output over HDMI Alastair Bridgewater
2017-04-11 17:32         ` [Nouveau] " Ilia Mirkin
     [not found]           ` <CAKb7UvjimkWMZdi1-NwWDf6BK99d1epo+i1dwrONQYrcf+n57A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-12 15:22             ` Alastair Bridgewater
2017-04-13  8:34               ` [Nouveau] " Ben Skeggs

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170327215807.8461-5-alastair.bridgewater@gmail.com \
    --to=alastair.bridgewater-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.