samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Actions Packages Projektek Kiadások Wiki Tevékenység

Merge "disp: msm: sde: add helper to check VM hw availability"

Forráskód böngészése
This commit is contained in:
qctecmdr
2021-08-18 16:48:48 -07:00
committed by Gerrit - the friendly Code Review server
szülő eeb3606b4c 7f3b2f0a4b
commit bb36f9fd40
7 fájl változott, egészen pontosan 57 új sor hozzáadva és 48 régi sor törölve
Download Patch File Download Diff File Expand all files Collapse all files

43
msm/sde/sde_kms.c
Fájl megtekintése

@@ -2765,6 +2765,7 @@ static int sde_kms_check_vm_request(struct msm_kms *kms,
enum sde_crtc_vm_req old_vm_req = VM_REQ_NONE, new_vm_req = VM_REQ_NONE;
struct sde_vm_ops *vm_ops;
bool vm_req_active = false;
bool vm_owns_hw;
enum sde_crtc_idle_pc_state idle_pc_state;
struct sde_mdss_cfg *catalog;
int rc = 0;
@@ -2789,7 +2790,7 @@ static int sde_kms_check_vm_request(struct msm_kms *kms,
return -EINVAL;
sde_vm_lock(sde_kms);
vm_owns_hw = sde_vm_owns_hw(sde_kms);
for_each_oldnew_crtc_in_state(state, crtc, old_cstate, new_cstate, i) {
struct sde_crtc_state *old_state = NULL, *new_state = NULL;
@@ -2814,8 +2815,7 @@ static int sde_kms_check_vm_request(struct msm_kms *kms,
if (rc) {
SDE_ERROR(
"VM transition check failed; o_state:%d, n_state:%d, hw_owner:%d, rc:%d\n",
old_vm_req, new_vm_req,
vm_ops->vm_owns_hw(sde_kms), rc);
old_vm_req, new_vm_req, vm_owns_hw, rc);
goto end;
} else if (old_vm_req == VM_REQ_ACQUIRE &&
new_vm_req == VM_REQ_NONE) {
@@ -2852,9 +2852,8 @@ static int sde_kms_check_vm_request(struct msm_kms *kms,
crtc_encoder_cnt++;
}
SDE_EVT32(old_vm_req, new_vm_req, vm_ops->vm_owns_hw(sde_kms));
SDE_DEBUG("VM o_state:%d, n_state:%d, hw_owner:%d\n", old_vm_req,
new_vm_req, vm_ops->vm_owns_hw(sde_kms));
SDE_EVT32(old_vm_req, new_vm_req, vm_owns_hw);
SDE_DEBUG("VM o_state:%d, n_state:%d, hw_owner:%d\n", old_vm_req, new_vm_req, vm_owns_hw);
for_each_new_connector_in_state(state, connector, new_connstate, i) {
int conn_mask = active_cstate->connector_mask;
@@ -2903,13 +2902,12 @@ static int sde_kms_check_vm_request(struct msm_kms *kms,
goto end;
}
if ((new_vm_req == VM_REQ_ACQUIRE) && !vm_ops->vm_owns_hw(sde_kms)) {
if ((new_vm_req == VM_REQ_ACQUIRE) && !vm_owns_hw) {
rc = vm_ops->vm_acquire(sde_kms);
if (rc) {
SDE_ERROR(
"VM acquire failed; o_state:%d, n_state:%d, hw_owner:%d, rc:%d\n",
old_vm_req, new_vm_req,
vm_ops->vm_owns_hw(sde_kms), rc);
old_vm_req, new_vm_req, vm_owns_hw, rc);
goto end;
}
@@ -5062,10 +5060,9 @@ static int _sde_kms_register_events(struct msm_kms *kms,
struct drm_mode_object *obj, u32 event, bool en)
{
int ret = 0;
struct drm_crtc *crtc = NULL;
struct drm_connector *conn = NULL;
struct sde_kms *sde_kms = NULL;
struct sde_vm_ops *vm_ops;
struct drm_crtc *crtc;
struct drm_connector *conn;
struct sde_kms *sde_kms;
if (!kms || !obj) {
SDE_ERROR("invalid argument kms %pK obj %pK\n", kms, obj);
@@ -5073,24 +5070,18 @@ static int _sde_kms_register_events(struct msm_kms *kms,
}
sde_kms = to_sde_kms(kms);
sde_vm_lock(sde_kms);
if (!sde_vm_owns_hw(sde_kms)) {
sde_vm_unlock(sde_kms);
SDE_DEBUG("HW is owned by other VM\n");
return -EACCES;
}
/* check vm ownership, if event registration requires HW access */
switch (obj->type) {
case DRM_MODE_OBJECT_CRTC:
vm_ops = sde_vm_get_ops(sde_kms);
sde_vm_lock(sde_kms);
if (vm_ops && vm_ops->vm_owns_hw
&& !vm_ops->vm_owns_hw(sde_kms)) {
sde_vm_unlock(sde_kms);
SDE_DEBUG("HW is owned by other VM\n");
return -EACCES;
}
crtc = obj_to_crtc(obj);
ret = sde_crtc_register_custom_event(sde_kms, crtc, event, en);
sde_vm_unlock(sde_kms);
break;
case DRM_MODE_OBJECT_CONNECTOR:
conn = obj_to_connector(obj);
@@ -5099,6 +5090,8 @@ static int _sde_kms_register_events(struct msm_kms *kms,
break;
}
sde_vm_unlock(sde_kms);
return ret;
}