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

Commit a93fad0f authored by Vandana Kannan's avatar Vandana Kannan Committed by Daniel Vetter
Browse files

drm/i915: DRRS calls based on frontbuffer 



Calls have been added to invalidate/flush DRRS whenever invalidate/flush is
called as part of frontbuffer tracking.
Apart from calls as a result of GEM tracking to fb invalidate/flush, a
call has been added to invalidate fb obj from crtc_page_flip as well. This
is to track busyness through flip calls.
The call to fb_obj_invalidate (in flip) is placed before queuing flip for this
obj.

drrs_invalidate() and drrs_flush() check for drrs.dp which would be NULL if
it was setup in drrs_enable(). This covers for the condition when DRRS is
not supported.

v2: Removing the call to invalidate_drrs from page_flip.
This has not been tested on Android yet, but, in case DRRS transtions do not
work as expected, check by adding back this call in page_flip.

Signed-off-by: default avatarVandana Kannan <vandana.kannan@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c395578e

drivers/gpu/drm/i915/intel_dp.c

+51 −0
Original line number Original line Diff line number Diff line
@@ -4908,6 +4908,57 @@ static void intel_edp_drrs_downclock_work(struct work_struct *work) 
	mutex_unlock(&dev_priv->drrs.mutex);

	mutex_unlock(&dev_priv->drrs.mutex);

}

}





void intel_edp_drrs_invalidate(struct drm_device *dev,

		unsigned frontbuffer_bits)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;

	enum pipe pipe;



	if (!dev_priv->drrs.dp)

		return;



	mutex_lock(&dev_priv->drrs.mutex);

	crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc;

	pipe = to_intel_crtc(crtc)->pipe;



	if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) {

		cancel_delayed_work_sync(&dev_priv->drrs.work);

		intel_dp_set_drrs_state(dev_priv->dev,

				dev_priv->drrs.dp->attached_connector->panel.

				fixed_mode->vrefresh);

	}



	frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe);



	dev_priv->drrs.busy_frontbuffer_bits |= frontbuffer_bits;

	mutex_unlock(&dev_priv->drrs.mutex);

}



void intel_edp_drrs_flush(struct drm_device *dev,

		unsigned frontbuffer_bits)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;

	enum pipe pipe;



	if (!dev_priv->drrs.dp)

		return;



	mutex_lock(&dev_priv->drrs.mutex);

	crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc;

	pipe = to_intel_crtc(crtc)->pipe;

	dev_priv->drrs.busy_frontbuffer_bits &= ~frontbuffer_bits;



	cancel_delayed_work_sync(&dev_priv->drrs.work);



	if (dev_priv->drrs.refresh_rate_type != DRRS_LOW_RR &&

			!dev_priv->drrs.busy_frontbuffer_bits)

		schedule_delayed_work(&dev_priv->drrs.work,

				msecs_to_jiffies(1000));

	mutex_unlock(&dev_priv->drrs.mutex);

}



static struct drm_display_mode *

static struct drm_display_mode *

intel_dp_drrs_init(struct intel_connector *intel_connector,

intel_dp_drrs_init(struct intel_connector *intel_connector,

		struct drm_display_mode *fixed_mode)

		struct drm_display_mode *fixed_mode)

drivers/gpu/drm/i915/intel_drv.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -1032,6 +1032,9 @@ int intel_disable_plane(struct drm_plane *plane); 
void intel_plane_destroy(struct drm_plane *plane);

void intel_plane_destroy(struct drm_plane *plane);

void intel_edp_drrs_enable(struct intel_dp *intel_dp);

void intel_edp_drrs_enable(struct intel_dp *intel_dp);

void intel_edp_drrs_disable(struct intel_dp *intel_dp);

void intel_edp_drrs_disable(struct intel_dp *intel_dp);

void intel_edp_drrs_invalidate(struct drm_device *dev,

		unsigned frontbuffer_bits);

void intel_edp_drrs_flush(struct drm_device *dev, unsigned frontbuffer_bits);





/* intel_dp_mst.c */

/* intel_dp_mst.c */

int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);

int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);

drivers/gpu/drm/i915/intel_frontbuffer.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -157,6 +157,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, 
	intel_mark_fb_busy(dev, obj->frontbuffer_bits, ring);

	intel_mark_fb_busy(dev, obj->frontbuffer_bits, ring);





	intel_psr_invalidate(dev, obj->frontbuffer_bits);

	intel_psr_invalidate(dev, obj->frontbuffer_bits);

	intel_edp_drrs_invalidate(dev, obj->frontbuffer_bits);

}

}





/**

/**
@@ -182,6 +183,7 @@ void intel_frontbuffer_flush(struct drm_device *dev, 




	intel_mark_fb_busy(dev, frontbuffer_bits, NULL);

	intel_mark_fb_busy(dev, frontbuffer_bits, NULL);





	intel_edp_drrs_flush(dev, frontbuffer_bits);

	intel_psr_flush(dev, frontbuffer_bits);

	intel_psr_flush(dev, frontbuffer_bits);





	/*

	/*