From patchwork Fri Jun 9 10:21:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9777919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4E5CC6034B for ; Fri, 9 Jun 2017 10:21:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EBF2285E7 for ; Fri, 9 Jun 2017 10:21:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 330D4285FB; Fri, 9 Jun 2017 10:21:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C529F285E7 for ; Fri, 9 Jun 2017 10:21:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 039D76E5B5; Fri, 9 Jun 2017 10:21:51 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3D7296E59E; Fri, 9 Jun 2017 10:21:47 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id x3so11053993wme.0; Fri, 09 Jun 2017 03:21:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dWGYgJmgpAwvzRp8NGU00JB5ayzQZVIqLK2Ta+FRPTk=; b=PEtmLiMZV2cVCi9RVQUOkQNDX+bCiAzzgTeSvkGFtcGGsv/BQbTc4ElWa6jUIdK7ba QCInkVa4MWqyLN/cyeY7H8UPPsptwJ1PiWygY4usGG4GdMpg7lqQpSPS7YFeRrUrrJjU ZU3TaGCfumUJQHj0OWP+7+/NlZGXn8ZehuFlAbJl4WMqtSaMj91INN4Bm00Ro+MkIQI/ vo8A3mimLc9zjp5BpVZFeL83mys4Fsm8B8W1RTF9iRma+zoFlIz+EdnXlkg4GRI8osYw KpBCO4x0jFh83WLkqHlAJ/XbTED9Sy/4nWT1B8fwSXHjf25nzxrNBy92yfslUlMVsMcH 1YjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dWGYgJmgpAwvzRp8NGU00JB5ayzQZVIqLK2Ta+FRPTk=; b=oUcPhXcx4STU45DczeMAwCXDlmb0CEbIMuWYwrH2HZMgJackdfV0kM6+grXU918VXS 8AxKawLn/PZJF9+vVozolQ7G8H66Psj4b5PDLuHk1AOCQkBTQmbyMSScEr8rNnlskc+3 fHB1veZPC8BPLn3/VVC8sX+OJD9sLHDI3wbSJb/n9UW2ZcBH3fAm+NHh734yHjtjX7R3 Yy2OgHEQazYAgfmpc2ifYDO/uyP8N5ypQFgZVfPqAK4Mp7nxoDjg/vRkdfySxUBpRh4L YGoVZV6hN4HXlqs5MH7nEduB5FLcHkcBAGH7s9tbIPP42q0rcNQiZ63i7Ygw23WTVjgi zwMg== X-Gm-Message-State: AODbwcBqCYipRJAFwjxOI0OxUnsQylFSlIGWujUPg9LQBWOTNnVyrtAl K9GTufC6hb9cd5b9TO4= X-Received: by 10.28.166.137 with SMTP id p131mr6568499wme.43.1497003705447; Fri, 09 Jun 2017 03:21:45 -0700 (PDT) Received: from localhost.localdomain (213-147-162-44.nat.highway.bob.at. [213.147.162.44]) by smtp.gmail.com with ESMTPSA id w52sm806952wrc.33.2017.06.09.03.21.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2017 03:21:44 -0700 (PDT) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH 05/21] drm/etnaviv: add performance monitor request validation Date: Fri, 9 Jun 2017 12:21:19 +0200 Message-Id: <20170609102123.2417-6-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170609102123.2417-1-christian.gmeiner@gmail.com> References: <20170609102123.2417-1-christian.gmeiner@gmail.com> Cc: linux+etnaviv@armlinux.org.uk, etnaviv@lists.freedesktop.org, cphealy@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Check if the selected domain and signal combination exists. Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach --- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 15 +++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_perfmon.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c index 9c6f284..b8dc5fa 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c @@ -79,3 +79,18 @@ int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu, return 0; } + +int etnaviv_pm_req_validate(const struct drm_etnaviv_gem_submit_pmr *r) +{ + const struct etnaviv_pm_domain *dom; + + if (r->domain >= ARRAY_SIZE(doms)) + return -EINVAL; + + dom = &doms[r->domain]; + + if (r->signal > dom->nr_signals) + return -EINVAL; + + return 0; +} diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h index 4b2b518..f20b69c 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h @@ -40,4 +40,6 @@ int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu, int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu, struct drm_etnaviv_pm_signal *signal); +int etnaviv_pm_req_validate(const struct drm_etnaviv_gem_submit_pmr *r); + #endif /* __ETNAVIV_PERFMON_H__ */