Commit 43102a20 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-09-26' of... 

Merge tag 'drm-misc-fixes-2024-09-26' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Short summary of fixes pull:

atomic:
- Use correct type when reading damage rectangles

display:
- Fix kernel docs

dp-mst:
- Fix DSC decompression detection

hdmi:
- Fix infoframe size

panthor:
- Fix locking

sched:
- Update maintainers
- Fix race condition whne queueing up jobs

sysfb:
- Disable sysfb if framebuffer parent device is unknown

vbox:
- Fix VLA handling

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240926121045.GA561653@localhost.localdomain
parents 9852d85e ad604f0a

Documentation/gpu/drm-kms-helpers.rst

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ Bridge Operations 
Bridge Connector Helper

-----------------------



.. kernel-doc:: drivers/gpu/drm/drm_bridge_connector.c

.. kernel-doc:: drivers/gpu/drm/display/drm_bridge_connector.c

   :doc: overview
@@ -204,7 +204,7 @@ MIPI-DSI bridge operation 
Bridge Connector Helper Reference

---------------------------------



.. kernel-doc:: drivers/gpu/drm/drm_bridge_connector.c

.. kernel-doc:: drivers/gpu/drm/display/drm_bridge_connector.c

   :export:



Panel-Bridge Helper Reference

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7832,6 +7832,8 @@ F: drivers/gpu/drm/xlnx/ 
DRM GPU SCHEDULER

M:	Luben Tuikov <ltuikov89@gmail.com>

M:	Matthew Brost <matthew.brost@intel.com>

M:	Danilo Krummrich <dakr@kernel.org>

M:	Philipp Stanner <pstanner@redhat.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git

drivers/firmware/sysfb.c

+3 −1
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ static bool sysfb_unregister(void) 
void sysfb_disable(struct device *dev)

{

	struct screen_info *si = &screen_info;

	struct device *parent;



	mutex_lock(&disable_lock);

	if (!dev || dev == sysfb_parent_dev(si)) {

	parent = sysfb_parent_dev(si);

	if (!dev || !parent || dev == parent) {

		sysfb_unregister();

		disabled = true;

	}

drivers/gpu/drm/display/drm_dp_mst_topology.c

+8 −2
Original line number Diff line number Diff line
@@ -6083,6 +6083,7 @@ struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port) 
	struct drm_dp_aux *immediate_upstream_aux;

	struct drm_dp_mst_port *fec_port;

	struct drm_dp_desc desc = {};

	u8 upstream_dsc;

	u8 endpoint_fec;

	u8 endpoint_dsc;
@@ -6109,8 +6110,6 @@ struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port) 


	/* DP-to-DP peer device */

	if (drm_dp_mst_is_virtual_dpcd(immediate_upstream_port)) {

		u8 upstream_dsc;



		if (drm_dp_dpcd_read(&port->aux,

				     DP_DSC_SUPPORT, &endpoint_dsc, 1) != 1)

			return NULL;
@@ -6156,6 +6155,13 @@ struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port) 
	if (drm_dp_has_quirk(&desc, DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD)) {

		u8 dpcd_ext[DP_RECEIVER_CAP_SIZE];



		if (drm_dp_dpcd_read(immediate_upstream_aux,

				     DP_DSC_SUPPORT, &upstream_dsc, 1) != 1)

			return NULL;



		if (!(upstream_dsc & DP_DSC_DECOMPRESSION_IS_SUPPORTED))

			return NULL;



		if (drm_dp_read_dpcd_caps(immediate_upstream_aux, dpcd_ext) < 0)

			return NULL;

drivers/gpu/drm/display/drm_hdmi_state_helper.c

+1 −3
Original line number Diff line number Diff line
@@ -521,8 +521,6 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, 
}

EXPORT_SYMBOL(drm_atomic_helper_connector_hdmi_check);



#define HDMI_MAX_INFOFRAME_SIZE		29



static int clear_device_infoframe(struct drm_connector *connector,

				  enum hdmi_infoframe_type type)

{
@@ -563,7 +561,7 @@ static int write_device_infoframe(struct drm_connector *connector, 
{

	const struct drm_connector_hdmi_funcs *funcs = connector->hdmi.funcs;

	struct drm_device *dev = connector->dev;

	u8 buffer[HDMI_MAX_INFOFRAME_SIZE];

	u8 buffer[HDMI_INFOFRAME_SIZE(MAX)];

	int ret;

	int len;