Commit d0e2dd76 authored by Michał Winiarski's avatar Michał Winiarski Committed by Rodrigo Vivi
Browse files

drm/xe: Fix check for platform without geometry pipeline 



It's not possible for the condition checking if we're running on
platform without geometry pipeline to ever be true, since
gt->fuse_topo.g_dss_mask is an array.

It also breaks the build:
../drivers/gpu/drm/xe/xe_rtp.c:183:50: error: address of array 'gt->fuse_topo.g_dss_mask' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]

Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230523135020.345596-2-michal@hardline.pl


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 35cbfe56

drivers/gpu/drm/xe/xe_gt_topology.c

+5 −0
Original line number Diff line number Diff line
@@ -128,6 +128,11 @@ xe_dss_mask_group_ffs(const xe_dss_mask_t mask, int groupsize, int groupnum) 
	return find_next_bit(mask, XE_MAX_DSS_FUSE_BITS, groupnum * groupsize);

}



bool xe_dss_mask_empty(const xe_dss_mask_t mask)

{

	return bitmap_empty(mask, XE_MAX_DSS_FUSE_BITS);

}



/**

 * xe_gt_topology_has_dss_in_quadrant - check fusing of DSS in GT quadrant

 * @gt: GT to check

drivers/gpu/drm/xe/xe_gt_topology.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ void xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p); 
unsigned int

xe_dss_mask_group_ffs(const xe_dss_mask_t mask, int groupsize, int groupnum);



bool xe_dss_mask_empty(const xe_dss_mask_t mask);



bool

xe_gt_topology_has_dss_in_quadrant(struct xe_gt *gt, int quad);

drivers/gpu/drm/xe/xe_rtp.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ bool xe_rtp_match_first_gslice_fused_off(const struct xe_gt *gt, 
	unsigned int dss_per_gslice = 4;

	unsigned int dss;



	if (drm_WARN(&gt_to_xe(gt)->drm, !gt->fuse_topo.g_dss_mask,

	if (drm_WARN(&gt_to_xe(gt)->drm, xe_dss_mask_empty(gt->fuse_topo.g_dss_mask),

		     "Checking gslice for platform without geometry pipeline\n"))

		return false;