[igt-dev] [PATCH i-g-t] tools/intel_watermark: Recognize cnl+

Rodrigo Vivi rodrigo.vivi at intel.com
Wed Oct 24 17:00:16 UTC 2018


On Wed, Oct 24, 2018 at 07:27:40PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Pick the skl+ code path for cnl+. And since this tool has
> nothing to do with pch let's also replace the has_pch_split
> check with gen>=5 check.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
>  tools/intel_watermark.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
> index 03da68b6ff69..3fd37441cba7 100644
> --- a/tools/intel_watermark.c
> +++ b/tools/intel_watermark.c
> @@ -1142,12 +1142,12 @@ int main(int argc, char *argv[])
>  {
>  	devid = intel_get_pci_device()->device_id;
>  
> -	if (IS_GEN9(devid)) {
> +	if (intel_gen(devid) >= 9) {
>  		skl_wm_dump();
>  	} else if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) {
>  		display_base = 0x180000;
>  		vlv_wm_dump();
> -	} else if (HAS_PCH_SPLIT(devid)) {
> +	} else if (intel_gen(devid) >= 5) {
>  		ilk_wm_dump();
>  	} else if (IS_G4X(devid)) {
>  		g4x_wm_dump();
> -- 
> 2.18.1
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev


More information about the igt-dev mailing list