Commit e5dc4f66 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2025-03-10' of... 

Merge tag 'drm-intel-next-2025-03-10' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

drm/i915 feature pull #2 for v6.15:

Features and functionality:
- FBC dirty rectangle support for display version 30+ (Vinod)
- Update plane scalers via DSB based commits (Ville)
- Move runtime power status info to display power debugfs (Jani)

Refactoring and cleanups:
- Convert i915 and xe to DRM client setup (Thomas)
- Refactor and clean up CDCLK/bw/dbuf readout/sanitation (Ville)
- Conversions from drm_i915_private to struct intel_display (Jani, Suraj)
- Refactor display reset for better separation between display and core (Jani)
- Move panel fitter code together (Jani)
- Add mst and hdcp sub-structs to display structs for clarity (Jani)
- Header refactoring to clarify separation between display and i915 core (Jani)

Fixes:
- Fix DP MST max stream count to match number of pipes (Jani)
- Fix encoder HW state readout of DP MST UHBR (Imre)
- Fix ICL+ combo PHY cursor and coeff polarity programming (Ville)
- Fix pipeDMC and ATS fault handling (Ville)
- Display workarounds (Gustavo)
- Remove duplicate forward declaration (Vinod)
- Improve POWER_DOMAIN_*() macro type safety (Gustavo)
- Move CDCLK post plane programming later (Ville)

DRM core changes:
- Add client-hotplug helper (Thomas)
- Send pending hotplug events after client resume (Thomas)
- Add fb_restore and fb_set_suspend fb helper hooks (Thomas)
- Remove struct fb_probe fb helper hook (Thomas)
- Add const qualifier to drm_atomic_helper_damage_merged() (Vinod)

Xe driver changes:
- Convert i915 and xe to DRM client setup (Thomas)
- Refactor i915 compat headers (Jani)
- Fix fbdev GGTT mapping handling (Maarten)
- Figure out pxp instance from the gem object (Jani)

Merges:
- Backmerge drm-next to fix conflicts with drm-xe-next (Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87o6y9gpub.fsf@intel.com
parents 11a5c644 bb800b56

drivers/gpu/drm/drm_client_event.c

+28 −13
Original line number Diff line number Diff line
@@ -49,6 +49,29 @@ void drm_client_dev_unregister(struct drm_device *dev) 
}

EXPORT_SYMBOL(drm_client_dev_unregister);



static void drm_client_hotplug(struct drm_client_dev *client)

{

	struct drm_device *dev = client->dev;

	int ret;



	if (!client->funcs || !client->funcs->hotplug)

		return;



	if (client->hotplug_failed)

		return;



	if (client->suspended) {

		client->hotplug_pending = true;

		return;

	}



	client->hotplug_pending = false;

	ret = client->funcs->hotplug(client);

	drm_dbg_kms(dev, "%s: ret=%d\n", client->name, ret);

	if (ret)

		client->hotplug_failed = true;

}



/**

 * drm_client_dev_hotplug - Send hotplug event to clients

 * @dev: DRM device
@@ -61,7 +84,6 @@ EXPORT_SYMBOL(drm_client_dev_unregister); 
void drm_client_dev_hotplug(struct drm_device *dev)

{

	struct drm_client_dev *client;

	int ret;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return;
@@ -72,18 +94,8 @@ void drm_client_dev_hotplug(struct drm_device *dev) 
	}



	mutex_lock(&dev->clientlist_mutex);

	list_for_each_entry(client, &dev->clientlist, list) {

		if (!client->funcs || !client->funcs->hotplug)

			continue;



		if (client->hotplug_failed)

			continue;



		ret = client->funcs->hotplug(client);

		drm_dbg_kms(dev, "%s: ret=%d\n", client->name, ret);

		if (ret)

			client->hotplug_failed = true;

	}

	list_for_each_entry(client, &dev->clientlist, list)

		drm_client_hotplug(client);

	mutex_unlock(&dev->clientlist_mutex);

}

EXPORT_SYMBOL(drm_client_dev_hotplug);
@@ -153,6 +165,9 @@ static int drm_client_resume(struct drm_client_dev *client, bool holds_console_l 


	client->suspended = false;



	if (client->hotplug_pending)

		drm_client_hotplug(client);



	return ret;

}

drivers/gpu/drm/drm_damage_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ EXPORT_SYMBOL(drm_atomic_helper_damage_iter_next); 
 * True if there is valid plane damage otherwise false.

 */

bool drm_atomic_helper_damage_merged(const struct drm_plane_state *old_state,

				     struct drm_plane_state *state,

				     const struct drm_plane_state *state,

				     struct drm_rect *rect)

{

	struct drm_atomic_helper_damage_iter iter;

drivers/gpu/drm/drm_fb_helper.c

+14 −6
Original line number Diff line number Diff line
@@ -245,6 +245,9 @@ __drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper, 
	if (do_delayed)

		drm_fb_helper_hotplug_event(fb_helper);



	if (fb_helper->funcs->fb_restore)

		fb_helper->funcs->fb_restore(fb_helper);



	return ret;

}
@@ -754,7 +757,12 @@ EXPORT_SYMBOL(drm_fb_helper_deferred_io); 
 */

void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, bool suspend)

{

	if (fb_helper && fb_helper->info)

	if (!fb_helper || !fb_helper->info)

		return;



	if (fb_helper->funcs->fb_set_suspend)

		fb_helper->funcs->fb_set_suspend(fb_helper, suspend);

	else

		fb_set_suspend(fb_helper->info, suspend);

}

EXPORT_SYMBOL(drm_fb_helper_set_suspend);
@@ -800,7 +808,7 @@ void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper, 
		}

	}



	fb_set_suspend(fb_helper->info, suspend);

	drm_fb_helper_set_suspend(fb_helper, suspend);

	console_unlock();

}

EXPORT_SYMBOL(drm_fb_helper_set_suspend_unlocked);
@@ -1626,6 +1634,9 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper) 
	struct fb_info *info;

	int ret;



	if (drm_WARN_ON(dev, !dev->driver->fbdev_probe))

		return -EINVAL;



	ret = drm_fb_helper_find_sizes(fb_helper, &sizes);

	if (ret) {

		/* First time: disable all crtc's.. */
@@ -1635,10 +1646,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper) 
	}



	/* push down into drivers */

	if (dev->driver->fbdev_probe)

	ret = dev->driver->fbdev_probe(fb_helper, &sizes);

	else if (fb_helper->funcs)

		ret = fb_helper->funcs->fb_probe(fb_helper, &sizes);

	if (ret < 0)

		return ret;

drivers/gpu/drm/i915/display/g4x_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ bool g4x_dp_init(struct intel_display *display, 


	intel_encoder->devdata = devdata;



	mutex_init(&dig_port->hdcp_mutex);

	mutex_init(&dig_port->hdcp.mutex);



	if (drm_encoder_init(display->drm, &intel_encoder->base,

			     &intel_dp_enc_funcs, DRM_MODE_ENCODER_TMDS,

drivers/gpu/drm/i915/display/g4x_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ bool g4x_hdmi_init(struct intel_display *display, 


	intel_encoder->devdata = devdata;



	mutex_init(&dig_port->hdcp_mutex);

	mutex_init(&dig_port->hdcp.mutex);



	if (drm_encoder_init(display->drm, &intel_encoder->base,

			     &intel_hdmi_enc_funcs, DRM_MODE_ENCODER_TMDS,