Skip to content

RDKEMW-4577:Reduce dumpedidinfo logging and fix colorimetry api calls #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apatel859 merged 3 commits into from
May 28, 2025
Merged

RDKEMW-4577:Reduce dumpedidinfo logging and fix colorimetry api calls #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad36d96
RDKEMW-4577:Reduce dumpedidinfo logging and fix colorimetry api calls
Sonajeya31 May 22, 2025
659823d
RDKEMW-4577:Reduce dumpedidinfo logging and fix colorimetry api calls
Sonajeya31 May 22, 2025
5aefe62
RDKEMW-4577:Reduce dumpedidinfo logging and fix colorimetry api calls
Sonajeya31 May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpc/cli/dsDisplay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ dsError_t dsGetEDIDBytes(intptr_t handle, unsigned char *edid, int *length)
if (param.result == dsERR_NONE) {
printf("dsCLI ::getEDIDBytes returns %d bytes\r\n", param.length);
if (edid) {
memcpy_s(edid, *length, param.bytes, param.length);
rc = memcpy_s(edid, *length, param.bytes, param.length);
if(rc!=EOK)
{
ERR_CHK(rc);
Expand Down
68 changes: 51 additions & 17 deletions rpc/srv/dsDisplay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@

static int m_isInitialized = 0;
static int m_isPlatInitialized = 0;
static bool isEdidCached = false;
static bool isEdidBytesCached = false;
static pthread_mutex_t dsLock = PTHREAD_MUTEX_INITIALIZER;

#define NULL_HANDLE 0
Expand Down Expand Up @@ -165,16 +167,32 @@ IARM_Result_t _dsGetDisplayAspectRatio(void *arg)
IARM_Result_t _dsGetEDID(void *arg)
{
_DEBUG_ENTER();

IARM_BUS_Lock(lock);

dsDisplayGetEDIDParam_t *param = (dsDisplayGetEDIDParam_t *)arg;
errno_t rc = -1;
static dsDisplayEDID_t *edidInfo = (dsDisplayEDID_t*)malloc(sizeof(dsDisplayEDID_t));
dsDisplayGetEDIDParam_t *param = (dsDisplayGetEDIDParam_t *)arg;
dsVideoPortType_t _VPortType;
if(isEdidCached && param)
{
rc = memcpy_s(&param->edid,sizeof(param->edid),edidInfo,sizeof(dsDisplayEDID_t));
if(rc!=EOK)
{
ERR_CHK(rc);
}
return IARM_RESULT_SUCCESS;
}
IARM_BUS_Lock(lock);
memset(edidInfo,0,sizeof(*edidInfo));

dsGetEDID(param->handle, &param->edid);

filterEDIDResolution(param->handle, &param->edid);
dumpEDIDInformation( &param->edid);
rc = memcpy_s(edidInfo,sizeof(dsDisplayEDID_t),&param->edid,sizeof(param->edid));
if(rc!=EOK)
{
ERR_CHK(rc);
}
isEdidCached = true;

IARM_BUS_Unlock(lock);

Expand All @@ -190,6 +208,22 @@ IARM_Result_t _dsGetEDIDBytes(void *arg)
#endif
errno_t rc = -1;
_DEBUG_ENTER();
static unsigned char edid[1024] = {0};
static int length = 0;
dsDisplayGetEDIDBytesParam_t *param = (dsDisplayGetEDIDBytesParam_t *)arg;
if(isEdidBytesCached && param)
{
rc = memcpy_s(param->bytes,sizeof(param->bytes),edid,length);
if(rc!=EOK)
{
ERR_CHK(rc);
}
param->length = length;
param->result = dsERR_NONE;
return IARM_RESULT_SUCCESS;

}


IARM_BUS_Lock(lock);

Expand All @@ -214,11 +248,9 @@ IARM_Result_t _dsGetEDIDBytes(void *arg)
}
}

dsDisplayGetEDIDBytesParam_t *param = (dsDisplayGetEDIDBytesParam_t *)arg;

Copy link
Contributor

@apatel859 apatel859 May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the above line deleted accidentely?

Copy link
Contributor Author

@Sonajeya31 Sonajeya31 May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in line 213


if (func != 0) {
unsigned char edid[1024] = {0};
int length = 0;
dsError_t ret = func(param->handle, edid, &length);
if (ret == dsERR_NONE && length <= 1024) {
rc = memcpy_s(param->bytes,sizeof(param->bytes),edid,length);
Expand All @@ -227,6 +259,7 @@ IARM_Result_t _dsGetEDIDBytes(void *arg)
ERR_CHK(rc);
}
param->length = length;
isEdidBytesCached = true;
}
param->result = ret;
}
Expand Down Expand Up @@ -281,6 +314,9 @@ void _dsDisplayEventCallback(intptr_t handle, dsDisplayEvent_t event, void *even
INT_INFO("Disconnecting HDMI from display !!!!!!!! ..\r\n");
_eventData.data.hdmi_hpd.event = dsDISPLAY_EVENT_DISCONNECTED ;
_eventId = IARM_BUS_DSMGR_EVENT_HDMI_HOTPLUG;
isEdidCached = false;
isEdidBytesCached = false;
INT_INFO("isEdidCached & isEdidBytesCached set to false !!!!!!..\r\n");
_dsSyncHdmiStatus(DS_HDMI_TAG_HOTPLUP, dsDISPLAY_EVENT_DISCONNECTED);
break;

Expand Down Expand Up @@ -378,19 +414,17 @@ static void filterEDIDResolution(intptr_t handle, dsDisplayEDID_t *edid)

static void dumpEDIDInformation( dsDisplayEDID_t *edid)
{
INT_INFO("[DsMgr] Product Code: %x\r\n",edid->productCode);
INT_INFO("[DsMgr] Serial Number: %x\r\n",edid->serialNumber);
INT_INFO("[DsMgr] Manufacturer Year: %d\r\n",edid->manufactureYear);
INT_INFO("[DsMgr] Manufacturer week: %d\r\n",edid->manufactureWeek);
INT_INFO("[DsMgr] Monitor Name : %s\r\n",edid->monitorName);
INT_INFO("[DsMgr] Hdmi Device Type : %s\r\n",(edid->hdmiDeviceType)?"HDMI":"DVI");
INT_INFO("[DsMgr] Hdmi Device Is Repeater : %x\r\n",edid->isRepeater);
INT_INFO("[DsMgr] No of Resolutions: %x\r\n",edid->numOfSupportedResolution);
for (size_t j = 0; j < edid->numOfSupportedResolution; j++)
printf("[DsMgr]dumpEDIDInformation: Product:%x SN:%x Year:%d Week:%d Monitor:%s Type:%s Repeater:%x\n",
edid->productCode,edid->serialNumber,edid->manufactureYear,edid->manufactureWeek,edid->monitorName,
edid->hdmiDeviceType?"HDMI":"DVI",edid->isRepeater);
printf("Supported resolutions: ");
for (size_t j = 0; j < edid->numOfSupportedResolution; j++)
{
dsVideoPortResolution_t *edidResn = &(edid->suppResolutionList[j]);
INT_INFO("[DsMgr] Resolution Name: %s\r\n",edidResn->name);
printf("%s,",edidResn->name);

}
printf("\n");
}


Expand Down