OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: drop likely/unlikely around INTEL_DEBUG

Browse Source 
It's included in declaration of INTEL_DEBUG.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6732>
This commit is contained in:
Marcin Ślusarz
2020-09-14 18:53:41 +02:00
committed by Marge Bot
parent e06da554e9
commit 9c25689287
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/perf/gen_perf.c
View File

@@ -80,7 +80,7 @@ get_sysfs_dev_dir(struct gen_perf_config *perf, int fd)
perf->sysfs_dev_dir[0] = '\0';
if (unlikely(INTEL_DEBUG & DEBUG_NO_OACONFIG))
if (INTEL_DEBUG & DEBUG_NO_OACONFIG)
return true;
if (fstat(fd, &sb)) {
@@ -407,7 +407,7 @@ init_oa_sys_vars(struct gen_perf_config *perf, const struct gen_device_info *dev
{
uint64_t min_freq_mhz = 0, max_freq_mhz = 0;
if (likely(!(INTEL_DEBUG & DEBUG_NO_OACONFIG))) {
if (!(INTEL_DEBUG & DEBUG_NO_OACONFIG)) {
if (!read_sysfs_drm_device_file_uint64(perf, "gt_min_freq_mhz", &min_freq_mhz))
return false;
@@ -758,7 +758,7 @@ load_oa_metrics(struct gen_perf_config *perf, int fd,
*/
oa_register(perf);
if (likely(!(INTEL_DEBUG & DEBUG_NO_OACONFIG))) {
if (!(INTEL_DEBUG & DEBUG_NO_OACONFIG)) {
if (kernel_has_dynamic_config_support(perf, fd))
init_oa_configs(perf, fd, devinfo);
else