From patchwork Sun Apr 10 14:30:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nils_Wallm=C3=A9nius?= X-Patchwork-Id: 8789361 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BABB09F39A for ; Sun, 10 Apr 2016 14:30:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D772A201F4 for ; Sun, 10 Apr 2016 14:30:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0F91120166 for ; Sun, 10 Apr 2016 14:30:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 778B06E0D9; Sun, 10 Apr 2016 14:30:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 92A1F6E0D9 for ; Sun, 10 Apr 2016 14:30:43 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id o124so16314594lfb.2 for ; Sun, 10 Apr 2016 07:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SB3BKLhX0sRDDbKxCsHqdjVJeSu2zoTbgWUSvi3UPPc=; b=YIx+LkBKJm8LvjuPj3EFafn8ijSMQsTrk2xnSpLHB6dKOFi0cdbGAKXoU4o5nk0sGR iQKT5juEZ3MOh4i17tt8HCefmhgjjOPwerVz9CV9QlsszElf+gO+j7HMfJJIQNbAgXjc qkl0JCC7tj9qR1DHxztKvwU797teFZL5r9bzUMOXwNnP0wibB3h2+EpoFrsNsYVXFmnQ WnyV4HGSeD0Ojd7undRtHZmJhvawJYvEehvFpDW4ZqbQ7IPfCT4SY0rbX5FaGRdeEO+7 /ilVbEGOT3k0o8DTmUSi9IzPEEz3T9Rt1IM/Zu5auB/Kdx3GgwVGyCTBucWwH0zikOhf ngEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SB3BKLhX0sRDDbKxCsHqdjVJeSu2zoTbgWUSvi3UPPc=; b=Eqna2/bfZWFYW4ERqyAmlIn+UT9bNzUTlXP+mOpA42153pOHM5qlopqiXyHDpugvT4 OSyg0sGHM2vPos7G9glJtx9DNfOe4lOWRvp1GtjkcV50MUKx/ev6WdQre7jQR8dRJnaX F/uO2lR8FJRa8OuRsLmO5r7n2TdYlx5wbZkBpCshuKBUcRjUpSRR8RdhdOFl0ojPJT97 6MI8RO67U2oasRi82iJpts6A2XwoKpRiQugsT53TeGiafgkn0WiwJ0du5DhaEWMcns54 nTnssWBxi79uF7syBRy4dE1kuS3fislySvuNYOatFVrQbB8KtlYXbeKCpC/m3VTKvIyy HCNA== X-Gm-Message-State: AOPr4FUUef/b0npX0LUizMdKw1MajdzwVFLBxZLCiklzshcdST0d4/kg5JMr/m/FR/HjzA== X-Received: by 10.112.171.161 with SMTP id av1mr1789589lbc.82.1460298641969; Sun, 10 Apr 2016 07:30:41 -0700 (PDT) Received: from desktop.lan (90-229-153-162-no193.tbcn.telia.com. [90.229.153.162]) by smtp.gmail.com with ESMTPSA id ai2sm3659493lbc.46.2016.04.10.07.30.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Apr 2016 07:30:41 -0700 (PDT) From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/6] drm/amd/scheduler: Mark amdgpu_sched_ops const Date: Sun, 10 Apr 2016 16:30:00 +0200 Message-Id: <1460298604-15126-2-git-send-email-nils.wallmenius@gmail.com> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1460298604-15126-1-git-send-email-nils.wallmenius@gmail.com> References: <1460298604-15126-1-git-send-email-nils.wallmenius@gmail.com> MIME-Version: 1.0 Cc: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This marks the struct amdgpu_sched_ops const and adjusts amd_sched_init to take a const pointer for the ops param. The ops member of struct amd_gpu_scheduler is also changed to const. Signed-off-by: Nils Wallménius --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 2 +- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 5d05b5d..660213a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -748,7 +748,7 @@ enum amdgpu_ring_type { AMDGPU_RING_TYPE_VCE }; -extern struct amd_sched_backend_ops amdgpu_sched_ops; +extern const struct amd_sched_backend_ops amdgpu_sched_ops; int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, struct amdgpu_job **job); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index a052ac2..4eea2a1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -198,7 +198,7 @@ err: return fence; } -struct amd_sched_backend_ops amdgpu_sched_ops = { +const struct amd_sched_backend_ops amdgpu_sched_ops = { .dependency = amdgpu_job_dependency, .run_job = amdgpu_job_run, .begin_job = amd_sched_job_begin, diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 639c70d..c16248c 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -530,7 +530,7 @@ static int amd_sched_main(void *param) * Return 0 on success, otherwise error code. */ int amd_sched_init(struct amd_gpu_scheduler *sched, - struct amd_sched_backend_ops *ops, + const struct amd_sched_backend_ops *ops, unsigned hw_submission, long timeout, const char *name) { int i; diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h index 95ebfd0..169f70f 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h @@ -123,7 +123,7 @@ enum amd_sched_priority { * One scheduler is implemented for each hardware ring */ struct amd_gpu_scheduler { - struct amd_sched_backend_ops *ops; + const struct amd_sched_backend_ops *ops; uint32_t hw_submission_limit; long timeout; const char *name; @@ -137,7 +137,7 @@ struct amd_gpu_scheduler { }; int amd_sched_init(struct amd_gpu_scheduler *sched, - struct amd_sched_backend_ops *ops, + const struct amd_sched_backend_ops *ops, uint32_t hw_submission, long timeout, const char *name); void amd_sched_fini(struct amd_gpu_scheduler *sched);