Merge changes I63392417,I6ca0188d into display-kernel.lnx.5.4

* changes:
  disp: msm: add trace logs in display early wakeup function
  disp: msm: add support for display early wakeup
此提交包含在:
Linux Build Service Account
2020-07-23 07:38:30 -07:00
提交者 Gerrit - the friendly Code Review server
當前提交 87f5eca6e0
共有 5 個檔案被更改,包括 140 行新增0 行删除

查看文件

@@ -168,6 +168,7 @@ struct sde_encoder_ops {
* @rc_state: resource controller state
* @delayed_off_work: delayed worker to schedule disabling of
* clks and resources after IDLE_TIMEOUT time.
* @early_wakeup_work: worker to handle early wakeup event
* @input_event_work: worker to handle input device touch events
* @esd_trigger_work: worker to handle esd trigger events
* @input_handler: handler for input device events
@@ -234,6 +235,7 @@ struct sde_encoder_virt {
struct mutex rc_lock;
enum sde_enc_rc_states rc_state;
struct kthread_delayed_work delayed_off_work;
struct kthread_work early_wakeup_work;
struct kthread_work input_event_work;
struct kthread_work esd_trigger_work;
struct input_handler *input_handler;
@@ -267,6 +269,12 @@ void sde_encoder_get_hw_resources(struct drm_encoder *encoder,
struct sde_encoder_hw_resources *hw_res,
struct drm_connector_state *conn_state);
/**
* sde_encoder_early_wakeup - early wake up display
* @encoder: encoder pointer
*/
void sde_encoder_early_wakeup(struct drm_encoder *drm_enc);
/**
* sde_encoder_register_vblank_callback - provide callback to encoder that
* will be called on the next vblank.