Commit 864204e4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-fixes-2024-07-11' of... 

Merge tag 'drm-xe-next-fixes-2024-07-11' of https://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next

UAPI Changes:
- Rename xe perf layer as xe observation layer (Ashutosh)

Driver Changes:
- Drop trace_xe_hw_fence_free (Brost)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Zo_3ustogPDVKZwu@intel.com
parents 38e73004 26d28915

drivers/gpu/drm/drm_atomic.c

+2 −5
Original line number Diff line number Diff line
@@ -608,7 +608,6 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 
	unsigned int fb_width, fb_height;

	struct drm_mode_rect *clips;

	uint32_t num_clips;

	int ret;



	/* either *both* CRTC and FB must be set, or neither */

	if (crtc && !fb) {
@@ -635,14 +634,12 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 
	}



	/* Check whether this plane supports the fb pixel format. */

	ret = drm_plane_check_pixel_format(plane, fb->format->format,

					   fb->modifier);

	if (ret) {

	if (!drm_plane_has_format(plane, fb->format->format, fb->modifier)) {

		drm_dbg_atomic(plane->dev,

			       "[PLANE:%d:%s] invalid pixel format %p4cc, modifier 0x%llx\n",

			       plane->base.id, plane->name,

			       &fb->format->format, fb->modifier);

		return ret;

		return -EINVAL;

	}



	/* Give drivers some help against integer overflows */

drivers/gpu/drm/drm_crtc.c

+2 −4
Original line number Diff line number Diff line
@@ -789,12 +789,10 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
		 * case.

		 */

		if (!plane->format_default) {

			ret = drm_plane_check_pixel_format(plane,

							   fb->format->format,

							   fb->modifier);

			if (ret) {

			if (!drm_plane_has_format(plane, fb->format->format, fb->modifier)) {

				drm_dbg_kms(dev, "Invalid pixel format %p4cc, modifier 0x%llx\n",

					    &fb->format->format, fb->modifier);

				ret = -EINVAL;

				goto out;

			}

		}

drivers/gpu/drm/drm_crtc_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -272,8 +272,6 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
/* drm_plane.c */

int drm_plane_register_all(struct drm_device *dev);

void drm_plane_unregister_all(struct drm_device *dev);

int drm_plane_check_pixel_format(struct drm_plane *plane,

				 u32 format, u64 modifier);

struct drm_mode_rect *

__drm_plane_get_damage_clips(const struct drm_plane_state *state);

drivers/gpu/drm/drm_plane.c

+20 −12
Original line number Diff line number Diff line
@@ -877,7 +877,16 @@ int drm_mode_getplane(struct drm_device *dev, void *data, 
	return 0;

}



int drm_plane_check_pixel_format(struct drm_plane *plane,

/**

 * drm_plane_has_format - Check whether the plane supports this format and modifier combination

 * @plane: drm plane

 * @format: pixel format (DRM_FORMAT_*)

 * @modifier: data layout modifier

 *

 * Returns:

 * Whether the plane supports the specified format and modifier combination.

 */

bool drm_plane_has_format(struct drm_plane *plane,

			  u32 format, u64 modifier)

{

	unsigned int i;
@@ -887,25 +896,26 @@ int drm_plane_check_pixel_format(struct drm_plane *plane, 
			break;

	}

	if (i == plane->format_count)

		return -EINVAL;

		return false;



	if (plane->funcs->format_mod_supported) {

		if (!plane->funcs->format_mod_supported(plane, format, modifier))

			return -EINVAL;

			return false;

	} else {

		if (!plane->modifier_count)

			return 0;

			return true;



		for (i = 0; i < plane->modifier_count; i++) {

			if (modifier == plane->modifiers[i])

				break;

		}

		if (i == plane->modifier_count)

			return -EINVAL;

			return false;

	}



	return 0;

	return true;

}

EXPORT_SYMBOL(drm_plane_has_format);



static int __setplane_check(struct drm_plane *plane,

			    struct drm_crtc *crtc,
@@ -924,12 +934,10 @@ static int __setplane_check(struct drm_plane *plane, 
	}



	/* Check whether this plane supports the fb pixel format. */

	ret = drm_plane_check_pixel_format(plane, fb->format->format,

					   fb->modifier);

	if (ret) {

	if (!drm_plane_has_format(plane, fb->format->format, fb->modifier)) {

		DRM_DEBUG_KMS("Invalid pixel format %p4cc, modifier 0x%llx\n",

			      &fb->format->format, fb->modifier);

		return ret;

		return -EINVAL;

	}



	/* Give drivers some help against integer overflows */
@@ -964,7 +972,7 @@ bool drm_any_plane_has_format(struct drm_device *dev, 
	struct drm_plane *plane;



	drm_for_each_plane(plane, dev) {

		if (drm_plane_check_pixel_format(plane, format, modifier) == 0)

		if (drm_plane_has_format(plane, format, modifier))

			return true;

	}

drivers/gpu/drm/drm_vblank_work.c

+22 −0
Original line number Diff line number Diff line
@@ -232,6 +232,28 @@ void drm_vblank_work_flush(struct drm_vblank_work *work) 
}

EXPORT_SYMBOL(drm_vblank_work_flush);



/**

 * drm_vblank_work_flush_all - flush all currently pending vblank work on crtc.

 * @crtc: crtc for which vblank work to flush

 *

 * Wait until all currently queued vblank work on @crtc

 * has finished executing once.

 */

void drm_vblank_work_flush_all(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index(crtc)];



	spin_lock_irq(&dev->event_lock);

	wait_event_lock_irq(vblank->work_wait_queue,

			    list_empty(&vblank->pending_work),

			    dev->event_lock);

	spin_unlock_irq(&dev->event_lock);



	kthread_flush_worker(vblank->worker);

}

EXPORT_SYMBOL(drm_vblank_work_flush_all);



/**

 * drm_vblank_work_init - initialize a vblank work item

 * @work: vblank work item