Merge tag 'drm-misc-next-2018-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v4.21, part 1: UAPI Changes: - Add syncobj timeline support to drm. Cross-subsystem Changes: - Remove shared fence staging in dma-buf's fence object, and allow reserving more than 1 fence and add more paranoia when debugging. - Constify infoframe functions in video/hdmi. Core Changes: - Add vkms todo, and a lot of assorted doc fixes. - Drop transitional helpers and convert drivers to use drm_atomic_helper_shutdown(). - Move atomic state helper functions to drm_atomic_state_helper.[ch] - Refactor drm selftests, and add new tests. - DP MST atomic state cleanups. - Drop EXPORT_SYMBOL from drm leases. - Lease cleanups and fixes. - Create render node for vgem. Driver Changes: - Fix build failure in imx without fbdev emulation. - Add rotation quirk for GPD win2 panel. - Add support for various CDTech panels, Banana Pi Panel, DLC1010GIG, Olimex LCD-O-LinuXino, Samsung S6D16D0, Truly NT35597 WQXGA, Himax HX8357D, simulated RTSM AEMv8. - Add dw_hdmi support to rockchip driver. - Fix YUV support in vc4. - Fix resource id handling in virtio. - Make rockchip use dw-mipi-dsi bridge driver, and add dual dsi support. - Advertise that tinydrm only supports DRM_FORMAT_MOD_LINEAR. - Convert many drivers to use atomic helpers, and drm_fbdev_generic_setup(). - Add Mali linear tiled formats, and enable them in the Mali-DP driver. - Add support for H6 DE3 mixer 0, DW HDMI, HDMI PHY and TCON TOP. - Assorted driver cleanups and fixes. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/be7ebd91-edd9-8fa4-4286-1c57e3165113@linux.intel.com
This commit is contained in:
@ -550,7 +550,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7511_cfg_read_
|
||||
buffer[3] = 0;
|
||||
buffer[3] = hdmi_infoframe_checksum(buffer, len + 4);
|
||||
|
||||
if (hdmi_infoframe_unpack(&frame, buffer) < 0) {
|
||||
if (hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer)) < 0) {
|
||||
v4l2_err(sd, "%s: unpack of %s infoframe failed\n", __func__, cri->desc);
|
||||
return;
|
||||
}
|
||||
|
@ -2420,7 +2420,7 @@ static int adv76xx_read_infoframe(struct v4l2_subdev *sd, int index,
|
||||
buffer[i + 3] = infoframe_read(sd,
|
||||
adv76xx_cri[index].payload_addr + i);
|
||||
|
||||
if (hdmi_infoframe_unpack(frame, buffer) < 0) {
|
||||
if (hdmi_infoframe_unpack(frame, buffer, sizeof(buffer)) < 0) {
|
||||
v4l2_err(sd, "%s: unpack of %s infoframe failed\n", __func__,
|
||||
adv76xx_cri[index].desc);
|
||||
return -ENOENT;
|
||||
|
@ -2574,7 +2574,7 @@ static void log_infoframe(struct v4l2_subdev *sd, struct adv7842_cfg_read_infofr
|
||||
for (i = 0; i < len; i++)
|
||||
buffer[i + 3] = infoframe_read(sd, cri->payload_addr + i);
|
||||
|
||||
if (hdmi_infoframe_unpack(&frame, buffer) < 0) {
|
||||
if (hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer)) < 0) {
|
||||
v4l2_err(sd, "%s: unpack of %s infoframe failed\n", __func__, cri->desc);
|
||||
return;
|
||||
}
|
||||
|
@ -444,7 +444,7 @@ static void print_avi_infoframe(struct v4l2_subdev *sd)
|
||||
|
||||
i2c_rd(sd, PK_AVI_0HEAD, buffer, HDMI_INFOFRAME_SIZE(AVI));
|
||||
|
||||
if (hdmi_infoframe_unpack(&frame, buffer) < 0) {
|
||||
if (hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer)) < 0) {
|
||||
v4l2_err(sd, "%s: unpack of AVI infoframe failed\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
@ -1253,7 +1253,7 @@ tda1997x_parse_infoframe(struct tda1997x_state *state, u16 addr)
|
||||
|
||||
/* read data */
|
||||
len = io_readn(sd, addr, sizeof(buffer), buffer);
|
||||
err = hdmi_infoframe_unpack(&frame, buffer);
|
||||
err = hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer));
|
||||
if (err) {
|
||||
v4l_err(state->client,
|
||||
"failed parsing %d byte infoframe: 0x%04x/0x%02x\n",
|
||||
@ -1928,7 +1928,7 @@ static int tda1997x_log_infoframe(struct v4l2_subdev *sd, int addr)
|
||||
/* read data */
|
||||
len = io_readn(sd, addr, sizeof(buffer), buffer);
|
||||
v4l2_dbg(1, debug, sd, "infoframe: addr=%d len=%d\n", addr, len);
|
||||
err = hdmi_infoframe_unpack(&frame, buffer);
|
||||
err = hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer));
|
||||
if (err) {
|
||||
v4l_err(state->client,
|
||||
"failed parsing %d byte infoframe: 0x%04x/0x%02x\n",
|
||||
|
Reference in New Issue
Block a user