From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE34B1C3F13 for ; Thu, 28 Nov 2024 21:13:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828386; cv=pass; b=aRyyETekkF0XEVKfaieCTxLjVpQL0xVa06DAo1Bcpv2hnzYbvKwPW92mOPSHGXzEyIxdci1Q7+V5BfHh/6CEtyZwkUUtneG19ZRmif3bIYwBgN/UulmvJZGl4uuxDBksB/wTwg5Dj7U8yzFFoyAvhRmR4O9Ze6pCNTlkS7pesNE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828386; c=relaxed/simple; bh=ksiCvqBoOgbkBCdIhidcBs43ga/bBvgX/zBvN9vIKhg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oZfOequLKPEhH6+dp7zWBUqHj/+ixo5TNBxCGriRAqhsfs0Vgv3G5fRXQwSs4OTLZeNw9u/Lsx3AfF9QkrDWFD8zUrCpezfydHGfRJr4eize6oFTkJOhfSYcMecFtyTqVgFcE/rzMo4b+KO8AWx1B3FpzANgWUDiPvvCMwYFlfw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=PlmZrLHH; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="PlmZrLHH" ARC-Seal: i=1; a=rsa-sha256; t=1732828360; cv=none; d=zohomail.com; s=zohoarc; b=W5IYrrLX03WxDke88eUK4NXEYAZEm8+a+c5/m8dqZW35QgboDyx880tUH7+DyORvQuRFLqkV4lFheZqbh/OU8mSAQr8n2EqRqq4CLCOqOsmwC98h/VHALmlUtCrm6QrIf5PJI+gIR1N/zLccaWYvvoDE9o3VuL0I7dNp5S+CdXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828360; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=9+4Vbb/6jnQLTM2wLB8N2lhAEmVUxPX55ykHrve+iDE=; b=flDPQx39A/db30Bw2qimexI/xhiFumumtYSWfOeFEhXayRzgXPgHwvl7MK+p3NuGCQlSmnqPehuKZCfC7+gc5WzyWHylyAGIT/9alxmohShtMS4+ippH83A7Hr3A6m2suobllH9Z2KAXkPk5UUXMZo8tder84LbG1Ve5DffJUvI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828360; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=9+4Vbb/6jnQLTM2wLB8N2lhAEmVUxPX55ykHrve+iDE=; b=PlmZrLHHgNGVXn6lOUqKgEIk4D5tFkgLW7IVsCznfuwAhJFk3U5Id0AkzD/V26aY UrU5SfvuYYNTsPXb5Z7r3kvmsbKebFX5IdAeKbJTqYN4eG1t9uoToZ0FCxp5fqsXcPn 70iIRG1uT3ObG4CkiyE61x7WtmPIwNMY9IRpu6Qc= Received: by mx.zohomail.com with SMTPS id 1732828360171213.1114097102096; Thu, 28 Nov 2024 13:12:40 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/8] drm/panfrost: Replace DRM driver allocation method with newer one Date: Thu, 28 Nov 2024 21:06:16 +0000 Message-ID: <20241128211223.1805830-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Drop the deprecated DRM driver allocation method in favour of devm_drm_dev_alloc(). Overall just make it the same as in Panthor. Also discard now superfluous generic and platform device pointers inside the main panfrost device structure. Some ancient checkpatch issues unearthed as a result of these changes were also fixed, like lines too long or double assignment in one line. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Steven Price Acked-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 4 +- drivers/gpu/drm/panfrost/panfrost_device.c | 49 ++++++------- drivers/gpu/drm/panfrost/panfrost_device.h | 6 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 68 +++++++------------ drivers/gpu/drm/panfrost/panfrost_dump.c | 8 +-- drivers/gpu/drm/panfrost/panfrost_gem.c | 6 +- .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 4 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 49 ++++++------- drivers/gpu/drm/panfrost/panfrost_job.c | 37 +++++----- drivers/gpu/drm/panfrost/panfrost_mmu.c | 40 ++++++----- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 22 +++--- 11 files changed, 141 insertions(+), 152 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/= panfrost/panfrost_devfreq.c index 3385fd3ef41a..2a26cd971d79 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -74,7 +74,7 @@ static int panfrost_devfreq_get_dev_status(struct device = *dev, =20 spin_unlock_irqrestore(&pfdevfreq->lock, irqflags); =20 - dev_dbg(pfdev->dev, "busy %lu total %lu %lu %% freq %lu MHz\n", + dev_dbg(pfdev->base.dev, "busy %lu total %lu %lu %% freq %lu MHz\n", status->busy_time, status->total_time, status->busy_time / (status->total_time / 100), status->current_frequency / 1000 / 1000); @@ -119,7 +119,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) int ret; struct dev_pm_opp *opp; unsigned long cur_freq; - struct device *dev =3D &pfdev->pdev->dev; + struct device *dev =3D pfdev->base.dev; struct devfreq *devfreq; struct thermal_cooling_device *cooling; struct panfrost_devfreq *pfdevfreq =3D &pfdev->pfdevfreq; diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/p= anfrost/panfrost_device.c index a45e4addcc19..4fe29286bbe3 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -20,9 +20,9 @@ =20 static int panfrost_reset_init(struct panfrost_device *pfdev) { - pfdev->rstc =3D devm_reset_control_array_get_optional_exclusive(pfdev->de= v); + pfdev->rstc =3D devm_reset_control_array_get_optional_exclusive(pfdev->ba= se.dev); if (IS_ERR(pfdev->rstc)) { - dev_err(pfdev->dev, "get reset failed %ld\n", PTR_ERR(pfdev->rstc)); + dev_err(pfdev->base.dev, "get reset failed %ld\n", PTR_ERR(pfdev->rstc)); return PTR_ERR(pfdev->rstc); } =20 @@ -39,22 +39,22 @@ static int panfrost_clk_init(struct panfrost_device *pf= dev) int err; unsigned long rate; =20 - pfdev->clock =3D devm_clk_get(pfdev->dev, NULL); + pfdev->clock =3D devm_clk_get(pfdev->base.dev, NULL); if (IS_ERR(pfdev->clock)) { - dev_err(pfdev->dev, "get clock failed %ld\n", PTR_ERR(pfdev->clock)); + dev_err(pfdev->base.dev, "get clock failed %ld\n", PTR_ERR(pfdev->clock)= ); return PTR_ERR(pfdev->clock); } =20 rate =3D clk_get_rate(pfdev->clock); - dev_info(pfdev->dev, "clock rate =3D %lu\n", rate); + dev_info(pfdev->base.dev, "clock rate =3D %lu\n", rate); =20 err =3D clk_prepare_enable(pfdev->clock); if (err) return err; =20 - pfdev->bus_clock =3D devm_clk_get_optional(pfdev->dev, "bus"); + pfdev->bus_clock =3D devm_clk_get_optional(pfdev->base.dev, "bus"); if (IS_ERR(pfdev->bus_clock)) { - dev_err(pfdev->dev, "get bus_clock failed %ld\n", + dev_err(pfdev->base.dev, "get bus_clock failed %ld\n", PTR_ERR(pfdev->bus_clock)); err =3D PTR_ERR(pfdev->bus_clock); goto disable_clock; @@ -62,7 +62,7 @@ static int panfrost_clk_init(struct panfrost_device *pfde= v) =20 if (pfdev->bus_clock) { rate =3D clk_get_rate(pfdev->bus_clock); - dev_info(pfdev->dev, "bus_clock rate =3D %lu\n", rate); + dev_info(pfdev->base.dev, "bus_clock rate =3D %lu\n", rate); =20 err =3D clk_prepare_enable(pfdev->bus_clock); if (err) @@ -87,7 +87,7 @@ static int panfrost_regulator_init(struct panfrost_device= *pfdev) { int ret, i; =20 - pfdev->regulators =3D devm_kcalloc(pfdev->dev, pfdev->comp->num_supplies, + pfdev->regulators =3D devm_kcalloc(pfdev->base.dev, pfdev->comp->num_supp= lies, sizeof(*pfdev->regulators), GFP_KERNEL); if (!pfdev->regulators) @@ -96,12 +96,12 @@ static int panfrost_regulator_init(struct panfrost_devi= ce *pfdev) for (i =3D 0; i < pfdev->comp->num_supplies; i++) pfdev->regulators[i].supply =3D pfdev->comp->supply_names[i]; =20 - ret =3D devm_regulator_bulk_get(pfdev->dev, + ret =3D devm_regulator_bulk_get(pfdev->base.dev, pfdev->comp->num_supplies, pfdev->regulators); if (ret < 0) { if (ret !=3D -EPROBE_DEFER) - dev_err(pfdev->dev, "failed to get regulators: %d\n", + dev_err(pfdev->base.dev, "failed to get regulators: %d\n", ret); return ret; } @@ -109,7 +109,7 @@ static int panfrost_regulator_init(struct panfrost_devi= ce *pfdev) ret =3D regulator_bulk_enable(pfdev->comp->num_supplies, pfdev->regulators); if (ret < 0) { - dev_err(pfdev->dev, "failed to enable regulators: %d\n", ret); + dev_err(pfdev->base.dev, "failed to enable regulators: %d\n", ret); return ret; } =20 @@ -144,7 +144,7 @@ static int panfrost_pm_domain_init(struct panfrost_devi= ce *pfdev) int err; int i, num_domains; =20 - num_domains =3D of_count_phandle_with_args(pfdev->dev->of_node, + num_domains =3D of_count_phandle_with_args(pfdev->base.dev->of_node, "power-domains", "#power-domain-cells"); =20 @@ -156,7 +156,7 @@ static int panfrost_pm_domain_init(struct panfrost_devi= ce *pfdev) return 0; =20 if (num_domains !=3D pfdev->comp->num_pm_domains) { - dev_err(pfdev->dev, + dev_err(pfdev->base.dev, "Incorrect number of power domains: %d provided, %d needed\n", num_domains, pfdev->comp->num_pm_domains); return -EINVAL; @@ -168,20 +168,21 @@ static int panfrost_pm_domain_init(struct panfrost_de= vice *pfdev) =20 for (i =3D 0; i < num_domains; i++) { pfdev->pm_domain_devs[i] =3D - dev_pm_domain_attach_by_name(pfdev->dev, - pfdev->comp->pm_domain_names[i]); + dev_pm_domain_attach_by_name(pfdev->base.dev, + pfdev->comp->pm_domain_names[i]); if (IS_ERR_OR_NULL(pfdev->pm_domain_devs[i])) { err =3D PTR_ERR(pfdev->pm_domain_devs[i]) ? : -ENODATA; pfdev->pm_domain_devs[i] =3D NULL; - dev_err(pfdev->dev, + dev_err(pfdev->base.dev, "failed to get pm-domain %s(%d): %d\n", pfdev->comp->pm_domain_names[i], i, err); goto err; } =20 - pfdev->pm_domain_links[i] =3D device_link_add(pfdev->dev, - pfdev->pm_domain_devs[i], DL_FLAG_PM_RUNTIME | - DL_FLAG_STATELESS | DL_FLAG_RPM_ACTIVE); + pfdev->pm_domain_links[i] =3D + device_link_add(pfdev->base.dev, + pfdev->pm_domain_devs[i], DL_FLAG_PM_RUNTIME | + DL_FLAG_STATELESS | DL_FLAG_RPM_ACTIVE); if (!pfdev->pm_domain_links[i]) { dev_err(pfdev->pm_domain_devs[i], "adding device link failed!\n"); @@ -211,14 +212,14 @@ int panfrost_device_init(struct panfrost_device *pfde= v) =20 err =3D panfrost_clk_init(pfdev); if (err) { - dev_err(pfdev->dev, "clk init failed %d\n", err); + dev_err(pfdev->base.dev, "clk init failed %d\n", err); return err; } =20 err =3D panfrost_devfreq_init(pfdev); if (err) { if (err !=3D -EPROBE_DEFER) - dev_err(pfdev->dev, "devfreq init failed %d\n", err); + dev_err(pfdev->base.dev, "devfreq init failed %d\n", err); goto out_clk; } =20 @@ -231,7 +232,7 @@ int panfrost_device_init(struct panfrost_device *pfdev) =20 err =3D panfrost_reset_init(pfdev); if (err) { - dev_err(pfdev->dev, "reset init failed %d\n", err); + dev_err(pfdev->base.dev, "reset init failed %d\n", err); goto out_regulator; } =20 @@ -239,7 +240,7 @@ int panfrost_device_init(struct panfrost_device *pfdev) if (err) goto out_reset; =20 - pfdev->iomem =3D devm_platform_ioremap_resource(pfdev->pdev, 0); + pfdev->iomem =3D devm_platform_ioremap_resource(to_platform_device(pfdev-= >base.dev), 0); if (IS_ERR(pfdev->iomem)) { err =3D PTR_ERR(pfdev->iomem); goto out_pm_domain; diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/p= anfrost/panfrost_device.h index cffcb0ac7c11..d9aea2c2cbe5 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -98,9 +98,7 @@ struct panfrost_compatible { }; =20 struct panfrost_device { - struct device *dev; - struct drm_device *ddev; - struct platform_device *pdev; + struct drm_device base; int gpu_irq; int mmu_irq; =20 @@ -181,7 +179,7 @@ struct panfrost_file_priv { =20 static inline struct panfrost_device *to_panfrost_device(struct drm_device= *ddev) { - return ddev->dev_private; + return container_of(ddev, struct panfrost_device, base); } =20 static inline int panfrost_model_cmp(struct panfrost_device *pfdev, s32 id) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index 04d615df5259..6284397a7030 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -35,7 +35,7 @@ static int panfrost_ioctl_query_timestamp(struct panfrost= _device *pfdev, { int ret; =20 - ret =3D pm_runtime_resume_and_get(pfdev->dev); + ret =3D pm_runtime_resume_and_get(pfdev->base.dev); if (ret) return ret; =20 @@ -43,14 +43,14 @@ static int panfrost_ioctl_query_timestamp(struct panfro= st_device *pfdev, *arg =3D panfrost_timestamp_read(pfdev); panfrost_cycle_counter_put(pfdev); =20 - pm_runtime_put(pfdev->dev); + pm_runtime_put(pfdev->base.dev); return 0; } =20 static int panfrost_ioctl_get_param(struct drm_device *ddev, void *data, s= truct drm_file *file) { struct drm_panfrost_get_param *param =3D data; - struct panfrost_device *pfdev =3D ddev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(ddev); int ret; =20 if (param->pad !=3D 0) @@ -274,7 +274,7 @@ panfrost_copy_in_sync(struct drm_device *dev, static int panfrost_ioctl_submit(struct drm_device *dev, void *data, struct drm_file *file) { - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); struct panfrost_file_priv *file_priv =3D file->driver_priv; struct drm_panfrost_submit *args =3D data; struct drm_syncobj *sync_out =3D NULL; @@ -435,7 +435,7 @@ static int panfrost_ioctl_madvise(struct drm_device *de= v, void *data, { struct panfrost_file_priv *priv =3D file_priv->driver_priv; struct drm_panfrost_madvise *args =3D data; - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); struct drm_gem_object *gem_obj; struct panfrost_gem_object *bo; int ret =3D 0; @@ -507,7 +507,7 @@ static int panfrost_open(struct drm_device *dev, struct drm_file *file) { int ret; - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); struct panfrost_file_priv *panfrost_priv; =20 panfrost_priv =3D kzalloc(sizeof(*panfrost_priv), GFP_KERNEL); @@ -604,8 +604,7 @@ static void panfrost_gpu_show_fdinfo(struct panfrost_de= vice *pfdev, =20 static void panfrost_show_fdinfo(struct drm_printer *p, struct drm_file *f= ile) { - struct drm_device *dev =3D file->minor->dev; - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(file->minor->dev); =20 panfrost_gpu_show_fdinfo(pfdev, file->driver_priv, p); =20 @@ -647,15 +646,12 @@ static const struct drm_driver panfrost_drm_driver = =3D { static int panfrost_probe(struct platform_device *pdev) { struct panfrost_device *pfdev; - struct drm_device *ddev; int err; =20 - pfdev =3D devm_kzalloc(&pdev->dev, sizeof(*pfdev), GFP_KERNEL); - if (!pfdev) - return -ENOMEM; - - pfdev->pdev =3D pdev; - pfdev->dev =3D &pdev->dev; + pfdev =3D devm_drm_dev_alloc(&pdev->dev, &panfrost_drm_driver, + struct panfrost_device, base); + if (IS_ERR(pfdev)) + return PTR_ERR(pfdev); =20 platform_set_drvdata(pdev, pfdev); =20 @@ -665,14 +661,6 @@ static int panfrost_probe(struct platform_device *pdev) =20 pfdev->coherent =3D device_get_dma_attr(&pdev->dev) =3D=3D DEV_DMA_COHERE= NT; =20 - /* Allocate and initialize the DRM device. */ - ddev =3D drm_dev_alloc(&panfrost_drm_driver, &pdev->dev); - if (IS_ERR(ddev)) - return PTR_ERR(ddev); - - ddev->dev_private =3D pfdev; - pfdev->ddev =3D ddev; - mutex_init(&pfdev->shrinker_lock); INIT_LIST_HEAD(&pfdev->shrinker_list); =20 @@ -683,51 +671,47 @@ static int panfrost_probe(struct platform_device *pde= v) goto err_out0; } =20 - pm_runtime_set_active(pfdev->dev); - pm_runtime_mark_last_busy(pfdev->dev); - pm_runtime_enable(pfdev->dev); - pm_runtime_set_autosuspend_delay(pfdev->dev, 50); /* ~3 frames */ - pm_runtime_use_autosuspend(pfdev->dev); + pm_runtime_set_active(pfdev->base.dev); + pm_runtime_mark_last_busy(pfdev->base.dev); + pm_runtime_enable(pfdev->base.dev); + pm_runtime_set_autosuspend_delay(pfdev->base.dev, 50); /* ~3 frames */ + pm_runtime_use_autosuspend(pfdev->base.dev); =20 /* * Register the DRM device with the core and the connectors with * sysfs */ - err =3D drm_dev_register(ddev, 0); + err =3D drm_dev_register(&pfdev->base, 0); if (err < 0) goto err_out1; =20 - err =3D panfrost_gem_shrinker_init(ddev); + err =3D panfrost_gem_shrinker_init(&pfdev->base); if (err) goto err_out2; =20 return 0; =20 err_out2: - drm_dev_unregister(ddev); + drm_dev_unregister(&pfdev->base); err_out1: - pm_runtime_disable(pfdev->dev); + pm_runtime_disable(pfdev->base.dev); panfrost_device_fini(pfdev); - pm_runtime_set_suspended(pfdev->dev); + pm_runtime_set_suspended(pfdev->base.dev); err_out0: - drm_dev_put(ddev); return err; } =20 static void panfrost_remove(struct platform_device *pdev) { struct panfrost_device *pfdev =3D platform_get_drvdata(pdev); - struct drm_device *ddev =3D pfdev->ddev; =20 - drm_dev_unregister(ddev); - panfrost_gem_shrinker_cleanup(ddev); + drm_dev_unregister(&pfdev->base); + panfrost_gem_shrinker_cleanup(&pfdev->base); =20 - pm_runtime_get_sync(pfdev->dev); - pm_runtime_disable(pfdev->dev); + pm_runtime_get_sync(pfdev->base.dev); + pm_runtime_disable(pfdev->base.dev); panfrost_device_fini(pfdev); - pm_runtime_set_suspended(pfdev->dev); - - drm_dev_put(ddev); + pm_runtime_set_suspended(pfdev->base.dev); } =20 static ssize_t profiling_show(struct device *dev, diff --git a/drivers/gpu/drm/panfrost/panfrost_dump.c b/drivers/gpu/drm/pan= frost/panfrost_dump.c index 47751302f1bc..ce704d077fa7 100644 --- a/drivers/gpu/drm/panfrost/panfrost_dump.c +++ b/drivers/gpu/drm/panfrost/panfrost_dump.c @@ -163,7 +163,7 @@ void panfrost_core_dump(struct panfrost_job *job) iter.start =3D __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY); if (!iter.start) { - dev_warn(pfdev->dev, "failed to allocate devcoredump file\n"); + dev_warn(pfdev->base.dev, "failed to allocate devcoredump file\n"); return; } =20 @@ -204,14 +204,14 @@ void panfrost_core_dump(struct panfrost_job *job) mapping =3D job->mappings[i]; =20 if (!bo->base.sgt) { - dev_err(pfdev->dev, "Panfrost Dump: BO has no sgt, cannot dump\n"); + dev_err(pfdev->base.dev, "Panfrost Dump: BO has no sgt, cannot dump\n"); iter.hdr->bomap.valid =3D 0; goto dump_header; } =20 ret =3D drm_gem_vmap_unlocked(&bo->base.base, &map); if (ret) { - dev_err(pfdev->dev, "Panfrost Dump: couldn't map Buffer Object\n"); + dev_err(pfdev->base.dev, "Panfrost Dump: couldn't map Buffer Object\n"); iter.hdr->bomap.valid =3D 0; goto dump_header; } @@ -237,5 +237,5 @@ dump_header: panfrost_core_dump_header(&iter, PANFROSTD= UMP_BUF_BO, iter.data + } panfrost_core_dump_header(&iter, PANFROSTDUMP_BUF_TRAILER, iter.data); =20 - dev_coredumpv(pfdev->dev, iter.start, iter.data - iter.start, GFP_KERNEL); + dev_coredumpv(pfdev->base.dev, iter.start, iter.data - iter.start, GFP_KE= RNEL); } diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panf= rost/panfrost_gem.c index 8e0ff3efede7..768fed21c985 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -17,7 +17,7 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj) { struct panfrost_gem_object *bo =3D to_panfrost_bo(obj); - struct panfrost_device *pfdev =3D obj->dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(obj->dev); =20 /* * Make sure the BO is no longer inserted in the shrinker list before @@ -41,7 +41,7 @@ static void panfrost_gem_free_object(struct drm_gem_objec= t *obj) =20 for (i =3D 0; i < n_sgt; i++) { if (bo->sgts[i].sgl) { - dma_unmap_sgtable(pfdev->dev, &bo->sgts[i], + dma_unmap_sgtable(pfdev->base.dev, &bo->sgts[i], DMA_BIDIRECTIONAL, 0); sg_free_table(&bo->sgts[i]); } @@ -249,7 +249,7 @@ static const struct drm_gem_object_funcs panfrost_gem_f= uncs =3D { */ struct drm_gem_object *panfrost_gem_create_object(struct drm_device *dev, = size_t size) { - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); struct panfrost_gem_object *obj; =20 obj =3D kzalloc(sizeof(*obj), GFP_KERNEL); diff --git a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c b/drivers/gpu= /drm/panfrost/panfrost_gem_shrinker.c index 3d9f51bd48b6..ee22777d06c8 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c @@ -97,7 +97,7 @@ panfrost_gem_shrinker_scan(struct shrinker *shrinker, str= uct shrink_control *sc) */ int panfrost_gem_shrinker_init(struct drm_device *dev) { - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); =20 pfdev->shrinker =3D shrinker_alloc(0, "drm-panfrost"); if (!pfdev->shrinker) @@ -120,7 +120,7 @@ int panfrost_gem_shrinker_init(struct drm_device *dev) */ void panfrost_gem_shrinker_cleanup(struct drm_device *dev) { - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); =20 if (pfdev->shrinker) shrinker_free(pfdev->shrinker); diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panf= rost/panfrost_gpu.c index f5abde3866fb..69425104ca97 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gpu.c +++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c @@ -36,12 +36,12 @@ static irqreturn_t panfrost_gpu_irq_handler(int irq, vo= id *data) u64 address =3D (u64) gpu_read(pfdev, GPU_FAULT_ADDRESS_HI) << 32; address |=3D gpu_read(pfdev, GPU_FAULT_ADDRESS_LO); =20 - dev_warn(pfdev->dev, "GPU Fault 0x%08x (%s) at 0x%016llx\n", + dev_warn(pfdev->base.dev, "GPU Fault 0x%08x (%s) at 0x%016llx\n", fault_status, panfrost_exception_name(fault_status & 0xFF), address); =20 if (state & GPU_IRQ_MULTIPLE_FAULT) - dev_warn(pfdev->dev, "There were multiple GPU faults - some have not be= en reported\n"); + dev_warn(pfdev->base.dev, "There were multiple GPU faults - some have n= ot been reported\n"); =20 gpu_write(pfdev, GPU_INT_MASK, 0); } @@ -72,13 +72,13 @@ int panfrost_gpu_soft_reset(struct panfrost_device *pfd= ev) val, val & GPU_IRQ_RESET_COMPLETED, 10, 10000); =20 if (ret) { - dev_err(pfdev->dev, "gpu soft reset timed out, attempting hard reset\n"); + dev_err(pfdev->base.dev, "gpu soft reset timed out, attempting hard rese= t\n"); =20 gpu_write(pfdev, GPU_CMD, GPU_CMD_HARD_RESET); ret =3D readl_relaxed_poll_timeout(pfdev->iomem + GPU_INT_RAWSTAT, val, val & GPU_IRQ_RESET_COMPLETED, 100, 10000); if (ret) { - dev_err(pfdev->dev, "gpu hard reset timed out\n"); + dev_err(pfdev->base.dev, "gpu hard reset timed out\n"); return ret; } } @@ -95,7 +95,7 @@ int panfrost_gpu_soft_reset(struct panfrost_device *pfdev) * All in-flight jobs should have released their cycle * counter references upon reset, but let us make sure */ - if (drm_WARN_ON(pfdev->ddev, atomic_read(&pfdev->cycle_counter.use_count)= !=3D 0)) + if (drm_WARN_ON(&pfdev->base, atomic_read(&pfdev->cycle_counter.use_count= ) !=3D 0)) atomic_set(&pfdev->cycle_counter.use_count, 0); =20 return 0; @@ -326,13 +326,13 @@ static void panfrost_gpu_init_features(struct panfros= t_device *pfdev) bitmap_from_u64(pfdev->features.hw_features, hw_feat); bitmap_from_u64(pfdev->features.hw_issues, hw_issues); =20 - dev_info(pfdev->dev, "mali-%s id 0x%x major 0x%x minor 0x%x status 0x%x", + dev_info(pfdev->base.dev, "mali-%s id 0x%x major 0x%x minor 0x%x status 0= x%x", name, gpu_id, major, minor, status); - dev_info(pfdev->dev, "features: %64pb, issues: %64pb", + dev_info(pfdev->base.dev, "features: %64pb, issues: %64pb", pfdev->features.hw_features, pfdev->features.hw_issues); =20 - dev_info(pfdev->dev, "Features: L2:0x%08x Shader:0x%08x Tiler:0x%08x Mem:= 0x%0x MMU:0x%08x AS:0x%x JS:0x%x", + dev_info(pfdev->base.dev, "Features: L2:0x%08x Shader:0x%08x Tiler:0x%08x= Mem:0x%0x MMU:0x%08x AS:0x%x JS:0x%x", pfdev->features.l2_features, pfdev->features.core_features, pfdev->features.tiler_features, @@ -341,7 +341,7 @@ static void panfrost_gpu_init_features(struct panfrost_= device *pfdev) pfdev->features.as_present, pfdev->features.js_present); =20 - dev_info(pfdev->dev, "shader_present=3D0x%0llx l2_present=3D0x%0llx", + dev_info(pfdev->base.dev, "shader_present=3D0x%0llx l2_present=3D0x%0llx", pfdev->features.shader_present, pfdev->features.l2_present); } =20 @@ -407,7 +407,7 @@ static u64 panfrost_get_core_mask(struct panfrost_devic= e *pfdev) */ core_mask =3D ~(pfdev->features.l2_present - 1) & (pfdev->features.l2_present - 2); - dev_info_once(pfdev->dev, "using only 1st core group (%lu cores from %lu)= \n", + dev_info_once(pfdev->base.dev, "using only 1st core group (%lu cores from= %lu)\n", hweight64(core_mask), hweight64(pfdev->features.shader_present)); =20 @@ -428,7 +428,7 @@ void panfrost_gpu_power_on(struct panfrost_device *pfde= v) val, val =3D=3D (pfdev->features.l2_present & core_mask), 10, 20000); if (ret) - dev_err(pfdev->dev, "error powering up gpu L2"); + dev_err(pfdev->base.dev, "error powering up gpu L2"); =20 gpu_write(pfdev, SHADER_PWRON_LO, pfdev->features.shader_present & core_mask); @@ -436,13 +436,13 @@ void panfrost_gpu_power_on(struct panfrost_device *pf= dev) val, val =3D=3D (pfdev->features.shader_present & core_mask), 10, 20000); if (ret) - dev_err(pfdev->dev, "error powering up gpu shader"); + dev_err(pfdev->base.dev, "error powering up gpu shader"); =20 gpu_write(pfdev, TILER_PWRON_LO, pfdev->features.tiler_present); ret =3D readl_relaxed_poll_timeout(pfdev->iomem + TILER_READY_LO, val, val =3D=3D pfdev->features.tiler_present, 10, 1000); if (ret) - dev_err(pfdev->dev, "error powering up gpu tiler"); + dev_err(pfdev->base.dev, "error powering up gpu tiler"); } =20 void panfrost_gpu_power_off(struct panfrost_device *pfdev) @@ -454,19 +454,19 @@ void panfrost_gpu_power_off(struct panfrost_device *p= fdev) ret =3D readl_relaxed_poll_timeout(pfdev->iomem + SHADER_PWRTRANS_LO, val, !val, 1, 2000); if (ret) - dev_err(pfdev->dev, "shader power transition timeout"); + dev_err(pfdev->base.dev, "shader power transition timeout"); =20 gpu_write(pfdev, TILER_PWROFF_LO, pfdev->features.tiler_present); ret =3D readl_relaxed_poll_timeout(pfdev->iomem + TILER_PWRTRANS_LO, val, !val, 1, 2000); if (ret) - dev_err(pfdev->dev, "tiler power transition timeout"); + dev_err(pfdev->base.dev, "tiler power transition timeout"); =20 gpu_write(pfdev, L2_PWROFF_LO, pfdev->features.l2_present); ret =3D readl_poll_timeout(pfdev->iomem + L2_PWRTRANS_LO, val, !val, 0, 2000); if (ret) - dev_err(pfdev->dev, "l2 power transition timeout"); + dev_err(pfdev->base.dev, "l2 power transition timeout"); } =20 void panfrost_gpu_suspend_irq(struct panfrost_device *pfdev) @@ -487,21 +487,22 @@ int panfrost_gpu_init(struct panfrost_device *pfdev) =20 panfrost_gpu_init_features(pfdev); =20 - err =3D dma_set_mask_and_coherent(pfdev->dev, - DMA_BIT_MASK(FIELD_GET(0xff00, pfdev->features.mmu_features))); + err =3D dma_set_mask_and_coherent(pfdev->base.dev, + DMA_BIT_MASK(FIELD_GET(0xff00, + pfdev->features.mmu_features))); if (err) return err; =20 - dma_set_max_seg_size(pfdev->dev, UINT_MAX); + dma_set_max_seg_size(pfdev->base.dev, UINT_MAX); =20 - pfdev->gpu_irq =3D platform_get_irq_byname(to_platform_device(pfdev->dev)= , "gpu"); + pfdev->gpu_irq =3D platform_get_irq_byname(to_platform_device(pfdev->base= .dev), "gpu"); if (pfdev->gpu_irq < 0) return pfdev->gpu_irq; =20 - err =3D devm_request_irq(pfdev->dev, pfdev->gpu_irq, panfrost_gpu_irq_han= dler, + err =3D devm_request_irq(pfdev->base.dev, pfdev->gpu_irq, panfrost_gpu_ir= q_handler, IRQF_SHARED, KBUILD_MODNAME "-gpu", pfdev); if (err) { - dev_err(pfdev->dev, "failed to request gpu irq"); + dev_err(pfdev->base.dev, "failed to request gpu irq"); return err; } =20 @@ -521,9 +522,9 @@ u32 panfrost_gpu_get_latest_flush_id(struct panfrost_de= vice *pfdev) =20 if (panfrost_has_hw_feature(pfdev, HW_FEATURE_FLUSH_REDUCTION)) { /* Flush reduction only makes sense when the GPU is kept powered on betw= een jobs */ - if (pm_runtime_get_if_in_use(pfdev->dev)) { + if (pm_runtime_get_if_in_use(pfdev->base.dev)) { flush_id =3D gpu_read(pfdev, GPU_LATEST_FLUSH_ID); - pm_runtime_put(pfdev->dev); + pm_runtime_put(pfdev->base.dev); return flush_id; } } diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panf= rost/panfrost_job.c index 9b8e82fb8bc4..f640d211cc3a 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -94,7 +94,7 @@ static struct dma_fence *panfrost_fence_create(struct pan= frost_device *pfdev, in if (!fence) return ERR_PTR(-ENOMEM); =20 - fence->dev =3D pfdev->ddev; + fence->dev =3D &pfdev->base; fence->queue =3D js_num; fence->seqno =3D ++js->queue[js_num].emit_seqno; dma_fence_init(&fence->base, &panfrost_fence_ops, &js->job_lock, @@ -205,7 +205,7 @@ static void panfrost_job_hw_submit(struct panfrost_job = *job, int js) =20 panfrost_devfreq_record_busy(&pfdev->pfdevfreq); =20 - ret =3D pm_runtime_get_sync(pfdev->dev); + ret =3D pm_runtime_get_sync(pfdev->base.dev); if (ret < 0) return; =20 @@ -256,7 +256,7 @@ static void panfrost_job_hw_submit(struct panfrost_job = *job, int js) } =20 job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); - dev_dbg(pfdev->dev, + dev_dbg(pfdev->base.dev, "JS: Submitting atom %p to js[%d][%d] with head=3D0x%llx AS %d", job, js, subslot, jc_head, cfg & 0xf); } @@ -437,12 +437,12 @@ static void panfrost_job_handle_err(struct panfrost_d= evice *pfdev, bool signal_fence =3D true; =20 if (!panfrost_exception_is_fault(js_status)) { - dev_dbg(pfdev->dev, "js event, js=3D%d, status=3D%s, head=3D0x%x, tail= =3D0x%x", + dev_dbg(pfdev->base.dev, "js event, js=3D%d, status=3D%s, head=3D0x%x, t= ail=3D0x%x", js, exception_name, job_read(pfdev, JS_HEAD_LO(js)), job_read(pfdev, JS_TAIL_LO(js))); } else { - dev_err(pfdev->dev, "js fault, js=3D%d, status=3D%s, head=3D0x%x, tail= =3D0x%x", + dev_err(pfdev->base.dev, "js fault, js=3D%d, status=3D%s, head=3D0x%x, t= ail=3D0x%x", js, exception_name, job_read(pfdev, JS_HEAD_LO(js)), job_read(pfdev, JS_TAIL_LO(js))); @@ -474,7 +474,7 @@ static void panfrost_job_handle_err(struct panfrost_dev= ice *pfdev, if (signal_fence) dma_fence_signal_locked(job->done_fence); =20 - pm_runtime_put_autosuspend(pfdev->dev); + pm_runtime_put_autosuspend(pfdev->base.dev); =20 if (panfrost_exception_needs_reset(pfdev, js_status)) { atomic_set(&pfdev->reset.pending, 1); @@ -493,7 +493,7 @@ static void panfrost_job_handle_done(struct panfrost_de= vice *pfdev, panfrost_devfreq_record_idle(&pfdev->pfdevfreq); =20 dma_fence_signal_locked(job->done_fence); - pm_runtime_put_autosuspend(pfdev->dev); + pm_runtime_put_autosuspend(pfdev->base.dev); } =20 static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 sta= tus) @@ -602,7 +602,7 @@ static void panfrost_job_handle_irqs(struct panfrost_de= vice *pfdev) u32 status =3D job_read(pfdev, JOB_INT_RAWSTAT); =20 while (status) { - pm_runtime_mark_last_busy(pfdev->dev); + pm_runtime_mark_last_busy(pfdev->base.dev); =20 spin_lock(&pfdev->js->job_lock); panfrost_job_handle_irq(pfdev, status); @@ -683,7 +683,7 @@ panfrost_reset(struct panfrost_device *pfdev, 10, 10000); =20 if (ret) - dev_err(pfdev->dev, "Soft-stop failed\n"); + dev_err(pfdev->base.dev, "Soft-stop failed\n"); =20 /* Handle the remaining interrupts before we reset. */ panfrost_job_handle_irqs(pfdev); @@ -701,7 +701,7 @@ panfrost_reset(struct panfrost_device *pfdev, if (pfdev->jobs[i][j]->requirements & PANFROST_JD_REQ_CYCLE_COUNT || pfdev->jobs[i][j]->is_profiled) panfrost_cycle_counter_put(pfdev->jobs[i][j]->pfdev); - pm_runtime_put_noidle(pfdev->dev); + pm_runtime_put_noidle(pfdev->base.dev); panfrost_devfreq_record_idle(&pfdev->pfdevfreq); } } @@ -769,11 +769,11 @@ static enum drm_gpu_sched_stat panfrost_job_timedout(= struct drm_sched_job synchronize_irq(pfdev->js->irq); =20 if (dma_fence_is_signaled(job->done_fence)) { - dev_warn(pfdev->dev, "unexpectedly high interrupt latency\n"); + dev_warn(pfdev->base.dev, "unexpectedly high interrupt latency\n"); return DRM_GPU_SCHED_STAT_NOMINAL; } =20 - dev_err(pfdev->dev, "gpu sched timeout, js=3D%d, config=3D0x%x, status=3D= 0x%x, head=3D0x%x, tail=3D0x%x, sched_job=3D%p", + dev_err(pfdev->base.dev, "gpu sched timeout, js=3D%d, config=3D0x%x, stat= us=3D0x%x, head=3D0x%x, tail=3D0x%x, sched_job=3D%p", js, job_read(pfdev, JS_CONFIG(js)), job_read(pfdev, JS_STATUS(js)), @@ -847,24 +847,25 @@ int panfrost_job_init(struct panfrost_device *pfdev) if (!panfrost_has_hw_feature(pfdev, HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) nentries =3D 1; =20 - pfdev->js =3D js =3D devm_kzalloc(pfdev->dev, sizeof(*js), GFP_KERNEL); + js =3D devm_kzalloc(pfdev->base.dev, sizeof(*js), GFP_KERNEL); if (!js) return -ENOMEM; + pfdev->js =3D js; =20 INIT_WORK(&pfdev->reset.work, panfrost_reset_work); spin_lock_init(&js->job_lock); =20 - js->irq =3D platform_get_irq_byname(to_platform_device(pfdev->dev), "job"= ); + js->irq =3D platform_get_irq_byname(to_platform_device(pfdev->base.dev), = "job"); if (js->irq < 0) return js->irq; =20 - ret =3D devm_request_threaded_irq(pfdev->dev, js->irq, + ret =3D devm_request_threaded_irq(pfdev->base.dev, js->irq, panfrost_job_irq_handler, panfrost_job_irq_handler_thread, IRQF_SHARED, KBUILD_MODNAME "-job", pfdev); if (ret) { - dev_err(pfdev->dev, "failed to request job irq"); + dev_err(pfdev->base.dev, "failed to request job irq"); return ret; } =20 @@ -881,9 +882,9 @@ int panfrost_job_init(struct panfrost_device *pfdev) nentries, 0, msecs_to_jiffies(JOB_TIMEOUT_MS), pfdev->reset.wq, - NULL, "pan_js", pfdev->dev); + NULL, "pan_js", pfdev->base.dev); if (ret) { - dev_err(pfdev->dev, "Failed to create scheduler: %d.", ret); + dev_err(pfdev->base.dev, "Failed to create scheduler: %d.", ret); goto err_sched; } } diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index b91019cd5acb..2189e42d2bfa 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -39,7 +39,7 @@ static int wait_ready(struct panfrost_device *pfdev, u32 = as_nr) if (ret) { /* The GPU hung, let's trigger a reset */ panfrost_device_schedule_reset(pfdev); - dev_err(pfdev->dev, "AS_ACTIVE bit stuck\n"); + dev_err(pfdev->base.dev, "AS_ACTIVE bit stuck\n"); } =20 return ret; @@ -212,7 +212,9 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, = struct panfrost_mmu *mmu) atomic_set(&mmu->as_count, 1); list_add(&mmu->list, &pfdev->as_lru_list); =20 - dev_dbg(pfdev->dev, "Assigned AS%d to mmu %p, alloc_mask=3D%lx", as, mmu,= pfdev->as_alloc_mask); + dev_dbg(pfdev->base.dev, + "Assigned AS%d to mmu %p, alloc_mask=3D%lx", + as, mmu, pfdev->as_alloc_mask); =20 panfrost_mmu_enable(pfdev, mmu); =20 @@ -278,13 +280,13 @@ static void panfrost_mmu_flush_range(struct panfrost_= device *pfdev, if (mmu->as < 0) return; =20 - pm_runtime_get_noresume(pfdev->dev); + pm_runtime_get_noresume(pfdev->base.dev); =20 /* Flush the PTs only if we're already awake */ - if (pm_runtime_active(pfdev->dev)) + if (pm_runtime_active(pfdev->base.dev)) mmu_hw_do_operation(pfdev, mmu, iova, size, AS_COMMAND_FLUSH_PT); =20 - pm_runtime_put_autosuspend(pfdev->dev); + pm_runtime_put_autosuspend(pfdev->base.dev); } =20 static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *= mmu, @@ -299,7 +301,9 @@ static int mmu_map_sg(struct panfrost_device *pfdev, st= ruct panfrost_mmu *mmu, unsigned long paddr =3D sg_dma_address(sgl); size_t len =3D sg_dma_len(sgl); =20 - dev_dbg(pfdev->dev, "map: as=3D%d, iova=3D%llx, paddr=3D%lx, len=3D%zx",= mmu->as, iova, paddr, len); + dev_dbg(pfdev->base.dev, + "map: as=3D%d, iova=3D%llx, paddr=3D%lx, len=3D%zx", + mmu->as, iova, paddr, len); =20 while (len) { size_t pgcount, mapped =3D 0; @@ -359,7 +363,7 @@ void panfrost_mmu_unmap(struct panfrost_gem_mapping *ma= pping) if (WARN_ON(!mapping->active)) return; =20 - dev_dbg(pfdev->dev, "unmap: as=3D%d, iova=3D%llx, len=3D%zx", + dev_dbg(pfdev->base.dev, "unmap: as=3D%d, iova=3D%llx, len=3D%zx", mapping->mmu->as, iova, len); =20 while (unmapped_len < len) { @@ -456,7 +460,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_= device *pfdev, int as, =20 bo =3D bomapping->obj; if (!bo->is_heap) { - dev_WARN(pfdev->dev, "matching BO is not heap type (GPU VA =3D %llx)", + dev_WARN(pfdev->base.dev, "matching BO is not heap type (GPU VA =3D %llx= )", bomapping->mmnode.start << PAGE_SHIFT); ret =3D -EINVAL; goto err_bo; @@ -523,7 +527,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_= device *pfdev, int as, if (ret) goto err_unlock; =20 - ret =3D dma_map_sgtable(pfdev->dev, sgt, DMA_BIDIRECTIONAL, 0); + ret =3D dma_map_sgtable(pfdev->base.dev, sgt, DMA_BIDIRECTIONAL, 0); if (ret) goto err_map; =20 @@ -533,7 +537,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_= device *pfdev, int as, bomapping->active =3D true; bo->heap_rss_size +=3D SZ_2M; =20 - dev_dbg(pfdev->dev, "mapped page fault @ AS%d %llx", as, addr); + dev_dbg(pfdev->base.dev, "mapped page fault @ AS%d %llx", as, addr); =20 out: dma_resv_unlock(obj->resv); @@ -559,10 +563,10 @@ static void panfrost_mmu_release_ctx(struct kref *kre= f) =20 spin_lock(&pfdev->as_lock); if (mmu->as >=3D 0) { - pm_runtime_get_noresume(pfdev->dev); - if (pm_runtime_active(pfdev->dev)) + pm_runtime_get_noresume(pfdev->base.dev); + if (pm_runtime_active(pfdev->base.dev)) panfrost_mmu_disable(pfdev, mmu->as); - pm_runtime_put_autosuspend(pfdev->dev); + pm_runtime_put_autosuspend(pfdev->base.dev); =20 clear_bit(mmu->as, &pfdev->as_alloc_mask); clear_bit(mmu->as, &pfdev->as_in_use_mask); @@ -637,7 +641,7 @@ struct panfrost_mmu *panfrost_mmu_ctx_create(struct pan= frost_device *pfdev) .oas =3D FIELD_GET(0xff00, pfdev->features.mmu_features), .coherent_walk =3D pfdev->coherent, .tlb =3D &mmu_tlb_ops, - .iommu_dev =3D pfdev->dev, + .iommu_dev =3D pfdev->base.dev, }; =20 mmu->pgtbl_ops =3D alloc_io_pgtable_ops(ARM_MALI_LPAE, &mmu->pgtbl_cfg, @@ -720,7 +724,7 @@ static irqreturn_t panfrost_mmu_irq_handler_thread(int = irq, void *data) =20 if (ret) { /* terminal fault, print info about the fault */ - dev_err(pfdev->dev, + dev_err(pfdev->base.dev, "Unhandled Page fault in AS%d at VA 0x%016llX\n" "Reason: %s\n" "raw fault status: 0x%X\n" @@ -768,18 +772,18 @@ int panfrost_mmu_init(struct panfrost_device *pfdev) { int err; =20 - pfdev->mmu_irq =3D platform_get_irq_byname(to_platform_device(pfdev->dev)= , "mmu"); + pfdev->mmu_irq =3D platform_get_irq_byname(to_platform_device(pfdev->base= .dev), "mmu"); if (pfdev->mmu_irq < 0) return pfdev->mmu_irq; =20 - err =3D devm_request_threaded_irq(pfdev->dev, pfdev->mmu_irq, + err =3D devm_request_threaded_irq(pfdev->base.dev, pfdev->mmu_irq, panfrost_mmu_irq_handler, panfrost_mmu_irq_handler_thread, IRQF_SHARED, KBUILD_MODNAME "-mmu", pfdev); =20 if (err) { - dev_err(pfdev->dev, "failed to request mmu irq"); + dev_err(pfdev->base.dev, "failed to request mmu irq"); return err; } =20 diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/= panfrost/panfrost_perfcnt.c index ba9b6e2b2636..f30817bcf8ba 100644 --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c @@ -84,11 +84,11 @@ static int panfrost_perfcnt_enable_locked(struct panfro= st_device *pfdev, else if (perfcnt->user) return -EBUSY; =20 - ret =3D pm_runtime_get_sync(pfdev->dev); + ret =3D pm_runtime_get_sync(pfdev->base.dev); if (ret < 0) goto err_put_pm; =20 - bo =3D drm_gem_shmem_create(pfdev->ddev, perfcnt->bosize); + bo =3D drm_gem_shmem_create(&pfdev->base, perfcnt->bosize); if (IS_ERR(bo)) { ret =3D PTR_ERR(bo); goto err_put_pm; @@ -173,7 +173,7 @@ static int panfrost_perfcnt_enable_locked(struct panfro= st_device *pfdev, err_put_bo: drm_gem_object_put(&bo->base); err_put_pm: - pm_runtime_put(pfdev->dev); + pm_runtime_put(pfdev->base.dev); return ret; } =20 @@ -201,8 +201,8 @@ static int panfrost_perfcnt_disable_locked(struct panfr= ost_device *pfdev, panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu); panfrost_gem_mapping_put(perfcnt->mapping); perfcnt->mapping =3D NULL; - pm_runtime_mark_last_busy(pfdev->dev); - pm_runtime_put_autosuspend(pfdev->dev); + pm_runtime_mark_last_busy(pfdev->base.dev); + pm_runtime_put_autosuspend(pfdev->base.dev); =20 return 0; } @@ -210,7 +210,7 @@ static int panfrost_perfcnt_disable_locked(struct panfr= ost_device *pfdev, int panfrost_ioctl_perfcnt_enable(struct drm_device *dev, void *data, struct drm_file *file_priv) { - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); struct panfrost_perfcnt *perfcnt =3D pfdev->perfcnt; struct drm_panfrost_perfcnt_enable *req =3D data; int ret; @@ -237,7 +237,7 @@ int panfrost_ioctl_perfcnt_enable(struct drm_device *de= v, void *data, int panfrost_ioctl_perfcnt_dump(struct drm_device *dev, void *data, struct drm_file *file_priv) { - struct panfrost_device *pfdev =3D dev->dev_private; + struct panfrost_device *pfdev =3D to_panfrost_device(dev); struct panfrost_perfcnt *perfcnt =3D pfdev->perfcnt; struct drm_panfrost_perfcnt_dump *req =3D data; void __user *user_ptr =3D (void __user *)(uintptr_t)req->buf_ptr; @@ -272,13 +272,13 @@ void panfrost_perfcnt_close(struct drm_file *file_pri= v) struct panfrost_device *pfdev =3D pfile->pfdev; struct panfrost_perfcnt *perfcnt =3D pfdev->perfcnt; =20 - pm_runtime_get_sync(pfdev->dev); + pm_runtime_get_sync(pfdev->base.dev); mutex_lock(&perfcnt->lock); if (perfcnt->user =3D=3D pfile) panfrost_perfcnt_disable_locked(pfdev, file_priv); mutex_unlock(&perfcnt->lock); - pm_runtime_mark_last_busy(pfdev->dev); - pm_runtime_put_autosuspend(pfdev->dev); + pm_runtime_mark_last_busy(pfdev->base.dev); + pm_runtime_put_autosuspend(pfdev->base.dev); } =20 int panfrost_perfcnt_init(struct panfrost_device *pfdev) @@ -316,7 +316,7 @@ int panfrost_perfcnt_init(struct panfrost_device *pfdev) COUNTERS_PER_BLOCK * BYTES_PER_COUNTER; } =20 - perfcnt =3D devm_kzalloc(pfdev->dev, sizeof(*perfcnt), GFP_KERNEL); + perfcnt =3D devm_kzalloc(pfdev->base.dev, sizeof(*perfcnt), GFP_KERNEL); if (!perfcnt) return -ENOMEM; =20 --=20 2.47.0 From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 296F91C3035 for ; Thu, 28 Nov 2024 21:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828384; cv=pass; b=nSkLZJMHfhccNLJ284FnrMWkvCB6dLqAhsygo7zfEcwewZ+g4dKysBo7nccI6jTaSPMemVWj+HUDfBRSkahFDLW6FCCTTHFa/7YrLFy9pNtg1iPaoFgHkaaWGiB8yPv/jQUIem2UNke4itnLnUHL2EZ/D6T5u2OBIiqiGv3IhEE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828384; c=relaxed/simple; bh=r51hqawVAvNZ5vG8936yL+aGEWWOgtFLPINQposKCmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qPHOpQAaXhW9vYKGHJW6WAYEVAH0q/ppS6xW/+4eUveag/8VMGkOqinUNGT5L9xlk1GqZQ8m9f2wm+8zdXTwfZQ5SEHk7jv5dr0yMyOYrrNxcZA47M2URgepgGN/H3C7Zis3EpmC6XNOflDAB/Itq4kl6ZCfuTNma7Z+1XMkM68= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=AaG/bbno; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="AaG/bbno" ARC-Seal: i=1; a=rsa-sha256; t=1732828362; cv=none; d=zohomail.com; s=zohoarc; b=UBXITQU65g5yMW5WrvLWYjJdwBnXfy1k89KraOMGAAfn7hn3/06ofEZa/MPSw/Q/3k/pAQdmAQABoWdCXJ68KhNM6KrdIQm73qAkP9dkJgaZPhUZlceqnqwlEJuXJu3jFMqw4Du+Iqil5aLc+Nit61HPIx1m1uguX2jqj0yql0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828362; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=R39w5zBfj7DJRcNWotPOClY5HZfoNtPYpt/6Md6nCH0=; b=S+Bo7jeNYPh6Dzq2ND382HRlh1G102LCMzUrCdPXlDuAHaP3CFIKst5ze6yevoyVJkZtMOH2cBjfY7TOrOA7UaPh5G+hppq6BMChmlPdEyjj6oveoWEgfCyRPAVeiStbqfGcNK0MKG/fOh7lXlsRwxykU5+tJLG46n7wFnG92VM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828362; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=R39w5zBfj7DJRcNWotPOClY5HZfoNtPYpt/6Md6nCH0=; b=AaG/bbno0AhoQDzzXA3kpe5GSFtr/z93KwKgy46ut0HovS/tCkYKMIaDPgPuDCJL G/9fA7J+hva/D3PF0tQScYgKh482js0q0jhOWJfczoUhZ0MyNlwPDE+J/HLU+CWAf+u Y2tLZ9BHsHUbWBbjwTm/mj7pARrxm1UZPVulu6aQ= Received: by mx.zohomail.com with SMTPS id 1732828362107162.7255296598679; Thu, 28 Nov 2024 13:12:42 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] drm/panfrost: Handle inexistent GPU during probe Date: Thu, 28 Nov 2024 21:06:17 +0000 Message-ID: <20241128211223.1805830-3-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Just in case we're dealing with a yet not recognised device. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Steven Price --- drivers/gpu/drm/panfrost/panfrost_gpu.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panf= rost/panfrost_gpu.c index 69425104ca97..da55dc7c0552 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gpu.c +++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c @@ -236,9 +236,10 @@ static const struct panfrost_model gpu_models[] =3D { */ GPU_MODEL(g57, 0x9003, GPU_REV(g57, 0, 0)), + {0}, }; =20 -static void panfrost_gpu_init_features(struct panfrost_device *pfdev) +static int panfrost_gpu_init_features(struct panfrost_device *pfdev) { u32 gpu_id, num_js, major, minor, status, rev; const char *name =3D "unknown"; @@ -323,6 +324,12 @@ static void panfrost_gpu_init_features(struct panfrost= _device *pfdev) break; } =20 + if (!model->name) { + dev_err(pfdev->base.dev, "GPU model not found: mali-%s id rev %#x %#x\n", + name, gpu_id, rev); + return -ENODEV; + } + bitmap_from_u64(pfdev->features.hw_features, hw_feat); bitmap_from_u64(pfdev->features.hw_issues, hw_issues); =20 @@ -343,6 +350,8 @@ static void panfrost_gpu_init_features(struct panfrost_= device *pfdev) =20 dev_info(pfdev->base.dev, "shader_present=3D0x%0llx l2_present=3D0x%0llx", pfdev->features.shader_present, pfdev->features.l2_present); + + return 0; } =20 void panfrost_cycle_counter_get(struct panfrost_device *pfdev) @@ -485,7 +494,9 @@ int panfrost_gpu_init(struct panfrost_device *pfdev) if (err) return err; =20 - panfrost_gpu_init_features(pfdev); + err =3D panfrost_gpu_init_features(pfdev); + if (err) + return err; =20 err =3D dma_set_mask_and_coherent(pfdev->base.dev, DMA_BIT_MASK(FIELD_GET(0xff00, --=20 2.47.0 From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 163AA1C1F06 for ; Thu, 28 Nov 2024 21:13:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828383; cv=pass; b=Y7Gb5lWfU7JGhcTSJz1VhbmLXuZ8AoNcU1BS/I4S+lH3QqPmS02Ik957hhIOtSPy9XZzuSx6y8R+6202UlLtsOuGF9/NDRbWAq/ytkAPNVb75xEapWiIvyf9313c2Qy7zvQ5vVBp8i7E5CcRDgl265gTiAzoXlEEZJ7tVb3ACy4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828383; c=relaxed/simple; bh=kUxM+2O+TZmAkHjbl9h032v8GfApBUMEE9n4bgMX/No=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=onbF61HcTIcc9iJ2OxN0SyGANpXRI76soPys+k1j5hK8sprcZ7V2hHREHcOmMm2mmKSjSjp6wY441XmHf0tAHjKbfUg+5MCQNxBh+iDNaQKJiw6tIFx2fQmBqThgayaE5TaND3uiSNNtYMRh5B0yUd/SKwdw9/F3Pa46mD46nzw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=jb0PwZfB; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="jb0PwZfB" ARC-Seal: i=1; a=rsa-sha256; t=1732828364; cv=none; d=zohomail.com; s=zohoarc; b=VSVNqtj3oY8LwO1rViJju56vYlvGlgKjy59dyZktTBV3+fQxzluFa6v57640HnpiIJzyy6WHIsW5Ej3DbiRVbpdWMd1M+RvJK9NfaGiQFbOgdJ7UE+62dnpNivYGw+uL0FRXOevo9Nno1fmlg3CkoM0i1gNXNgZGTm77ZfObGRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828364; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=htgxecyDu4cViAvkQlpShzB4N7SVqiV2cFyANiNtDwc=; b=IAgbA0Cr89HnCiFhK8bglCbRBaup1lU7RHRCNmBCX6HoKBZ7ILwqfyrJClOvO8FgGsIS33GvJO0QeqGtAg0ZDq7zB1bZbxCcxKhW+9vBsz0e8hD4uCe419kuSntZG651cxW3KZM3DKJsNAglBpv3r55eSm9kBAOEf3PnnftGogk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828364; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=htgxecyDu4cViAvkQlpShzB4N7SVqiV2cFyANiNtDwc=; b=jb0PwZfBjiQE4pbS4PRM8QRosZAG9/bHcy9EVfeH0UZYhExu/VIWAxcR/mpO6zGW XcMT2VHfAbcvLndl7wRqtAVgHWPOYOM3NLY7zR7fyPwqUss4pCX+bhA42i+gDT/sZkA SvL6gPkEDjlltcKqfwUcG8evuAurRI2E/u6W2N2o= Received: by mx.zohomail.com with SMTPS id 1732828364259603.1116847144285; Thu, 28 Nov 2024 13:12:44 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/8] drm/panfrost: Handle job HW submit errors Date: Thu, 28 Nov 2024 21:06:18 +0000 Message-ID: <20241128211223.1805830-4-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Avoid waiting for the DRM scheduler job timedout handler, and instead, let the DRM scheduler core signal the error fence immediately when HW job submission fails. That means we must also decrement the runtime-PM refcnt for the device, because the job will never be enqueued or inflight. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_job.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panf= rost/panfrost_job.c index f640d211cc3a..3f4f0682d69d 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -195,7 +195,7 @@ panfrost_enqueue_job(struct panfrost_device *pfdev, int= slot, return 1; } =20 -static void panfrost_job_hw_submit(struct panfrost_job *job, int js) +static int panfrost_job_hw_submit(struct panfrost_job *job, int js) { struct panfrost_device *pfdev =3D job->pfdev; unsigned int subslot; @@ -207,10 +207,11 @@ static void panfrost_job_hw_submit(struct panfrost_jo= b *job, int js) =20 ret =3D pm_runtime_get_sync(pfdev->base.dev); if (ret < 0) - return; + goto err_hwsubmit; =20 if (WARN_ON(job_read(pfdev, JS_COMMAND_NEXT(js)))) { - return; + ret =3D -EINVAL; + goto err_hwsubmit; } =20 cfg =3D panfrost_mmu_as_get(pfdev, job->mmu); @@ -261,6 +262,12 @@ static void panfrost_job_hw_submit(struct panfrost_job= *job, int js) job, js, subslot, jc_head, cfg & 0xf); } spin_unlock(&pfdev->js->job_lock); + + return 0; + +err_hwsubmit: + pm_runtime_put_autosuspend(pfdev->base.dev); + return ret; } =20 static int panfrost_acquire_object_fences(struct drm_gem_object **bos, @@ -382,6 +389,7 @@ static struct dma_fence *panfrost_job_run(struct drm_sc= hed_job *sched_job) struct panfrost_device *pfdev =3D job->pfdev; int slot =3D panfrost_job_get_slot(job); struct dma_fence *fence =3D NULL; + int ret; =20 if (unlikely(job->base.s_fence->finished.error)) return NULL; @@ -400,7 +408,11 @@ static struct dma_fence *panfrost_job_run(struct drm_s= ched_job *sched_job) dma_fence_put(job->done_fence); job->done_fence =3D dma_fence_get(fence); =20 - panfrost_job_hw_submit(job, slot); + ret =3D panfrost_job_hw_submit(job, slot); + if (ret) { + dma_fence_put(job->done_fence); + return ERR_PTR(ret); + } =20 return fence; } --=20 2.47.0 From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 559251C3030 for ; Thu, 28 Nov 2024 21:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828383; cv=pass; b=rXpWA6UmDwebjvINeDCOnIZ/5LAt8oeSid7OgFaen7KkWuLJHF74jZpUBEyrjBj+UP0G95imxUe2vGJeMHdzPo1bzDab9BSVGbEYl/SRSuUcuqBkodXa8EB+XHtO7V7H+ucV5ng5xW/UpB8/M6vktZYAE8LAOvrOZbcq17hfpxw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828383; c=relaxed/simple; bh=NbuwBBBxILqVg0MpU2AoR/F3g9jHD90SURdiEOS8Tms=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GvKg7qrlqHcYKyU0QDAjuLtcs3cnjs1kEzZ8WyeJj4pFe/EWHv1eJdsyXObu2XQK4GmL8YWoZeMM0pYVgGutI/MGj3UI7JInI+gdlt5x8wBzyQjzIo/8+y+09UGe5rrWdjvCbh3Wmdj44wXyl/3qmS0/EifDcacHhFB0MZgn1gg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=KMbNT9Au; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="KMbNT9Au" ARC-Seal: i=1; a=rsa-sha256; t=1732828366; cv=none; d=zohomail.com; s=zohoarc; b=HG41YBfhRINc8HLm+FUETI/VPXlnra1ojIcjBskQW3mL0pir95PyEDWl2aJCrCiZvmoN9AGwY3yaFoDkj+dpzowFPjyc6PNvBXTJiHl3gKZ3PEYSmFL8KpRq1v0tGRZMCrAH+vIbsKKJVXadfRAGf0vm3B1kl8ZiyWObtXksXug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828366; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=4KMeDqmO6/kMqWAURl+BuWqqDuQXnOAKVcXkzDnRlbQ=; b=EoKfNHUuLE+qKj+LLLeKUqlmkdxwt0k1Pw6TBVeVBsDARE6xJuLc7LK3q0x7tiUK2Brr3ji2udDzKg/IDHQ8s9bhQfGi5p2C/IYHSwo8NQw990qCdB3mhNEQD2CIEMZLdYqh1nTKMvFwBH2c4Mpy1NDVCZJOmr0EEGGqUZF8NqI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828366; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=4KMeDqmO6/kMqWAURl+BuWqqDuQXnOAKVcXkzDnRlbQ=; b=KMbNT9AuRvt7iwGH9LliiiOVNzebKw0yCw5ReyxGamwV4HsqDwGLh195+zmzXjV/ uCx4WY2t4cXCRBHctYFDTVmvvmt5K9+ejplVzatrTixi2XWr/YDKjToeL25uHBLyybx cb31nWrGUNuTQ2Wwf9nKJPotgwJfCC2/STrmbQMc= Received: by mx.zohomail.com with SMTPS id 1732828366344785.3465141422423; Thu, 28 Nov 2024 13:12:46 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/8] drm/panfrost: Handle error when allocating AS number Date: Thu, 28 Nov 2024 21:06:19 +0000 Message-ID: <20241128211223.1805830-5-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable If we reach the beginning of the LRU AS list, then return an error. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +++-- drivers/gpu/drm/panfrost/panfrost_mmu.h | 2 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 9 ++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panf= rost/panfrost_job.c index 3f4f0682d69d..fba1a376f593 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -214,7 +214,11 @@ static int panfrost_job_hw_submit(struct panfrost_job = *job, int js) goto err_hwsubmit; } =20 - cfg =3D panfrost_mmu_as_get(pfdev, job->mmu); + ret =3D panfrost_mmu_as_get(pfdev, job->mmu); + if (ret < 0) + goto err_hwsubmit; + + cfg =3D (u32)ret; =20 job_write(pfdev, JS_HEAD_NEXT_LO(js), lower_32_bits(jc_head)); job_write(pfdev, JS_HEAD_NEXT_HI(js), upper_32_bits(jc_head)); diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index 2189e42d2bfa..03ac527b35e7 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -155,7 +155,7 @@ static void panfrost_mmu_disable(struct panfrost_device= *pfdev, u32 as_nr) write_cmd(pfdev, as_nr, AS_COMMAND_UPDATE); } =20 -u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu) +int panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu) { int as; =20 @@ -197,7 +197,8 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, = struct panfrost_mmu *mmu) if (!atomic_read(&lru_mmu->as_count)) break; } - WARN_ON(&lru_mmu->list =3D=3D &pfdev->as_lru_list); + if (WARN_ON(&lru_mmu->list =3D=3D &pfdev->as_lru_list)) + return -EBUSY; =20 list_del_init(&lru_mmu->list); as =3D lru_mmu->as; diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.h b/drivers/gpu/drm/panf= rost/panfrost_mmu.h index 022a9a74a114..e6e6966a0cca 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.h +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.h @@ -16,7 +16,7 @@ void panfrost_mmu_fini(struct panfrost_device *pfdev); void panfrost_mmu_reset(struct panfrost_device *pfdev); void panfrost_mmu_suspend_irq(struct panfrost_device *pfdev); =20 -u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu); +int panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu); void panfrost_mmu_as_put(struct panfrost_device *pfdev, struct panfrost_mm= u *mmu); =20 struct panfrost_mmu *panfrost_mmu_ctx_get(struct panfrost_mmu *mmu); diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/= panfrost/panfrost_perfcnt.c index f30817bcf8ba..2145f9707dde 100644 --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c @@ -130,7 +130,12 @@ static int panfrost_perfcnt_enable_locked(struct panfr= ost_device *pfdev, =20 perfcnt->user =3D user; =20 - as =3D panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu); + ret =3D panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu); + if (ret) + goto err_unsetuser; + + as =3D (u32)ret; + cfg =3D GPU_PERFCNT_CFG_AS(as) | GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_MANUAL); =20 @@ -164,6 +169,8 @@ static int panfrost_perfcnt_enable_locked(struct panfro= st_device *pfdev, =20 return 0; =20 +err_unsetuser: + perfcnt->user =3D NULL; err_vunmap: drm_gem_vunmap_unlocked(&bo->base, &map); err_put_mapping: --=20 2.47.0 From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0E511C760A for ; Thu, 28 Nov 2024 21:13:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828391; cv=pass; b=p75zHcW43T7EmEzqYyPm7Ht4PhklgpWFFvI0IXY5GonexKmWXD296ko7CJql5oTJMiy7ngEdDxfJtbp6dSar7GxJBgUgYCD4Wrep5j0fR8uWFt+dXtbrZvGWDgW5dRMLLDoXC1RQrUIwJZNJ4EQK5ru5W5N96DSGhCLTl64OWGw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828391; c=relaxed/simple; bh=3ipTqGiruk2z0sEQ2XCkWrB++61h9aNP6aic2wX2y3U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OsF1yqi0gF3f/k9k73P+DaFKNkXRDMauYfNCTuB/oAND3XhVerMc9mdlEJnp3vuC9PUWI+Xv8h/fkN835f7PsZO3ReU1nrMZQUuY8v1YB2Qf8awqwVZ5Sy2FL3Tj8BGDFQS8wiW3PmUXwFtyBBuZ2gL0fDhG1hoBGJsGKaLVOO0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=Z2ejdybj; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="Z2ejdybj" ARC-Seal: i=1; a=rsa-sha256; t=1732828368; cv=none; d=zohomail.com; s=zohoarc; b=V2IRM7qky4mW+J0o6xJptzbQxmAfoDMvzCP7rqcy8whGin4IxwU2PZRVk0bUHYC64gQwJ4zDKUYc0mL/rnSoh4/foLwdMcanRgPJJYWobkrbqApF6Ujwnvhj+L9vRWy60Zf68AcIzWpp+9vN9So3N42WDX10LNvaK1LcHaWRDfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828368; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=puqGqEGvhCHRg7oLThh1hFUv/PwfEleC2DPSwEtBjEc=; b=Jg9F0p19IPQw4gBid7CQisbvyn66FCYZUYgn+T6Qoc1j4kwrZ8sOr82nqViA5OJ6bS/sWKhI5caMBFKKGySBoyZbQa8tXRGAopDmlI3xD37XWKKfy+1S81R49XHDljJ2vzvipjBtAK+f5tomolu4Jm3vLAvxoPRlSyrwy6aJTbw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828368; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=puqGqEGvhCHRg7oLThh1hFUv/PwfEleC2DPSwEtBjEc=; b=Z2ejdybj6JqoisZD1tegC3DpRkeSsh+71o4PBI01MXxos5cxWDxzxE3Rsupx+mjM svPqrALhibxsH5ogO4v1ZfSSJ42ZYgLGtkLcSZMZ6CUneV2qHEP58N1Nrnr6lnQgYGn rDn4VpCX0dHCmvkN6uG1JIhqAYnH9i3wCDLpXay0= Received: by mx.zohomail.com with SMTPS id 173282836848383.19268185540102; Thu, 28 Nov 2024 13:12:48 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/8] drm/panfrost: Handle page mapping failure Date: Thu, 28 Nov 2024 21:06:20 +0000 Message-ID: <20241128211223.1805830-6-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When mapping the pages of a BO, either a heap type at page fault time or else a non-heap BO at object creation time, if the ARM page table mapping function fails, we unmap what had been mapped so far and bail out. Signed-off-by: Adri=C3=A1n Larumbe --- drivers/gpu/drm/panfrost/panfrost_mmu.c | 44 ++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index 03ac527b35e7..5e30888bea0e 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -290,13 +290,31 @@ static void panfrost_mmu_flush_range(struct panfrost_= device *pfdev, pm_runtime_put_autosuspend(pfdev->base.dev); } =20 +static void mmu_unmap_range(size_t len, u64 iova, struct io_pgtable_ops *o= ps) +{ + size_t pgsize, unmapped_len =3D 0; + size_t unmapped_page, pgcount; + + while (unmapped_len < len) { + pgsize =3D get_pgsize(iova, len - unmapped_len, &pgcount); + + unmapped_page =3D ops->unmap_pages(ops, iova, pgsize, pgcount, NULL); + WARN_ON(unmapped_page !=3D pgsize * pgcount); + + iova +=3D pgsize * pgcount; + unmapped_len +=3D pgsize * pgcount; + } +} + static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *= mmu, u64 iova, int prot, struct sg_table *sgt) { unsigned int count; struct scatterlist *sgl; struct io_pgtable_ops *ops =3D mmu->pgtbl_ops; + size_t total_mapped =3D 0; u64 start_iova =3D iova; + int ret =3D 0; =20 for_each_sgtable_dma_sg(sgt, sgl, count) { unsigned long paddr =3D sg_dma_address(sgl); @@ -310,10 +328,15 @@ static int mmu_map_sg(struct panfrost_device *pfdev, = struct panfrost_mmu *mmu, size_t pgcount, mapped =3D 0; size_t pgsize =3D get_pgsize(iova | paddr, len, &pgcount); =20 - ops->map_pages(ops, iova, paddr, pgsize, pgcount, prot, + ret =3D ops->map_pages(ops, iova, paddr, pgsize, pgcount, prot, GFP_KERNEL, &mapped); + if (ret) { + mmu_unmap_range(total_mapped, start_iova, ops); + return ret; + } /* Don't get stuck if things have gone wrong */ mapped =3D max(mapped, pgsize); + total_mapped +=3D mapped; iova +=3D mapped; paddr +=3D mapped; len -=3D mapped; @@ -333,6 +356,7 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *mappi= ng) struct panfrost_device *pfdev =3D to_panfrost_device(obj->dev); struct sg_table *sgt; int prot =3D IOMMU_READ | IOMMU_WRITE; + int ret; =20 if (WARN_ON(mapping->active)) return 0; @@ -344,8 +368,13 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *mapp= ing) if (WARN_ON(IS_ERR(sgt))) return PTR_ERR(sgt); =20 - mmu_map_sg(pfdev, mapping->mmu, mapping->mmnode.start << PAGE_SHIFT, - prot, sgt); + ret =3D mmu_map_sg(pfdev, mapping->mmu, mapping->mmnode.start << PAGE_SHI= FT, + prot, sgt); + if (ret) { + drm_gem_shmem_put_pages(shmem); + return ret; + } + mapping->active =3D true; =20 return 0; @@ -532,8 +561,10 @@ static int panfrost_mmu_map_fault_addr(struct panfrost= _device *pfdev, int as, if (ret) goto err_map; =20 - mmu_map_sg(pfdev, bomapping->mmu, addr, - IOMMU_WRITE | IOMMU_READ | IOMMU_NOEXEC, sgt); + ret =3D mmu_map_sg(pfdev, bomapping->mmu, addr, + IOMMU_WRITE | IOMMU_READ | IOMMU_NOEXEC, sgt); + if (ret) + goto err_mmu_map_sg; =20 bomapping->active =3D true; bo->heap_rss_size +=3D SZ_2M; @@ -547,6 +578,9 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_= device *pfdev, int as, =20 return 0; =20 +err_mmu_map_sg: + dma_unmap_sgtable(pfdev->base.dev, sgt, + DMA_BIDIRECTIONAL, 0); err_map: sg_free_table(sgt); err_unlock: --=20 2.47.0 From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD7461C3F1F for ; Thu, 28 Nov 2024 21:13:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828392; cv=pass; b=sF6wDaPqbrp8//36Z9+TTYU8ZBimlz9sIyFw7mqX2uyOAaHpT99n5Xwq1ZFhxdkGb02HmyQl0PkPpsJkhTdqqxsgQ08VfFJkgkkZA1THuAggvF/KeOP3BUCDP9NYOjvG5ok7eQAgqy739PizSPBwhNbH7kQmbi9HEPdHvO8NmZc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828392; c=relaxed/simple; bh=5on97FpL9Aqegx+6X9MIp6qSoZE0MHA+7LP4ypzIeNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o0wkxjLGhaDKfzDSEsyeGxIExCu/3C1/xQScb1inyPX3HK4AOpO2E4ozfX2FRyj5WtyF9DpH5bicA0T/Z8nw1M/HzvWsrSFI34yU0ixAV9CwCde1FD/k1NyXQis7ok+CNGqe0ulWk252UYUUyNq1+cvLtJc7Az+FVHFuaFXUdYw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=Xix8IP+n; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="Xix8IP+n" ARC-Seal: i=1; a=rsa-sha256; t=1732828370; cv=none; d=zohomail.com; s=zohoarc; b=BFnJMAc6dha0H9dsImbz6qne9m7Qg5SaVW3jKFnFAVzLHJkpdNUoD7rIatxnViW97YRSismPVcRJRDQjz+g7x4uNuAQcaQOhLQlN+4xkUINZV1Rd9OC8qDKfKPoPe4i6BcmqJbeT3qNZvtQ+9ufM65HjgsOh9LIrZYOzHocbakI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828370; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=jw4U8uvyXiSmp/rvi6C6lOrR52smOsg1WBdXfy53UV4=; b=a1TZbcGyjB3fyqweTSNoZWJJhTsPyBeSdfJUf12uXm0yUyPcQazG2GC8quIjQyuzS6giTzvcUHDuriTNZQDn0tCzzHfKY6IRsqByL3T5Zhd0YMFymcEs/dGLdodYb9OF58mFGUgUrURWPLmIfwCi3UrDhTZH0kzixNw3DKhZDlM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828370; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=jw4U8uvyXiSmp/rvi6C6lOrR52smOsg1WBdXfy53UV4=; b=Xix8IP+nRwPf6CJ6+88X0SowZ2Gxzzfi71SXSgP2YOoaShvzMEUQP3gi95XrCWfi bcI5Xp6mV+H2RhnM2oTyBZYLBovJ9yyNzYHd+Jrk3doZck+YqeC5OdXmMB4EaaVv4Px 2x8OXmlHZZUeQCY3fC+i4aeFDy8Fiz43GMP4O1m4= Received: by mx.zohomail.com with SMTPS id 1732828370435211.2544619738951; Thu, 28 Nov 2024 13:12:50 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] drm/panfrost: Make re-enabling job interrupts at device reset optional Date: Thu, 28 Nov 2024 21:06:21 +0000 Message-ID: <20241128211223.1805830-7-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Rather than remasking interrupts after a device reset in the main reset path, allow selecting whether to do this with an additional bool parameter. To this end, split reenabling job interrupts into two functions, one that clears the interrupts and another one which unmasks them conditionally. Signed-off-by: Adri=C3=A1n Larumbe --- drivers/gpu/drm/panfrost/panfrost_device.c | 11 +++++-- drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- drivers/gpu/drm/panfrost/panfrost_job.c | 34 ++++++++++++---------- drivers/gpu/drm/panfrost/panfrost_job.h | 3 +- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/p= anfrost/panfrost_device.c index 4fe29286bbe3..7e5d39699982 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -395,20 +395,25 @@ bool panfrost_exception_needs_reset(const struct panf= rost_device *pfdev, return false; } =20 -void panfrost_device_reset(struct panfrost_device *pfdev) +void panfrost_device_reset(struct panfrost_device *pfdev, bool enable_job_= int) { + u32 irq_mask; + panfrost_gpu_soft_reset(pfdev); =20 panfrost_gpu_power_on(pfdev); panfrost_mmu_reset(pfdev); - panfrost_job_enable_interrupts(pfdev); + + irq_mask =3D panfrost_job_reset_interrupts(pfdev); + if (enable_job_int) + panfrost_enable_interrupts(pfdev, irq_mask); } =20 static int panfrost_device_runtime_resume(struct device *dev) { struct panfrost_device *pfdev =3D dev_get_drvdata(dev); =20 - panfrost_device_reset(pfdev); + panfrost_device_reset(pfdev, true); panfrost_devfreq_resume(pfdev); =20 return 0; diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/p= anfrost/panfrost_device.h index d9aea2c2cbe5..fc83d5e104a3 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -205,7 +205,7 @@ int panfrost_unstable_ioctl_check(void); =20 int panfrost_device_init(struct panfrost_device *pfdev); void panfrost_device_fini(struct panfrost_device *pfdev); -void panfrost_device_reset(struct panfrost_device *pfdev); +void panfrost_device_reset(struct panfrost_device *pfdev, bool enable_job_= int); =20 extern const struct dev_pm_ops panfrost_pm_ops; =20 diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panf= rost/panfrost_job.c index fba1a376f593..79d2ee3625b2 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -27,6 +27,10 @@ #define job_write(dev, reg, data) writel(data, dev->iomem + (reg)) #define job_read(dev, reg) readl(dev->iomem + (reg)) =20 +#define JOB_INT_ENABLE_MASK \ + (GENMASK(16 + NUM_JOB_SLOTS - 1, 16) | \ + GENMASK(NUM_JOB_SLOTS - 1, 0)) + struct panfrost_queue_state { struct drm_gpu_scheduler sched; u64 fence_context; @@ -421,18 +425,23 @@ static struct dma_fence *panfrost_job_run(struct drm_= sched_job *sched_job) return fence; } =20 -void panfrost_job_enable_interrupts(struct panfrost_device *pfdev) +u32 panfrost_job_reset_interrupts(struct panfrost_device *pfdev) { int j; u32 irq_mask =3D 0; =20 - clear_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended); - for (j =3D 0; j < NUM_JOB_SLOTS; j++) { irq_mask |=3D MK_JS_MASK(j); } =20 job_write(pfdev, JOB_INT_CLEAR, irq_mask); + + return irq_mask; +} + +void panfrost_enable_interrupts(struct panfrost_device *pfdev, u32 irq_mas= k) +{ + clear_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended); job_write(pfdev, JOB_INT_MASK, irq_mask); } =20 @@ -725,12 +734,7 @@ panfrost_reset(struct panfrost_device *pfdev, spin_unlock(&pfdev->js->job_lock); =20 /* Proceed with reset now. */ - panfrost_device_reset(pfdev); - - /* panfrost_device_reset() unmasks job interrupts, but we want to - * keep them masked a bit longer. - */ - job_write(pfdev, JOB_INT_MASK, 0); + panfrost_device_reset(pfdev, false); =20 /* GPU has been reset, we can clear the reset pending bit. */ atomic_set(&pfdev->reset.pending, 0); @@ -752,9 +756,7 @@ panfrost_reset(struct panfrost_device *pfdev, drm_sched_start(&pfdev->js->queue[i].sched, 0); =20 /* Re-enable job interrupts now that everything has been restarted. */ - job_write(pfdev, JOB_INT_MASK, - GENMASK(16 + NUM_JOB_SLOTS - 1, 16) | - GENMASK(NUM_JOB_SLOTS - 1, 0)); + panfrost_enable_interrupts(pfdev, JOB_INT_ENABLE_MASK); =20 dma_fence_end_signalling(cookie); } @@ -827,9 +829,7 @@ static irqreturn_t panfrost_job_irq_handler_thread(int = irq, void *data) =20 /* Enable interrupts only if we're not about to get suspended */ if (!test_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended)) - job_write(pfdev, JOB_INT_MASK, - GENMASK(16 + NUM_JOB_SLOTS - 1, 16) | - GENMASK(NUM_JOB_SLOTS - 1, 0)); + job_write(pfdev, JOB_INT_MASK, JOB_INT_ENABLE_MASK); =20 return IRQ_HANDLED; } @@ -854,6 +854,7 @@ int panfrost_job_init(struct panfrost_device *pfdev) { struct panfrost_job_slot *js; unsigned int nentries =3D 2; + u32 irq_mask; int ret, j; =20 /* All GPUs have two entries per queue, but without jobchain @@ -905,7 +906,8 @@ int panfrost_job_init(struct panfrost_device *pfdev) } } =20 - panfrost_job_enable_interrupts(pfdev); + irq_mask =3D panfrost_job_reset_interrupts(pfdev); + panfrost_enable_interrupts(pfdev, irq_mask); =20 return 0; =20 diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/panf= rost/panfrost_job.h index ec581b97852b..c09d42ee5039 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.h +++ b/drivers/gpu/drm/panfrost/panfrost_job.h @@ -46,7 +46,8 @@ void panfrost_job_close(struct panfrost_file_priv *panfro= st_priv); int panfrost_job_get_slot(struct panfrost_job *job); int panfrost_job_push(struct panfrost_job *job); void panfrost_job_put(struct panfrost_job *job); -void panfrost_job_enable_interrupts(struct panfrost_device *pfdev); +u32 panfrost_job_reset_interrupts(struct panfrost_device *pfdev); +void panfrost_enable_interrupts(struct panfrost_device *pfdev, u32 irq_mas= k); void panfrost_job_suspend_irq(struct panfrost_device *pfdev); int panfrost_job_is_idle(struct panfrost_device *pfdev); =20 --=20 2.47.0 From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 303CF1C9EA5 for ; Thu, 28 Nov 2024 21:13:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828393; cv=pass; b=QMAGaRxTuW0sVV6HPksueoLWchkUXXBPSo/nvQ1EguzpxiOadeUziF2Faw21264dupHc0NcIg+dtmiRum9umAV2J+128v0X+exnvY2vVvT9B91N+vhI+gh/hmP011otY5RHQIiPBQl4+O3GaQe1MGWDfakYpXiP4+3rXbowIn6A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828393; c=relaxed/simple; bh=AxnCoSsQT/Inwc7H9+HYjCY/COf7gr/Zs98Hst+F+ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Sss01taBOUwmW/BWlsxSXOEuT//KSwM1VjbvKbXhpmNcsESBKOWXAXPmcppRAVZRSN1kdN65WtrNQgvWg6leq8299ikebRgEf0fB0MXxb3UO/eR1ro+9+IhshTjQ/scyIS+RvZqqA2Y7XtDDNwO5oqEnmpS3GJsypgpc8dfCln8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=LOD8yZ8n; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="LOD8yZ8n" ARC-Seal: i=1; a=rsa-sha256; t=1732828372; cv=none; d=zohomail.com; s=zohoarc; b=YJElRx/hzL+K4Zo9VKax1AZ9sX8hKK29BRZubKa/9TcKxUB6HEAclE8e7VIODNTT0Rc1Bu0S26M2shot5vz3vBf5NYqU0O9ox3n3Qdgpvghh++gC7nyuUGYrnY3T/rvhbpW1kXZaUEeautEyFGsHHcec+Ivu63GH+EnwcyXpPvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828372; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=Yn/js7NZspWK7Y4TuaoCNTjlLJOty2gRQ/c6GMAPBqY=; b=g9h5py+xo+fqeoSU6l4MQ25B8Fk5VC5mVQur0lNxVQFSyuv79x5RpCqvVCJhqraFQm+hZVuMHYKy9/u1ZshNNOqf+K60N2YRG6Cd87G0wlTF1OJst6K42l2eezFaebxjPEmnh3L67pO5WvpofTctCwz5xrmFYLqCXXEmKzwdsAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828372; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=Yn/js7NZspWK7Y4TuaoCNTjlLJOty2gRQ/c6GMAPBqY=; b=LOD8yZ8nnDldkHQFXBzFXXjyjJTlg/GboTWXzTZTdKAoJPdmQIFAwPAUOAYilJum cGK0srOyxZGeW+Ob7/LBTj7WOT+JAQXBB1MmDrUXKo7/yZXhZttK4YTIhTD3fenS0oO wS3pUh9ZAVVgYWhHrKlbBoF5kRxDm7DHQzd6bYpU= Received: by mx.zohomail.com with SMTPS id 17328283726021021.3499072852073; Thu, 28 Nov 2024 13:12:52 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] drm/panfrost: Add forward declaration and types header Date: Thu, 28 Nov 2024 21:06:22 +0000 Message-ID: <20241128211223.1805830-8-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is to make LLVM syntactic analysers happy. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_mmu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.h b/drivers/gpu/drm/panf= rost/panfrost_mmu.h index e6e6966a0cca..27c3c65ed074 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.h +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.h @@ -4,6 +4,7 @@ #ifndef __PANFROST_MMU_H__ #define __PANFROST_MMU_H__ =20 +struct panfrost_device; struct panfrost_gem_mapping; struct panfrost_file_priv; struct panfrost_mmu; --=20 2.47.0 From nobody Sat Feb 7 08:07:17 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 829BF1C75F3 for ; Thu, 28 Nov 2024 21:13:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828391; cv=pass; b=JTSlAvsVcVt9lP92Ja+1YaugqBWC34phf8EgQGtcTx8GlvX5s9Wh570vmAUYuEcn42oLNbH7DACclaFYvrJFu2pnBUBZppwgl2urZst99epGusujJxzm3aNgXsV03eSE1zDwMGMsunaOcsvKViLkXVVVpzeNIjinBS0oCeyfFwo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828391; c=relaxed/simple; bh=7ZvAM8LeNcGpYnaIV8kS8sxsDHLAn+pHpFcHTHCn05g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i2159KVt6pldMs/sbjVX22XWRdzG+7tMM9XzxPFsFjeDr+Luy2B0y236Ju43OJTR+u1GXNjDBRvmSo6r57wGEOyuF/eTjBCm30Ga5q0mEdTvJfA0sgg8Blet3lzEsFR9vje/iKkBR9JQMrms0ktzqGgSdA0rohxOaeeLaQSBD88= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=De3vQalX; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="De3vQalX" ARC-Seal: i=1; a=rsa-sha256; t=1732828374; cv=none; d=zohomail.com; s=zohoarc; b=Iqt1iX2INO98N3AvbhmT0ROJ2qvAKHwItoX4py5bL+Dxse0P21aOy0Zgpm6XFfFR8A4A12WX6pYpY0zcICWLgeEmaux2bIL11/13UlJ3LohlV5NlHF3Zb19GBX1SQYKr5I5X3Azom2EsyX0Dy/d2uwX9Y+vYQ6HnKj5BgOLqka8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828374; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=tOVwrrlUZ2MlE+48s7qwMLmhwjK5xM0tNaJsi4iUz2U=; b=OQR9EWPgZ42ZbPvIrFiU0OAvHAzMCQPaf+3EtJ0SWdGfNYioIpjqgCdZcp3gwXSdXRO3gcIqp8idv8Ov3/0xNzWV6D0gqC/PmOkwRi3CvklgHTuAtA0/rDpwX0Dyjby3hlvpNPBQVVBe0B7+KfoQK25iQr+j5Wh9kTDXLKt/Mvs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828374; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=tOVwrrlUZ2MlE+48s7qwMLmhwjK5xM0tNaJsi4iUz2U=; b=De3vQalXNmNn99Xw3ePAZim89tn6R5nYeUD6Md7ZEgC4nYFWhMd3YshLrAOqMPaT MrqaEm99mLNXKfESEtPK/fQ1j4bDncQp4zDKpwcz8yTt5171/UdzFG67cnVjXUHcsYW JK8PU5VWAkeSAdOSnYucvEYxeNBCICu2AHXta2wQ= Received: by mx.zohomail.com with SMTPS id 1732828374531886.7951127970854; Thu, 28 Nov 2024 13:12:54 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/8] drm/panfrost: Remove unused device property Date: Thu, 28 Nov 2024 21:06:23 +0000 Message-ID: <20241128211223.1805830-9-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The as_in_use_mask device state variable is no longer in use. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_device.h | 1 - drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/p= anfrost/panfrost_device.h index fc83d5e104a3..b91957f886ea 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -117,7 +117,6 @@ struct panfrost_device { DECLARE_BITMAP(is_suspended, PANFROST_COMP_BIT_MAX); =20 spinlock_t as_lock; - unsigned long as_in_use_mask; unsigned long as_alloc_mask; unsigned long as_faulty_mask; struct list_head as_lru_list; diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index 5e30888bea0e..95df39b463d8 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -604,7 +604,6 @@ static void panfrost_mmu_release_ctx(struct kref *kref) pm_runtime_put_autosuspend(pfdev->base.dev); =20 clear_bit(mmu->as, &pfdev->as_alloc_mask); - clear_bit(mmu->as, &pfdev->as_in_use_mask); list_del(&mmu->list); } spin_unlock(&pfdev->as_lock); --=20 2.47.0