Skip to content

Commit

Permalink
Fix klocwork issues in GFX domain
Browse files Browse the repository at this point in the history
Revert an old fix because it dosen't pass kw scan.
Fix kw issues in commit bee3746 base on 80 daily build.
The rest of issues will be set as ignored later.

Test: tested on APL
Tracked-On: https://jira.devtools.intel.com/browse/OAM-83338
Sighed-off-by: Yuanzhe, Liu <yuanzhe.liu@intel.com>
Change-Id: Ia6aa596b4dc4c83820910a2dd40a53f774c94508
Reviewed-on: https://android.intel.com:443/672875
  • Loading branch information
yuanzhel authored and sysopenci committed Jun 27, 2019
1 parent 6f92498 commit 5baea2b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 0 additions & 2 deletions common/core/gpudevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,6 @@ void GpuDevice::ParseLogicalDisplaySetting(
logical_split_str.find_first_not_of("0123456789") != std::string::npos)
return;
uint32_t physical_index = atoi(physical_index_str.c_str());
if (physical_index < 0)
return;
uint32_t logical_split_num = atoi(logical_split_str.c_str());
if (logical_split_num <= 1)
return;
Expand Down
2 changes: 2 additions & 0 deletions wsi/drm/drmdisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ void DrmDisplay::GetEDIDDisplayData(const ScopedDrmObjectPropertyPtr &props) {

edid = (uint8_t *)blob->data;
if (!edid) {
drmModeFreePropertyBlob(blob);
return;
}
std::memset(display_data, 0, sizeof(display_data));
Expand Down Expand Up @@ -196,6 +197,7 @@ void DrmDisplay::GetEDIDDisplayData(const ScopedDrmObjectPropertyPtr &props) {
}
}

drmModeFreePropertyBlob(blob);
ITRACE("Got EDID display name \"%s\"\n", display_name_.c_str());
}

Expand Down
2 changes: 1 addition & 1 deletion wsi/drm/drmdisplay.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class DrmDisplay : public PhysicalDisplay {
uint32_t flags_ = DRM_MODE_ATOMIC_ALLOW_MODESET;
bool planes_updated_ = false;
bool first_commit_ = false;
std::string display_name_;
std::string display_name_ = "";
HWCContentProtection current_protection_support_ =
HWCContentProtection::kUnSupported;
HWCContentProtection desired_protection_support_ =
Expand Down

0 comments on commit 5baea2b

Please sign in to comment.