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: ignore HW recovery disable event"

Browse Source
This commit is contained in:
qctecmdr
2020-12-03 11:57:17 -08:00
committed by Gerrit - the friendly Code Review server
parent ee8ad711e9 98c9ba6153
commit 70df5208b0
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
msm/sde/sde_connector.c
View File

@@ -2994,8 +2994,7 @@ error_free_conn:
return ERR_PTR(rc);
}
static int _sde_conn_hw_recovery_handler(
struct drm_connector *connector, bool val)
static int _sde_conn_enable_hw_recovery(struct drm_connector *connector)
{
struct sde_connector *c_conn;
@@ -3006,7 +3005,7 @@ static int _sde_conn_hw_recovery_handler(
c_conn = to_sde_connector(connector);
if (c_conn->encoder)
sde_encoder_recovery_events_handler(c_conn->encoder, val);
sde_encoder_enable_recovery_event(c_conn->encoder);
return 0;
}
@@ -3024,7 +3023,7 @@ int sde_connector_register_custom_event(struct sde_kms *kms,
ret = 0;
break;
case DRM_EVENT_SDE_HW_RECOVERY:
ret = _sde_conn_hw_recovery_handler(conn_drm, val);
ret = _sde_conn_enable_hw_recovery(conn_drm);
break;
default:
break;

5
msm/sde/sde_encoder.c
View File

@@ -5423,8 +5423,7 @@ bool sde_encoder_recovery_events_enabled(struct drm_encoder *encoder)
return sde_enc->recovery_events_enabled;
}
void sde_encoder_recovery_events_handler(struct drm_encoder *encoder,
bool enabled)
void sde_encoder_enable_recovery_event(struct drm_encoder *encoder)
{
struct sde_encoder_virt *sde_enc;
@@ -5434,5 +5433,5 @@ void sde_encoder_recovery_events_handler(struct drm_encoder *encoder,
}
sde_enc = to_sde_encoder_virt(encoder);
sde_enc->recovery_events_enabled = enabled;
sde_enc->recovery_events_enabled = true;
}

7
msm/sde/sde_encoder.h
View File

@@ -486,12 +486,11 @@ int sde_encoder_display_failure_notification(struct drm_encoder *enc,
bool sde_encoder_recovery_events_enabled(struct drm_encoder *encoder);
/**
* sde_encoder_recovery_events_handler - handler to enable/disable the
* sw recovery for this connector
* sde_encoder_enable_recovery_event - handler to enable the sw recovery
* for this connector
* @drm_enc: Pointer to drm encoder structure
*/
void sde_encoder_recovery_events_handler(struct drm_encoder *encoder,
bool val);
void sde_encoder_enable_recovery_event(struct drm_encoder *encoder);
/**
* sde_encoder_in_clone_mode - checks if underlying phys encoder is in clone
* mode or independent display mode. ref@ WB in Concurrent writeback mode.