Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed8d1975 authored by Keith Packard's avatar Keith Packard Committed by Dave Airlie
Browse files

drm: Pass page flip ioctl flags to driver 



This lets drivers see the flags requested by the application

[airlied: fixup for rcar/imx/msm]

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent e1e9c90e

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -3581,7 +3581,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
	}



	old_fb = crtc->fb;

	ret = crtc->funcs->page_flip(crtc, fb, e);

	ret = crtc->funcs->page_flip(crtc, fb, e, page_flip->flags);

	if (ret) {

		if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) {

			spin_lock_irqsave(&dev->event_lock, flags);

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { 


static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,

				     struct drm_framebuffer *fb,

				      struct drm_pending_vblank_event *event)

				     struct drm_pending_vblank_event *event,

				     uint32_t page_flip_flags)

{

	struct drm_device *dev = crtc->dev;

	struct exynos_drm_private *dev_priv = dev->dev_private;

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -380,7 +380,8 @@ struct drm_i915_display_funcs { 
	void (*init_clock_gating)(struct drm_device *dev);

	int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc,

			  struct drm_framebuffer *fb,

			  struct drm_i915_gem_object *obj);

			  struct drm_i915_gem_object *obj,

			  uint32_t flags);

	int (*update_plane)(struct drm_crtc *crtc, struct drm_framebuffer *fb,

			    int x, int y);

	void (*hpd_irq_setup)(struct drm_device *dev);

drivers/gpu/drm/i915/intel_display.c

+15 −8
Original line number Diff line number Diff line
@@ -7481,7 +7481,8 @@ inline static void intel_mark_page_flip_active(struct intel_crtc *intel_crtc) 
static int intel_gen2_queue_flip(struct drm_device *dev,

				 struct drm_crtc *crtc,

				 struct drm_framebuffer *fb,

				 struct drm_i915_gem_object *obj)

				 struct drm_i915_gem_object *obj,

				 uint32_t flags)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7525,7 +7526,8 @@ static int intel_gen2_queue_flip(struct drm_device *dev, 
static int intel_gen3_queue_flip(struct drm_device *dev,

				 struct drm_crtc *crtc,

				 struct drm_framebuffer *fb,

				 struct drm_i915_gem_object *obj)

				 struct drm_i915_gem_object *obj,

				 uint32_t flags)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7566,7 +7568,8 @@ static int intel_gen3_queue_flip(struct drm_device *dev, 
static int intel_gen4_queue_flip(struct drm_device *dev,

				 struct drm_crtc *crtc,

				 struct drm_framebuffer *fb,

				 struct drm_i915_gem_object *obj)

				 struct drm_i915_gem_object *obj,

				 uint32_t flags)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7614,7 +7617,8 @@ static int intel_gen4_queue_flip(struct drm_device *dev, 
static int intel_gen6_queue_flip(struct drm_device *dev,

				 struct drm_crtc *crtc,

				 struct drm_framebuffer *fb,

				 struct drm_i915_gem_object *obj)

				 struct drm_i915_gem_object *obj,

				 uint32_t flags)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7664,7 +7668,8 @@ static int intel_gen6_queue_flip(struct drm_device *dev, 
static int intel_gen7_queue_flip(struct drm_device *dev,

				 struct drm_crtc *crtc,

				 struct drm_framebuffer *fb,

				 struct drm_i915_gem_object *obj)

				 struct drm_i915_gem_object *obj,

				 uint32_t flags)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7714,14 +7719,16 @@ static int intel_gen7_queue_flip(struct drm_device *dev, 
static int intel_default_queue_flip(struct drm_device *dev,

				    struct drm_crtc *crtc,

				    struct drm_framebuffer *fb,

				    struct drm_i915_gem_object *obj)

				    struct drm_i915_gem_object *obj,

				    uint32_t flags)

{

	return -ENODEV;

}



static int intel_crtc_page_flip(struct drm_crtc *crtc,

				struct drm_framebuffer *fb,

				struct drm_pending_vblank_event *event)

				struct drm_pending_vblank_event *event,

				uint32_t page_flip_flags)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -7791,7 +7798,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, 
	atomic_inc(&intel_crtc->unpin_work_count);

	intel_crtc->reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);



	ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);

	ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, page_flip_flags);

	if (ret)

		goto cleanup_pending;

drivers/gpu/drm/msm/mdp4/mdp4_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ static void mdp4_crtc_load_lut(struct drm_crtc *crtc) 


static int mdp4_crtc_page_flip(struct drm_crtc *crtc,

		struct drm_framebuffer *new_fb,

		struct drm_pending_vblank_event *event)

		struct drm_pending_vblank_event *event,

		uint32_t page_flip_flags)

{

	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);

	struct drm_device *dev = crtc->dev;