samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: add new function for updating the cp feature lists only"

Browse Source
This commit is contained in:
qctecmdr
2021-10-25 18:47:06 -07:00
committed by Gerrit - the friendly Code Review server
parent a757117e6b 4d27e37beb
commit 5f5525b418
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
msm/sde/sde_color_processing.c
View File

@@ -2612,12 +2612,11 @@ void sde_cp_crtc_destroy_properties(struct drm_crtc *crtc)
INIT_LIST_HEAD(&sde_crtc->ltm_buf_busy); INIT_LIST_HEAD(&sde_crtc->ltm_buf_busy);
} }
void sde_cp_crtc_suspend(struct drm_crtc *crtc) void sde_cp_crtc_mark_features_dirty(struct drm_crtc *crtc)
{ {
struct sde_crtc *sde_crtc = NULL; struct sde_crtc *sde_crtc = NULL;
struct sde_cp_node *prop_node = NULL, *n = NULL; struct sde_cp_node *prop_node = NULL, *n = NULL;
bool ad_suspend = false; bool ad_suspend = false;
unsigned long irq_flags;
if (!crtc) { if (!crtc) {
DRM_ERROR("crtc %pK\n", crtc); DRM_ERROR("crtc %pK\n", crtc);
@@ -2644,12 +2643,30 @@ void sde_cp_crtc_suspend(struct drm_crtc *crtc)
} }
mutex_unlock(&sde_crtc->crtc_cp_lock); mutex_unlock(&sde_crtc->crtc_cp_lock);
if (ad_suspend)
_sde_cp_ad_set_prop(sde_crtc, AD_SUSPEND);
}
void sde_cp_crtc_suspend(struct drm_crtc *crtc)
{
struct sde_crtc *sde_crtc = NULL;
unsigned long irq_flags;
if (!crtc) {
DRM_ERROR("crtc %pK\n", crtc);
return;
}
sde_crtc = to_sde_crtc(crtc);
if (!sde_crtc) {
DRM_ERROR("sde_crtc %pK\n", sde_crtc);
return;
}
sde_cp_crtc_mark_features_dirty(crtc);
spin_lock_irqsave(&sde_crtc->ltm_lock, irq_flags); spin_lock_irqsave(&sde_crtc->ltm_lock, irq_flags);
sde_crtc->ltm_hist_en = false; sde_crtc->ltm_hist_en = false;
spin_unlock_irqrestore(&sde_crtc->ltm_lock, irq_flags); spin_unlock_irqrestore(&sde_crtc->ltm_lock, irq_flags);
if (ad_suspend)
_sde_cp_ad_set_prop(sde_crtc, AD_SUSPEND);
} }
void sde_cp_crtc_resume(struct drm_crtc *crtc) void sde_cp_crtc_resume(struct drm_crtc *crtc)

6
msm/sde/sde_color_processing.h
View File

@@ -228,6 +228,12 @@ void sde_cp_crtc_apply_properties(struct drm_crtc *crtc);
int sde_cp_crtc_get_property(struct drm_crtc *crtc, int sde_cp_crtc_get_property(struct drm_crtc *crtc,
struct drm_property *property, uint64_t *val); struct drm_property *property, uint64_t *val);
/**
* sde_cp_crtc_mark_features_dirty: Move the cp features from active list to dirty list
* @crtc: Pointer to crtc.
*/
void sde_cp_crtc_mark_features_dirty(struct drm_crtc *crtc);
/** /**
* sde_cp_crtc_suspend: Suspend the crtc features * sde_cp_crtc_suspend: Suspend the crtc features
* @crtc: Pointer to crtc. * @crtc: Pointer to crtc.

2
msm/sde/sde_crtc.c
View File

@@ -3620,7 +3620,7 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc,
sde_cp_crtc_apply_properties(crtc); sde_cp_crtc_apply_properties(crtc);
if (!sde_crtc->enabled) if (!sde_crtc->enabled)
sde_cp_crtc_suspend(crtc); sde_cp_crtc_mark_features_dirty(crtc);
/* /*
* PP_DONE irq is only used by command mode for now. * PP_DONE irq is only used by command mode for now.