From nobody Wed Dec 17 15:54:17 2025 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6DC319B5B0 for ; Mon, 24 Jun 2024 15:12:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241964; cv=none; b=PHCfEh0QLGMnVtKREF+mt3lmMLWlERURYxck6wAUPMxklnDXNA0zdepkRbu+FfE4IHo777fZ7A56ARSDSLZvRNCBKl2G+xGbDMp630DjhhNi7n4H8nYuvF1Yeca713xNg7wqxndZkHIuCvNm/XI7T4S2A0fjT+KlmJZtl1KkLQM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241964; c=relaxed/simple; bh=HUUByk0DJZztso08IM0S+v7LViXOLUvI91fhluWlZhw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NcEBS3tYTEcsDrclaLZEQMFzzT+uUzAV7i14r+WbzsHnnQhapKxBWM9jT6Wvtxf4hlavtM1tlTnSzO9E1JQ04g5LLv+J+T/qFIWaaBZW7WCPvOZ1kks2mJfl0U4wCmp52Sn4HrflHPE7cvqJH1PRwdhVs2uHxK9CIFtZzfrGDpQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PZylxdIu; arc=none smtp.client-ip=209.85.219.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PZylxdIu" Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6b4ffc2a7abso35740236d6.1 for ; Mon, 24 Jun 2024 08:12:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719241962; x=1719846762; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1GABY2nvouUZjfeGwOTIxOkPVykOPUX3bq4LbbVyRoM=; b=PZylxdIutwpCH3pjnusOl84V/DXq1m9h7/k6eD651IMQ0VXRXct/QBmlf+4vg7trBW 2CGQfECnFVud/+HOIGLpXTb67/9S/+HMZhJ7I0S131S+FvysqMmIw9CvUg6EzBJwty7O 3lSrGOKSehJdb3CsjdMZWEzoMJMM5j4cPV+YL9QlxEWSAaAsYLRWyRTgqxfL1y9SynHf jfFkyG61uNW+kn4H7poq59xw9/N0jP/8CZHY2soX5223zBztFcQWriytg3MOC+fRX17h WUEdCt6XtMszPIY8TvGTVB8TlQsbmhf/48TzpZ6gHaNC/U6nByFPem5Aixw9avHvFXJZ 8F8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719241962; x=1719846762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1GABY2nvouUZjfeGwOTIxOkPVykOPUX3bq4LbbVyRoM=; b=URXkXFyNjbAs3cSxF+myq/Yg14RKo3H5CoorkEcPBQkXq5BCP1W85ybHgekMF6IGgv Q8RK9ihbCHsUNG6kLZy+49Br5OFjQnl+bUdVo+HHBop/8AblaWycUBySmcOf1DC8y/va fxGGxhuAacNJbCdftwB0QoR9orJe4ba/nBMxxKdTgNJoxkat1mgwLaz6YjhI3y0Qi1GK fpi/OQ7AGb13U8MBfLVY39V1Pyeu687H0wxX2173GhQS7G8Kl+dD/27ZB2W6IGP45otR 7Oo7LLzUlzUuGfUT4pK1DFKdwgtPDaZRjc7SYF87oa87N9VSJDkqUYSG7qABboAgEu14 tckw== X-Forwarded-Encrypted: i=1; AJvYcCXeTetqs8IWmwVq83JcQVJFCPFwfMogMaja8riWBNpg/KW/dmM0Qxz0f59xH9TNlzSUA92gfc1yXzPIUZEzdW5TUtvhrgVj0RyRep2x X-Gm-Message-State: AOJu0YwHPfoha1cbccOR6pNHuWewNoPjEZUwDiZQG65vzfL0wCTUl9ti B5UnM+B9hIBeJaKgN82bK7XgL3EF8pVNY6zW7gF5k1c5KrtvBbvh X-Google-Smtp-Source: AGHT+IFuVCQIMxGLsEodTOfH3eyC8ePGTJrcOWZgS2npTRXBH4SIi8n4cZ2nFvHwh8J8UOMRC8+4tg== X-Received: by 2002:ad4:418d:0:b0:6b5:2f57:1a63 with SMTP id 6a1803df08f44-6b56360996amr12300036d6.21.1719241961650; Mon, 24 Jun 2024 08:12:41 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b529eb3decsm27243976d6.12.2024.06.24.08.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 08:12:41 -0700 (PDT) From: Wu Hoi Pok To: Cc: Thomas Zimmermann , Wu Hoi Pok , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/7] drm/radeon: remove load callback Date: Mon, 24 Jun 2024 11:10:45 -0400 Message-ID: <20240624151122.23724-2-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240624151122.23724-1-wuhoipok@gmail.com> References: <20240624151122.23724-1-wuhoipok@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove ".load" callback form "kms_driver", and move "struct drm_device" into radeon_device. Patch 2 to 7 follows up with changing the way of accessing drm_device, from "rdev->ddev" to "rdev_to_drm(rdev)" which is "&rdev->ddev". Signed-off-by: Wu Hoi Pok --- drivers/gpu/drm/radeon/radeon.h | 11 ++++++++--- drivers/gpu/drm/radeon/radeon_drv.c | 27 ++++++++++++++++++--------- drivers/gpu/drm/radeon/radeon_drv.h | 1 - drivers/gpu/drm/radeon/radeon_kms.c | 18 ++++++------------ 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeo= n.h index 0999c8eaae94..69bb30ced189 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -2297,7 +2297,7 @@ typedef void (*radeon_wreg_t)(struct radeon_device*, = uint32_t, uint32_t); =20 struct radeon_device { struct device *dev; - struct drm_device *ddev; + struct drm_device ddev; struct pci_dev *pdev; #ifdef __alpha__ struct pci_controller *hose; @@ -2440,10 +2440,13 @@ struct radeon_device { u64 gart_pin_size; }; =20 +static inline struct drm_device *rdev_to_drm(struct radeon_device *rdev) +{ + return &rdev->ddev; +} + bool radeon_is_px(struct drm_device *dev); int radeon_device_init(struct radeon_device *rdev, - struct drm_device *ddev, - struct pci_dev *pdev, uint32_t flags); void radeon_device_fini(struct radeon_device *rdev); int radeon_gpu_wait_for_idle(struct radeon_device *rdev); @@ -2818,6 +2821,8 @@ struct radeon_device *radeon_get_rdev(struct ttm_devi= ce *bdev); =20 /* KMS */ =20 +int radeon_driver_load_kms(struct radeon_device *dev, unsigned long flags); + u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc); int radeon_enable_vblank_kms(struct drm_crtc *crtc); void radeon_disable_vblank_kms(struct drm_crtc *crtc); diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/r= adeon_drv.c index 7bf08164140e..ae9cadceba83 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -259,7 +259,8 @@ static int radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { unsigned long flags =3D 0; - struct drm_device *dev; + struct drm_device *ddev; + struct radeon_device *rdev; int ret; =20 if (!ent) @@ -300,28 +301,37 @@ static int radeon_pci_probe(struct pci_dev *pdev, if (ret) return ret; =20 - dev =3D drm_dev_alloc(&kms_driver, &pdev->dev); - if (IS_ERR(dev)) - return PTR_ERR(dev); + rdev =3D devm_drm_dev_alloc(&pdev->dev, &kms_driver, typeof(*rdev), ddev); + if (IS_ERR(rdev)) + return PTR_ERR(rdev); + + rdev->dev =3D &pdev->dev; + rdev->pdev =3D pdev; + ddev =3D rdev_to_drm(rdev); + ddev->dev_private =3D rdev; =20 ret =3D pci_enable_device(pdev); if (ret) goto err_free; =20 - pci_set_drvdata(pdev, dev); + pci_set_drvdata(pdev, ddev); + + ret =3D radeon_driver_load_kms(rdev, flags); + if (ret) + goto err_agp; =20 - ret =3D drm_dev_register(dev, ent->driver_data); + ret =3D drm_dev_register(ddev, flags); if (ret) goto err_agp; =20 - radeon_fbdev_setup(dev->dev_private); + radeon_fbdev_setup(ddev->dev_private); =20 return 0; =20 err_agp: pci_disable_device(pdev); err_free: - drm_dev_put(dev); + drm_dev_put(ddev); return ret; } =20 @@ -569,7 +579,6 @@ static const struct drm_ioctl_desc radeon_ioctls_kms[] = =3D { static const struct drm_driver kms_driver =3D { .driver_features =3D DRIVER_GEM | DRIVER_RENDER | DRIVER_MODESET, - .load =3D radeon_driver_load_kms, .open =3D radeon_driver_open_kms, .postclose =3D radeon_driver_postclose_kms, .unload =3D radeon_driver_unload_kms, diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/r= adeon_drv.h index 02a65971d140..6c1eb75a951b 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -117,7 +117,6 @@ long radeon_drm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); =20 -int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); void radeon_driver_unload_kms(struct drm_device *dev); int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_p= riv); void radeon_driver_postclose_kms(struct drm_device *dev, diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/r= adeon_kms.c index a16590c6247f..d2df194393af 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -91,7 +91,7 @@ void radeon_driver_unload_kms(struct drm_device *dev) /** * radeon_driver_load_kms - Main load function for KMS. * - * @dev: drm dev pointer + * @rdev: radeon dev pointer * @flags: device flags * * This is the main load function for KMS (all asics). @@ -101,24 +101,18 @@ void radeon_driver_unload_kms(struct drm_device *dev) * (crtcs, encoders, hotplug detect, etc.). * Returns 0 on success, error on failure. */ -int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) +int radeon_driver_load_kms(struct radeon_device *rdev, unsigned long flags) { - struct pci_dev *pdev =3D to_pci_dev(dev->dev); - struct radeon_device *rdev; + struct pci_dev *pdev =3D rdev->pdev; + struct drm_device *dev =3D rdev_to_drm(rdev); int r, acpi_status; =20 - rdev =3D kzalloc(sizeof(struct radeon_device), GFP_KERNEL); - if (rdev =3D=3D NULL) { - return -ENOMEM; - } - dev->dev_private =3D (void *)rdev; - #ifdef __alpha__ rdev->hose =3D pdev->sysdata; #endif =20 if (pci_find_capability(pdev, PCI_CAP_ID_AGP)) - rdev->agp =3D radeon_agp_head_init(dev); + rdev->agp =3D radeon_agp_head_init(rdev_to_drm(rdev)); if (rdev->agp) { rdev->agp->agp_mtrr =3D arch_phys_wc_add( rdev->agp->agp_info.aper_base, @@ -147,7 +141,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsi= gned long flags) * properly initialize the GPU MC controller and permit * VRAM allocation */ - r =3D radeon_device_init(rdev, dev, pdev, flags); + r =3D radeon_device_init(rdev, flags); if (r) { dev_err(dev->dev, "Fatal error during GPU init\n"); goto out; --=20 2.45.2 From nobody Wed Dec 17 15:54:17 2025 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 553E919D09F for ; Mon, 24 Jun 2024 15:12:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241970; cv=none; b=FHAB2I5/PsfVFY/kcFyzrTxu2YLyuA8r8Jg/fUwPA2+JyGRNvzHT94n6vwfHc1Z830LjkftxkaPsAr9qCM1atN7rInfvHFGjsfHX8OuuHPMXfeC8Ghq/dPljX1P395T1m9k1Cyn7s8NGv5yPL6uVe52no2GoSfbO3m2ld3FtPCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241970; c=relaxed/simple; bh=rQ255jo/0R2Fgl2xJezPDOxpdyhC25KATHsXN3lzip0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B7ebSlibMEhiX+kR1ky78c7JekXclb/HB3oZ5IAgbeIODNYcyoARBsppXRcOzznzK8tGCD9eoBIq5IiGZu22Ag0FxOwhAmrXsXa+lPSNPOy45/KgdwaUHGAkdKH/JboPoXkG++PY3z17T8K4O32bItsh9fixXW/1ZQMhMHGmquo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Gn+KDODd; arc=none smtp.client-ip=209.85.222.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gn+KDODd" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7960454db4fso318007785a.2 for ; Mon, 24 Jun 2024 08:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719241967; x=1719846767; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TRx/eEU8NJWLVz1z5MnvNgmh5VYj9CW+G0+gtbI+FdU=; b=Gn+KDODdWFA449FcomAwpkpm6f910pEYmruV1iD8kAkccjY1h1BzmJv/l9w79d69wW KvdrNYPTRpgn40SxD0Vz3S5tQtttB9pn6qgDJ2jgIVKLT0bGTIuOso43oARTYOW61h2C r9rSwOIeSRZVpb0vgUVXXYDK955Je8OoCqbXvkGKwC4rXDQ2oSXHcgJDqvLi9TGJ4ws5 3AQOzSoxSNX9hmvpReY+YvGEJenWAwyPDjXKyWbc+dqeFLe0uSotBHL5Ps8fvf+IzH0P 3OP1JcVnHVJ6m9TTkhnHyQXVTo669idTzSd/S5XOAmpWBSfffqwJpym/8JqNpfpilJ7o rJHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719241967; x=1719846767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TRx/eEU8NJWLVz1z5MnvNgmh5VYj9CW+G0+gtbI+FdU=; b=bOXSwlw38KNcHm9I9Rki79e+SI/3s1J4VNxBJGucL9I56sRvLiftqdpXMj3tfjBkhS 92gwaanP/NXRygQeYCsIlfWOoVQtha1wCbbQRr4vvzssBNw2qgmGI2l6nAJasogBXC/n GnLHoo8KDtLG/78ADnhWVZ6UsMMzLYhtOTsUYZ1Xmuj37P0Zm7cw1bdTywfouKo6Nb3z 0guGBc+Uq/wZ/mL8cWocGkxQNRIQ44ddQ0Fc1xPbvK9GIs9sXYbk3uMt6eAtSRg3Ceds jv1YHLn87E8JrOwokNJtDFYbaFlgftrizKOnm5cdxZ3qv1PZc0p0gs6y5ys5pp4puk4h jXfg== X-Forwarded-Encrypted: i=1; AJvYcCXHBOPY67k8dxBsV9pLbqMYoQiByqMJo77YqwKVxT0Q8TnKvJJoovu4YmwKNyRLIrCPe3myf1hABRhu15Fzh2z1ubpPjFNPtAS3hStF X-Gm-Message-State: AOJu0Yy1OsN1jFrb4IL6eFO15Y0ahnnbjV2io0PsbgWnVWtvAVhDp0K7 uq8NAHvqVZhrPdX02l4IzCNF0nVnnDDGjUf7ctGHjEAuSXR1EQPv X-Google-Smtp-Source: AGHT+IGJbCvsCnoKaU58U8z9Z8j/l7ioDzlcso5e8SqAsL6lBwZWy4cbsRw4dddwwJbTVLqWmgqNfA== X-Received: by 2002:a0c:f584:0:b0:6b0:930a:8d4b with SMTP id 6a1803df08f44-6b53653ade1mr67415296d6.55.1719241967068; Mon, 24 Jun 2024 08:12:47 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b529eb3decsm27243976d6.12.2024.06.24.08.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 08:12:46 -0700 (PDT) From: Wu Hoi Pok To: Cc: Thomas Zimmermann , Wu Hoi Pok , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/7] drm/radeon: rdev->ddev to rdev_to_drm(rdev) 1 Date: Mon, 24 Jun 2024 11:10:46 -0400 Message-ID: <20240624151122.23724-3-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240624151122.23724-1-wuhoipok@gmail.com> References: <20240624151122.23724-1-wuhoipok@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Please refer to patch 1. Signed-off-by: Wu Hoi Pok --- drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- drivers/gpu/drm/radeon/cik.c | 14 ++++++------- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 12 +++++------ drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r100.c | 24 +++++++++++----------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/r= adeon/atombios_encoders.c index 03e6871b3065..c82e0fbc49b4 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -2179,7 +2179,7 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *= encoder, int fe_idx) void radeon_atom_encoder_init(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_encoder *encoder; =20 list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index b5e96a8fc2c1..11a492f21157 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -7585,7 +7585,7 @@ int cik_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[0]) { - drm_handle_vblank(rdev->ddev, 0); + drm_handle_vblank(rdev_to_drm(rdev), 0); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -7615,7 +7615,7 @@ int cik_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[1]) { - drm_handle_vblank(rdev->ddev, 1); + drm_handle_vblank(rdev_to_drm(rdev), 1); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -7645,7 +7645,7 @@ int cik_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[2]) { - drm_handle_vblank(rdev->ddev, 2); + drm_handle_vblank(rdev_to_drm(rdev), 2); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -7675,7 +7675,7 @@ int cik_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[3]) { - drm_handle_vblank(rdev->ddev, 3); + drm_handle_vblank(rdev_to_drm(rdev), 3); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -7705,7 +7705,7 @@ int cik_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[4]) { - drm_handle_vblank(rdev->ddev, 4); + drm_handle_vblank(rdev_to_drm(rdev), 4); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -7735,7 +7735,7 @@ int cik_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[5]) { - drm_handle_vblank(rdev->ddev, 5); + drm_handle_vblank(rdev_to_drm(rdev), 5); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -8581,7 +8581,7 @@ int cik_init(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); =20 /* Fence driver */ radeon_fence_driver_init(rdev); diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dc= e6_afmt.c index 4c06f47453fd..d6ab93ed9ec4 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -91,7 +91,7 @@ struct r600_audio_pin *dce6_audio_get_pin(struct radeon_d= evice *rdev) pin =3D &rdev->audio.pin[i]; pin_count =3D 0; =20 - list_for_each_entry(encoder, &rdev->ddev->mode_config.encoder_list, hea= d) { + list_for_each_entry(encoder, &rdev_to_drm(rdev)->mode_config.encoder_li= st, head) { if (radeon_encoder_is_digital(encoder)) { radeon_encoder =3D to_radeon_encoder(encoder); dig =3D radeon_encoder->enc_priv; diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/ev= ergreen.c index c634dc28e6c3..bc4ab71613a5 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1673,7 +1673,7 @@ void evergreen_pm_misc(struct radeon_device *rdev) */ void evergreen_pm_prepare(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 tmp; @@ -1698,7 +1698,7 @@ void evergreen_pm_prepare(struct radeon_device *rdev) */ void evergreen_pm_finish(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 tmp; @@ -1763,7 +1763,7 @@ void evergreen_hpd_set_polarity(struct radeon_device = *rdev, */ void evergreen_hpd_init(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned enabled =3D 0; u32 tmp =3D DC_HPDx_CONNECTION_TIMER(0x9c4) | @@ -1804,7 +1804,7 @@ void evergreen_hpd_init(struct radeon_device *rdev) */ void evergreen_hpd_fini(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned disabled =3D 0; =20 @@ -4753,7 +4753,7 @@ int evergreen_irq_process(struct radeon_device *rdev) event_name =3D "vblank"; =20 if (rdev->irq.crtc_vblank_int[crtc_idx]) { - drm_handle_vblank(rdev->ddev, crtc_idx); + drm_handle_vblank(rdev_to_drm(rdev), crtc_idx); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -5211,7 +5211,7 @@ int evergreen_init(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* Fence driver */ radeon_fence_driver_init(rdev); /* initialize AGP */ diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 77aee99e473a..3890911fe693 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -2360,7 +2360,7 @@ int cayman_init(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* Fence driver */ radeon_fence_driver_init(rdev); /* initialize memory controller */ diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 0b1e19345f43..d7d7d23bf9a1 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -459,7 +459,7 @@ void r100_pm_misc(struct radeon_device *rdev) */ void r100_pm_prepare(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 tmp; @@ -490,7 +490,7 @@ void r100_pm_prepare(struct radeon_device *rdev) */ void r100_pm_finish(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 tmp; @@ -603,7 +603,7 @@ void r100_hpd_set_polarity(struct radeon_device *rdev, */ void r100_hpd_init(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned enable =3D 0; =20 @@ -626,7 +626,7 @@ void r100_hpd_init(struct radeon_device *rdev) */ void r100_hpd_fini(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned disable =3D 0; =20 @@ -798,7 +798,7 @@ int r100_irq_process(struct radeon_device *rdev) /* Vertical blank interrupts */ if (status & RADEON_CRTC_VBLANK_STAT) { if (rdev->irq.crtc_vblank_int[0]) { - drm_handle_vblank(rdev->ddev, 0); + drm_handle_vblank(rdev_to_drm(rdev), 0); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -807,7 +807,7 @@ int r100_irq_process(struct radeon_device *rdev) } if (status & RADEON_CRTC2_VBLANK_STAT) { if (rdev->irq.crtc_vblank_int[1]) { - drm_handle_vblank(rdev->ddev, 1); + drm_handle_vblank(rdev_to_drm(rdev), 1); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -1471,7 +1471,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parse= r *p) header =3D radeon_get_ib_value(p, h_idx); crtc_id =3D radeon_get_ib_value(p, h_idx + 5); reg =3D R100_CP_PACKET0_GET_REG(header); - crtc =3D drm_crtc_find(p->rdev->ddev, p->filp, crtc_id); + crtc =3D drm_crtc_find(rdev_to_drm(p->rdev), p->filp, crtc_id); if (!crtc) { DRM_ERROR("cannot find crtc %d\n", crtc_id); return -ENOENT; @@ -3059,7 +3059,7 @@ DEFINE_SHOW_ATTRIBUTE(r100_debugfs_mc_info); void r100_debugfs_rbbm_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("r100_rbbm_info", 0444, root, rdev, &r100_debugfs_rbbm_info_fops); @@ -3069,7 +3069,7 @@ void r100_debugfs_rbbm_init(struct radeon_device *rd= ev) void r100_debugfs_cp_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("r100_cp_ring_info", 0444, root, rdev, &r100_debugfs_cp_ring_info_fops); @@ -3081,7 +3081,7 @@ void r100_debugfs_cp_init(struct radeon_device *rdev) void r100_debugfs_mc_info_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("r100_mc_info", 0444, root, rdev, &r100_debugfs_mc_info_fops); @@ -3947,7 +3947,7 @@ int r100_resume(struct radeon_device *rdev) RREG32(R_0007C0_CP_STAT)); } /* post */ - radeon_combios_asic_init(rdev->ddev); + radeon_combios_asic_init(rdev_to_drm(rdev)); /* Resume clock after posting */ r100_clock_startup(rdev); /* Initialize surface registers */ @@ -4056,7 +4056,7 @@ int r100_init(struct radeon_device *rdev) /* Set asic errata */ r100_errata(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize AGP */ if (rdev->flags & RADEON_IS_AGP) { r =3D radeon_agp_init(rdev); --=20 2.45.2 From nobody Wed Dec 17 15:54:17 2025 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3847B19B3E1 for ; Mon, 24 Jun 2024 15:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241979; cv=none; b=MS+6aAzOLi8ugPF23MuF9kJ1iT6li5wzOE66ftfhKA3TW6SQBl0IvqvoL5ANrq/Xu/Oy/xQP+LeW1psc5TNioUSG2NMdC90WDaSL4ujwTPNuFpAN8WsHhFw0wtfTFstwr8/Rd2M1H8XOZ53CUKwXTEV3aEZEFyvZxXNzYR67/+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241979; c=relaxed/simple; bh=5Ik5Ldm2VEiywGG52hUFELe12Ts18tFZ1LPfaZaSWsc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bUiQdQPXAA+4K7Fw3SUSe4Uel10Fotpd4FiFrhXe7CsszrQ7XwaLe5Of5AggzFUh+jli/CYtPZlN19npJ7+9puhJrBbujNYzUHawzo1tED0NIgLDFxgInWmz8lKpWPzLvG7XjabfhojFzoaVoINNG3NyiG6L9cG774z0gqgVr0A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eGvARhMW; arc=none smtp.client-ip=209.85.219.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eGvARhMW" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6b05c9db85fso17483146d6.2 for ; Mon, 24 Jun 2024 08:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719241977; x=1719846777; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PLmHj2pUu5XP8F0s810g8Xhldx4Sthnl+H5OURakYZM=; b=eGvARhMWHt9AEpd5U/c4L9sgG+AKRPAnkrmDqRNLgqXKIvp0Fw9OOQNs1sP9ZRvGfY yrj1rT27eaJ3FTKd2cBdSL7AfajEL3Pwe6ocx8Ma1meyBmiZT1CU8ioIE7i6fexJAm2j uTkfITKbgJHeeE3SDb2EZ5hDk5hrwdLaxlqHKWfYzD3TK7VFf3UIYkNVlGQl1F/8Z0RF eXVas6ZK2WwBi6rnA3dqoH/BxH2JrVe3UhagswK/TbdFjuZP1jFFs62IpunGDm+kGwpZ 20MO9TeDb2bb0pT7uSs6ME/yyTtj5znVzE/r6a6c4n0coYOdwpxy3lsgTD/KYMKo2Mbc yx6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719241977; x=1719846777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PLmHj2pUu5XP8F0s810g8Xhldx4Sthnl+H5OURakYZM=; b=l5ypjyaM7WElbq5S5TwbJ+039Ic/xpJamEKcc9pcmRKQZn6KJRLiXl8TBw1lD2MOfd Y2FBLF7oHJCojDBhWejUdCqEYw7NEl+dBOHPIrme/ohaP9SFWzmWcsv3dXyhEFyy4pjR mTRb8DRTf2uOXKbFTCLrNZ4EBjn/cNHoBXHgVxWuA9izUnE5+c/6y9t5ytbwYXc621EA OzersVZjX98C9+uUk/EIvMTJOO8rFjaJ5H+6IZZ/xc64AA/AJ+1JS6YR4ErxkXawNGKs aWwOkWJ5ZvFGiqd/BGfv99+Of/kR4xVaijSb7cIs6AEsrXNp2skgvEVwOv9ThcvuBkJJ RwvA== X-Forwarded-Encrypted: i=1; AJvYcCUagEgd+5YSF0D2uKzRmXOYLoY/YuxKh0Xdzp9DEtubalt+iCjEMLmr4lRST5YndGljEz9VHkQBoKYPoGlVjS7ch3arbzupG499gzBT X-Gm-Message-State: AOJu0YwsNw5Wn7du77+QjGpY0qHtxvLnW3f9JMWtrK7p72PWZhZBxb9Z dEO8ZSl1BvzH6LqL5SjY3e1ZFVW5tKa/jkUAg/A9PP/hNcrZ8uVt X-Google-Smtp-Source: AGHT+IFUfBd/+3kNGqHk10Aqjryw//X8bb+Dpk6x3wTmMH4jNZ1dE5lkgBKeoVI4kYI4H8zisQYpbw== X-Received: by 2002:a05:6214:e89:b0:6b4:fe1a:eeee with SMTP id 6a1803df08f44-6b540a96127mr64169856d6.46.1719241977035; Mon, 24 Jun 2024 08:12:57 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b529eb3decsm27243976d6.12.2024.06.24.08.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 08:12:56 -0700 (PDT) From: Wu Hoi Pok To: Cc: Thomas Zimmermann , Wu Hoi Pok , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/7] drm/radeon: rdev->ddev to rdev_to_drm(rdev) 2 Date: Mon, 24 Jun 2024 11:10:47 -0400 Message-ID: <20240624151122.23724-4-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240624151122.23724-1-wuhoipok@gmail.com> References: <20240624151122.23724-1-wuhoipok@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Please refer to patch 1. Signed-off-by: Wu Hoi Pok --- drivers/gpu/drm/radeon/r300.c | 6 +++--- drivers/gpu/drm/radeon/r420.c | 6 +++--- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 12 ++++++------ drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 1620f534f55f..05c13102a8cb 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -616,7 +616,7 @@ DEFINE_SHOW_ATTRIBUTE(rv370_debugfs_pcie_gart_info); static void rv370_debugfs_pcie_gart_info_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("rv370_pcie_gart_info", 0444, root, rdev, &rv370_debugfs_pcie_gart_info_fops); @@ -1452,7 +1452,7 @@ int r300_resume(struct radeon_device *rdev) RREG32(R_0007C0_CP_STAT)); } /* post */ - radeon_combios_asic_init(rdev->ddev); + radeon_combios_asic_init(rdev_to_drm(rdev)); /* Resume clock after posting */ r300_clock_startup(rdev); /* Initialize surface registers */ @@ -1538,7 +1538,7 @@ int r300_init(struct radeon_device *rdev) /* Set asic errata */ r300_errata(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize AGP */ if (rdev->flags & RADEON_IS_AGP) { r =3D radeon_agp_init(rdev); diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index a979662eaa73..9a31cdec6415 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c @@ -322,7 +322,7 @@ int r420_resume(struct radeon_device *rdev) if (rdev->is_atom_bios) { atom_asic_init(rdev->mode_info.atom_context); } else { - radeon_combios_asic_init(rdev->ddev); + radeon_combios_asic_init(rdev_to_drm(rdev)); } /* Resume clock after posting */ r420_clock_resume(rdev); @@ -414,7 +414,7 @@ int r420_init(struct radeon_device *rdev) return -EINVAL; =20 /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize AGP */ if (rdev->flags & RADEON_IS_AGP) { r =3D radeon_agp_init(rdev); @@ -493,7 +493,7 @@ DEFINE_SHOW_ATTRIBUTE(r420_debugfs_pipes_info); void r420_debugfs_pipes_info_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("r420_pipes_info", 0444, root, rdev, &r420_debugfs_pipes_info_fops); diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index 6cbcaa845192..08e127b3249a 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c @@ -287,7 +287,7 @@ int r520_init(struct radeon_device *rdev) atom_asic_init(rdev->mode_info.atom_context); } /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize AGP */ if (rdev->flags & RADEON_IS_AGP) { r =3D radeon_agp_init(rdev); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 087d41e370fd..8b62f7faa5b9 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -950,7 +950,7 @@ void r600_hpd_set_polarity(struct radeon_device *rdev, =20 void r600_hpd_init(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned enable =3D 0; =20 @@ -1017,7 +1017,7 @@ void r600_hpd_init(struct radeon_device *rdev) =20 void r600_hpd_fini(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned disable =3D 0; =20 @@ -3280,7 +3280,7 @@ int r600_init(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* Fence driver */ radeon_fence_driver_init(rdev); if (rdev->flags & RADEON_IS_AGP) { @@ -4136,7 +4136,7 @@ int r600_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: D1 vblank - IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[0]) { - drm_handle_vblank(rdev->ddev, 0); + drm_handle_vblank(rdev_to_drm(rdev), 0); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -4166,7 +4166,7 @@ int r600_irq_process(struct radeon_device *rdev) DRM_DEBUG("IH: D2 vblank - IH event w/o asserted irq bit?\n"); =20 if (rdev->irq.crtc_vblank_int[1]) { - drm_handle_vblank(rdev->ddev, 1); + drm_handle_vblank(rdev_to_drm(rdev), 1); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -4358,7 +4358,7 @@ DEFINE_SHOW_ATTRIBUTE(r600_debugfs_mc_info); static void r600_debugfs_mc_info_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("r600_mc_info", 0444, root, rdev, &r600_debugfs_mc_info_fops); diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600= _cs.c index 6cf54a747749..1b2d31c4d77c 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -884,7 +884,7 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser = *p, crtc_id =3D radeon_get_ib_value(p, h_idx + 2 + 7 + 1); reg =3D R600_CP_PACKET0_GET_REG(header); =20 - crtc =3D drm_crtc_find(p->rdev->ddev, p->filp, crtc_id); + crtc =3D drm_crtc_find(rdev_to_drm(p->rdev), p->filp, crtc_id); if (!crtc) { DRM_ERROR("cannot find crtc %d\n", crtc_id); return -ENOENT; diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r60= 0_dpm.c index 64980a61d38a..81d58ef667dd 100644 --- a/drivers/gpu/drm/radeon/r600_dpm.c +++ b/drivers/gpu/drm/radeon/r600_dpm.c @@ -153,7 +153,7 @@ void r600_dpm_print_ps_status(struct radeon_device *rde= v, =20 u32 r600_dpm_get_vblank_time(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 vblank_in_pixels; @@ -180,7 +180,7 @@ u32 r600_dpm_get_vblank_time(struct radeon_device *rdev) =20 u32 r600_dpm_get_vrefresh(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 vrefresh =3D 0; --=20 2.45.2 From nobody Wed Dec 17 15:54:17 2025 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0A7219D896 for ; Mon, 24 Jun 2024 15:13:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241985; cv=none; b=cvT75fvCB9WyDikxvr86FIvoStenPR6c18k+Ca4yeJ10o/u5qhYmYtHc2nabkDXXz41tfYTk2KeUQ0+QhYHdqFLVfRFbZ67CDAZKa8HhRl4WXw3agZCQu9IrNc8jtXj4JFHFW86zrHXsD+uGSlVW92tFE0kDXWjX8OJOuR8uxF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241985; c=relaxed/simple; bh=OG1hBreneSn/u6FO8pFukOgS6LFZEChaIJCu1zPnDwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ukrUdruxDf3RltA3GvYxQDgYMtjSid+vomCQWwpQ0fhDF1j0WdXMiNil3l8GLgfLJv0iCdEEqQqWYI9OMBmLzcpU4ZJRhaZgNawR2NQS3Ws4NCHd+ZLU81B/CXwBRL2w0lY5CVaklGsibfAVAx9AF/h6CEOr9bgTshFHELUUL5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SXud1m54; arc=none smtp.client-ip=209.85.219.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SXud1m54" Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-6b50aeb2424so21771166d6.0 for ; Mon, 24 Jun 2024 08:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719241983; x=1719846783; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UMpMM3VMXw3Pt2FtK4Aaxt1tlk2OfNvq+GBMyg4jRHU=; b=SXud1m54Z39PRmt+QCHFbbVzSy5Q2ws87JtSdX4+bxOlsFEMoD/rT9JwbiNWTjhpHG xN4gxnbeEu4+RGu5tAYgHwfiYzllnrt5mF/s1MEWEyvJXxdNL3Cak/6WQrsHytadi0dq thDIYuQ+4sfsy9Ub/aHea9lDe70xaYd/v3BzbP6AJHKpp7ULAsKVdpFlREyGqq6x5jcD zUuz3j+q0KtRrYIjAq6geQpW+4I7yh4QlQK4zmXTCEp5rF7K59ruPbdNgGFueiu4PG2B 6OB2z9bKrOXTRI9u4EPcwjny9pitoe5CbWJofEW0dnpBZP3n13dA1to/g9TVMkISHxSc Q7zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719241983; x=1719846783; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UMpMM3VMXw3Pt2FtK4Aaxt1tlk2OfNvq+GBMyg4jRHU=; b=QrTpk9OkdkQPFF4A6cvHGXp11VxCrpp+/xKFHF6oPeI9nd3CUjZP/MhOylepkxyEjf cU8sE2TtrPoVSznIfqibgtnlMF7P5I/PcUC3WDlWntqaYwhTLzReyEcTM2FPaCrfI8hQ cSv5hFehdlGFrN2kJ7wynda2PSnhAhI2AKaL65fG7UY/SCOISrjgJCqq7ObOoBQhXXpw 7m0LNQq6jdMfC8uR56IwCX6RT+rmP8x/J/B92DmWIQbEKMDccho4OwE9aR3rQfwbXeGQ P5k3tvAST1zxm7svGl6hC6/IW/tyIzf65rGhfYOz57V2bpJUmglBwkCritP+JTtr3gFH Bl1w== X-Forwarded-Encrypted: i=1; AJvYcCUGuR0DsCXCWHHPuVjOkVorlGeWVrF21x6/HLW5pJDV424/G58hmBSR7DSEwnHvs0DSBeSKzNIDzQuLH2O4meH4E39qgyFUUpvFDo4d X-Gm-Message-State: AOJu0Ywa7EzaGUfA+GKUE/f9HuLjFB0SyKzjsbV5EKnsHaTgb/JQwBXH 5W+NGp3RQiYGrqYFgcArRvHRY+ifTc2NmYIztkHuF6UJsvlitzGR2Cirhbx5 X-Google-Smtp-Source: AGHT+IFMVmdeX14jN4dWDHaBXFZ14U2ROwwMKJgHg1KAQgkmU+44jh2hW2HjmSWq5/Aio0upbqp3qg== X-Received: by 2002:a0c:f013:0:b0:6b5:4fbc:4c4a with SMTP id 6a1803df08f44-6b54fbc4edfmr32286396d6.2.1719241982809; Mon, 24 Jun 2024 08:13:02 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b529eb3decsm27243976d6.12.2024.06.24.08.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 08:13:02 -0700 (PDT) From: Wu Hoi Pok To: Cc: Thomas Zimmermann , Wu Hoi Pok , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/7] drm/radeon: rdev->ddev to rdev_to_drm(rdev) 3 Date: Mon, 24 Jun 2024 11:10:48 -0400 Message-ID: <20240624151122.23724-5-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240624151122.23724-1-wuhoipok@gmail.com> References: <20240624151122.23724-1-wuhoipok@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Please refer to patch 1. Signed-off-by: Wu Hoi Pok --- drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon_acpi.c | 10 +++++----- drivers/gpu/drm/radeon/radeon_agp.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 2 +- drivers/gpu/drm/radeon/radeon_audio.c | 4 ++-- drivers/gpu/drm/radeon/radeon_combios.c | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r6= 00_hdmi.c index f3551ebaa2f0..661f374f5f27 100644 --- a/drivers/gpu/drm/radeon/r600_hdmi.c +++ b/drivers/gpu/drm/radeon/r600_hdmi.c @@ -116,7 +116,7 @@ void r600_audio_update_hdmi(struct work_struct *work) { struct radeon_device *rdev =3D container_of(work, struct radeon_device, audio_work); - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct r600_audio_pin audio_status =3D r600_audio_status(rdev); struct drm_encoder *encoder; bool changed =3D false; diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/= radeon_acpi.c index 603a78e41ba5..22ce61bdfc06 100644 --- a/drivers/gpu/drm/radeon/radeon_acpi.c +++ b/drivers/gpu/drm/radeon/radeon_acpi.c @@ -405,11 +405,11 @@ static int radeon_atif_handler(struct radeon_device *= rdev, if (req.pending & ATIF_DGPU_DISPLAY_EVENT) { if ((rdev->flags & RADEON_IS_PX) && radeon_atpx_dgpu_req_power_for_displays()) { - pm_runtime_get_sync(rdev->ddev->dev); + pm_runtime_get_sync(rdev_to_drm(rdev)->dev); /* Just fire off a uevent and let userspace tell us what to do */ - drm_helper_hpd_irq_event(rdev->ddev); - pm_runtime_mark_last_busy(rdev->ddev->dev); - pm_runtime_put_autosuspend(rdev->ddev->dev); + drm_helper_hpd_irq_event(rdev_to_drm(rdev)); + pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev); + pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev); } } /* TODO: check other events */ @@ -736,7 +736,7 @@ int radeon_acpi_init(struct radeon_device *rdev) struct radeon_encoder *target =3D NULL; =20 /* Find the encoder controlling the brightness */ - list_for_each_entry(tmp, &rdev->ddev->mode_config.encoder_list, + list_for_each_entry(tmp, &rdev_to_drm(rdev)->mode_config.encoder_list, head) { struct radeon_encoder *enc =3D to_radeon_encoder(tmp); =20 diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/r= adeon_agp.c index a3d749e350f9..89d7b0e9e79f 100644 --- a/drivers/gpu/drm/radeon/radeon_agp.c +++ b/drivers/gpu/drm/radeon/radeon_agp.c @@ -161,7 +161,7 @@ struct radeon_agp_head *radeon_agp_head_init(struct drm= _device *dev) =20 static int radeon_agp_head_acquire(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct pci_dev *pdev =3D to_pci_dev(dev->dev); =20 if (!rdev->agp) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/rad= eon/radeon_atombios.c index 10793a433bf5..97c4e10d0550 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -187,7 +187,7 @@ void radeon_atombios_i2c_init(struct radeon_device *rde= v) =20 if (i2c.valid) { sprintf(stmp, "0x%x", i2c.i2c_id); - rdev->i2c_bus[i] =3D radeon_i2c_create(rdev->ddev, &i2c, stmp); + rdev->i2c_bus[i] =3D radeon_i2c_create(rdev_to_drm(rdev), &i2c, stmp); } gpio =3D (ATOM_GPIO_I2C_ASSIGMENT *) ((u8 *)gpio + sizeof(ATOM_GPIO_I2C_ASSIGMENT)); diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon= /radeon_audio.c index 0bcd767b9f47..47aa06a9a942 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -196,7 +196,7 @@ static void radeon_audio_enable(struct radeon_device *r= dev, return; =20 if (rdev->mode_info.mode_config_initialized) { - list_for_each_entry(encoder, &rdev->ddev->mode_config.encoder_list, head= ) { + list_for_each_entry(encoder, &rdev_to_drm(rdev)->mode_config.encoder_lis= t, head) { if (radeon_encoder_is_digital(encoder)) { radeon_encoder =3D to_radeon_encoder(encoder); dig =3D radeon_encoder->enc_priv; @@ -760,7 +760,7 @@ static int radeon_audio_component_get_eld(struct device= *kdev, int port, if (!rdev->audio.enabled || !rdev->mode_info.mode_config_initialized) return 0; =20 - list_for_each_entry(encoder, &rdev->ddev->mode_config.encoder_list, head)= { + list_for_each_entry(encoder, &rdev_to_drm(rdev)->mode_config.encoder_list= , head) { if (!radeon_encoder_is_digital(encoder)) continue; radeon_encoder =3D to_radeon_encoder(encoder); diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/rade= on/radeon_combios.c index 6952b1273b0f..41ddc576f8f8 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -372,7 +372,7 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_= device *rdev) int edid_info, size; struct edid *edid; unsigned char *raw; - edid_info =3D combios_get_table_offset(rdev->ddev, COMBIOS_HARDCODED_EDID= _TABLE); + edid_info =3D combios_get_table_offset(rdev_to_drm(rdev), COMBIOS_HARDCOD= ED_EDID_TABLE); if (!edid_info) return false; =20 @@ -642,7 +642,7 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(= struct radeon_device *rde =20 static struct radeon_i2c_bus_rec radeon_combios_get_i2c_info_from_table(st= ruct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct radeon_i2c_bus_rec i2c; u16 offset; u8 id, blocks, clk, data; @@ -670,7 +670,7 @@ static struct radeon_i2c_bus_rec radeon_combios_get_i2c= _info_from_table(struct r =20 void radeon_combios_i2c_init(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct radeon_i2c_bus_rec i2c; =20 /* actual hw pads @@ -812,7 +812,7 @@ bool radeon_combios_get_clock_info(struct drm_device *d= ev) =20 bool radeon_combios_sideport_present(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); u16 igp_info; =20 /* sideport is AMD only */ @@ -915,7 +915,7 @@ struct radeon_encoder_primary_dac *radeon_combios_get_p= rimary_dac_info(struct enum radeon_tv_std radeon_combios_get_tv_info(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); uint16_t tv_info; enum radeon_tv_std tv_std =3D TV_STD_NTSC; =20 @@ -2637,7 +2637,7 @@ static const char *thermal_controller_names[] =3D { =20 void radeon_combios_get_power_modes(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); u16 offset, misc, misc2 =3D 0; u8 rev, tmp; int state_index =3D 0; --=20 2.45.2 From nobody Wed Dec 17 15:54:17 2025 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2195219DF6F for ; Mon, 24 Jun 2024 15:13:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241995; cv=none; b=WCduuoC95MR//YFeF6h1AiMyyiVmf53tGhhXZRO4uR8bsHM4iIfkURe+Pe0K8ri0aBF8Uizy1BOSGtb4Q07U33vjzWVf8TOlSd/HGGACVC8YWexC6+JswIQ1oEjSIZmQ+gZsu+/In4BovkboM71ZXU3y+M/3513ozVECtnHD1MU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719241995; c=relaxed/simple; bh=EbvUhI6TnOt1pOp6/IX+Tt52ZjulXB3KrYG+OfhJmiI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XCoDfDghxXSVFo/HN/0QCY9OfPtHaZ65JKpbfZxJ14kDk62lnfiMFN/DQ0MAop5wgTUr6ew4qcVBg3S3slT7KDEXfazANIFPv3Kgac9Zuw2qGQqqvgMgGTrDnPodNaS6SzLODhEvGDGOaFsAVlrwSZJx1t00IZShzrthxFSZeJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VvWFLOcT; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VvWFLOcT" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6b2c6291038so35115506d6.0 for ; Mon, 24 Jun 2024 08:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719241992; x=1719846792; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9nYYzlPy5SI7PVhpCb/BENiLzYELRokf+ehigNOLV50=; b=VvWFLOcTRYQOq17fCPnR14SHj8hJUEOSWhA93+6k/WE5VmxEHvGUZE2dJ07Ofp7kTB ItUOxkDH2GYZa6Te1q2FDAhIkHhc6CGv2R+lC5Esdfpf1rU1cKeoyKdv0DTrfYmGNYUy AZN7Yd0bOCQBhg8GxEAd+LnjhOxjoRSDPqp+iy5G5ruH0oP0CFIOI1HzhF2gF7SQML1C NStb2Qkxu5HeG+Td0VAjAyYIZ1iKaD+NICblgdWU5DpDZvE+m0KTRjcsiqlQQzSNMqZy 8xcaL0IqbCTqvwwt2ZSy0cjfXx3+wNzFuD8qrJ+V6kV9dVxQmCZcROc1NhM05m9sGQ1J VcQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719241992; x=1719846792; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9nYYzlPy5SI7PVhpCb/BENiLzYELRokf+ehigNOLV50=; b=trSOyehKzB3yNCWSS4+Tj3xsSXaGOh8vA4ceF9nSpYNn7+Jc/P4S+EdzkWaeomDdqd kz8DqAGiURvVEFZEjilUCVVvJEB8xC3zWPrlKl/sq4tckL6PWV0zdnudLmemgOu3HYDc stb8DQROLewV+/oAbmvM013ams9zY1gvNne9QPblEZGXUxOwIenXd+84SX3Ra+xKrBf6 CbOBuS6jwFECWDS2/X2KkTK5bLeLrq6vuz1VVurRJs9Dbswhs4zn4RdGyf0OJlRPfNln CLO5Q3QLek1ERugy/5pDAp3G5U3Iqoa+1m8wCbklUWlCWrc/gJknbkW7Ue24Z8a4zLKN TWow== X-Forwarded-Encrypted: i=1; AJvYcCX67Q93kMPe1QRd+ZECbY1raXMtt0cAs+K4s7SJuO8zgWJSAb5ayTUA2lZofQW6iVeC0kMtRPr9EDv3dhFEY6J0l75nmhwQo5BtaKfO X-Gm-Message-State: AOJu0Yz+mmNourBXqpcw0Lejq2zx0KiJiUZj6eQEqfyC3EhkjFiZrLyf 4X2jowmhATmbPKs2B8J81FqH5vVDwoEYW36/SHn+T+e1GEnsFS8/ X-Google-Smtp-Source: AGHT+IEprwN5h8WZ1/wkonQOxrwmg5w7UCx+KUVlukokHQdSgRbfniLRd92MnIdCJU/0QhN19UEuEg== X-Received: by 2002:ad4:5f8a:0:b0:6b5:5687:8f7a with SMTP id 6a1803df08f44-6b55687df85mr31921576d6.21.1719241992057; Mon, 24 Jun 2024 08:13:12 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b529eb3decsm27243976d6.12.2024.06.24.08.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 08:13:10 -0700 (PDT) From: Wu Hoi Pok To: Cc: Thomas Zimmermann , Wu Hoi Pok , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/7] drm/radeon: rdev->ddev to rdev_to_drm(rdev) 4 Date: Mon, 24 Jun 2024 11:10:49 -0400 Message-ID: <20240624151122.23724-6-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240624151122.23724-1-wuhoipok@gmail.com> References: <20240624151122.23724-1-wuhoipok@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Please refer to patch 1. Signed-off-by: Wu Hoi Pok --- drivers/gpu/drm/radeon/radeon_device.c | 19 +++---- drivers/gpu/drm/radeon/radeon_display.c | 74 ++++++++++++------------- drivers/gpu/drm/radeon/radeon_fbdev.c | 26 ++++----- drivers/gpu/drm/radeon/radeon_fence.c | 8 +-- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- 6 files changed, 63 insertions(+), 68 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeo= n/radeon_device.c index afbb3a80c0c6..127d8fd7f7cd 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -760,7 +760,7 @@ bool radeon_boot_test_post_card(struct radeon_device *r= dev) if (rdev->is_atom_bios) atom_asic_init(rdev->mode_info.atom_context); else - radeon_combios_asic_init(rdev->ddev); + radeon_combios_asic_init(rdev_to_drm(rdev)); return true; } else { dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n"); @@ -980,7 +980,7 @@ int radeon_atombios_init(struct radeon_device *rdev) return -ENOMEM; =20 rdev->mode_info.atom_card_info =3D atom_card_info; - atom_card_info->dev =3D rdev->ddev; + atom_card_info->dev =3D rdev_to_drm(rdev); atom_card_info->reg_read =3D cail_reg_read; atom_card_info->reg_write =3D cail_reg_write; /* needed for iio ops */ @@ -1005,7 +1005,7 @@ int radeon_atombios_init(struct radeon_device *rdev) =20 mutex_init(&rdev->mode_info.atom_context->mutex); mutex_init(&rdev->mode_info.atom_context->scratch_mutex); - radeon_atom_initialize_bios_scratch_regs(rdev->ddev); + radeon_atom_initialize_bios_scratch_regs(rdev_to_drm(rdev)); atom_allocate_fb_scratch(rdev->mode_info.atom_context); return 0; } @@ -1049,7 +1049,7 @@ void radeon_atombios_fini(struct radeon_device *rdev) */ int radeon_combios_init(struct radeon_device *rdev) { - radeon_combios_initialize_bios_scratch_regs(rdev->ddev); + radeon_combios_initialize_bios_scratch_regs(rdev_to_drm(rdev)); return 0; } =20 @@ -1267,8 +1267,6 @@ static const struct vga_switcheroo_client_ops radeon_= switcheroo_ops =3D { * radeon_device_init - initialize the driver * * @rdev: radeon_device pointer - * @ddev: drm dev pointer - * @pdev: pci dev pointer * @flags: driver flags * * Initializes the driver info and hw (all asics). @@ -1276,18 +1274,15 @@ static const struct vga_switcheroo_client_ops radeo= n_switcheroo_ops =3D { * Called at driver startup. */ int radeon_device_init(struct radeon_device *rdev, - struct drm_device *ddev, - struct pci_dev *pdev, uint32_t flags) { + struct pci_dev *pdev =3D rdev->pdev; + struct drm_device *ddev =3D rdev_to_drm(rdev); int r, i; int dma_bits; bool runtime =3D false; =20 rdev->shutdown =3D false; - rdev->dev =3D &pdev->dev; - rdev->ddev =3D ddev; - rdev->pdev =3D pdev; rdev->flags =3D flags; rdev->family =3D flags & RADEON_FAMILY_MASK; rdev->is_atom_bios =3D false; @@ -1847,7 +1842,7 @@ int radeon_gpu_reset(struct radeon_device *rdev) =20 downgrade_write(&rdev->exclusive_lock); =20 - drm_helper_resume_force_mode(rdev->ddev); + drm_helper_resume_force_mode(rdev_to_drm(rdev)); =20 /* set the power state here in case we are a PX system or headless */ if ((rdev->pm.pm_method =3D=3D PM_METHOD_DPM) && rdev->pm.dpm_enabled) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/rade= on/radeon_display.c index 843383f7237f..10fd58f400bc 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -302,13 +302,13 @@ void radeon_crtc_handle_vblank(struct radeon_device *= rdev, int crtc_id) if ((radeon_use_pflipirq =3D=3D 2) && ASIC_IS_DCE4(rdev)) return; =20 - spin_lock_irqsave(&rdev->ddev->event_lock, flags); + spin_lock_irqsave(&rdev_to_drm(rdev)->event_lock, flags); if (radeon_crtc->flip_status !=3D RADEON_FLIP_SUBMITTED) { DRM_DEBUG_DRIVER("radeon_crtc->flip_status =3D %d !=3D " "RADEON_FLIP_SUBMITTED(%d)\n", radeon_crtc->flip_status, RADEON_FLIP_SUBMITTED); - spin_unlock_irqrestore(&rdev->ddev->event_lock, flags); + spin_unlock_irqrestore(&rdev_to_drm(rdev)->event_lock, flags); return; } =20 @@ -334,7 +334,7 @@ void radeon_crtc_handle_vblank(struct radeon_device *rd= ev, int crtc_id) */ if (update_pending && (DRM_SCANOUTPOS_VALID & - radeon_get_crtc_scanoutpos(rdev->ddev, crtc_id, + radeon_get_crtc_scanoutpos(rdev_to_drm(rdev), crtc_id, GET_DISTANCE_TO_VBLANKSTART, &vpos, &hpos, NULL, NULL, &rdev->mode_info.crtcs[crtc_id]->base.hwmode)) && @@ -347,7 +347,7 @@ void radeon_crtc_handle_vblank(struct radeon_device *rd= ev, int crtc_id) */ update_pending =3D 0; } - spin_unlock_irqrestore(&rdev->ddev->event_lock, flags); + spin_unlock_irqrestore(&rdev_to_drm(rdev)->event_lock, flags); if (!update_pending) radeon_crtc_handle_flip(rdev, crtc_id); } @@ -370,14 +370,14 @@ void radeon_crtc_handle_flip(struct radeon_device *rd= ev, int crtc_id) if (radeon_crtc =3D=3D NULL) return; =20 - spin_lock_irqsave(&rdev->ddev->event_lock, flags); + spin_lock_irqsave(&rdev_to_drm(rdev)->event_lock, flags); work =3D radeon_crtc->flip_work; if (radeon_crtc->flip_status !=3D RADEON_FLIP_SUBMITTED) { DRM_DEBUG_DRIVER("radeon_crtc->flip_status =3D %d !=3D " "RADEON_FLIP_SUBMITTED(%d)\n", radeon_crtc->flip_status, RADEON_FLIP_SUBMITTED); - spin_unlock_irqrestore(&rdev->ddev->event_lock, flags); + spin_unlock_irqrestore(&rdev_to_drm(rdev)->event_lock, flags); return; } =20 @@ -389,7 +389,7 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev= , int crtc_id) if (work->event) drm_crtc_send_vblank_event(&radeon_crtc->base, work->event); =20 - spin_unlock_irqrestore(&rdev->ddev->event_lock, flags); + spin_unlock_irqrestore(&rdev_to_drm(rdev)->event_lock, flags); =20 drm_crtc_vblank_put(&radeon_crtc->base); radeon_irq_kms_pflip_irq_put(rdev, work->crtc_id); @@ -408,7 +408,7 @@ static void radeon_flip_work_func(struct work_struct *_= _work) struct radeon_flip_work *work =3D container_of(__work, struct radeon_flip_work, flip_work); struct radeon_device *rdev =3D work->rdev; - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct radeon_crtc *radeon_crtc =3D rdev->mode_info.crtcs[work->crtc_id]; =20 struct drm_crtc *crtc =3D &radeon_crtc->base; @@ -1401,7 +1401,7 @@ static int radeon_modeset_create_props(struct radeon_= device *rdev) =20 if (rdev->is_atom_bios) { rdev->mode_info.coherent_mode_property =3D - drm_property_create_range(rdev->ddev, 0 , "coherent", 0, 1); + drm_property_create_range(rdev_to_drm(rdev), 0, "coherent", 0, 1); if (!rdev->mode_info.coherent_mode_property) return -ENOMEM; } @@ -1409,57 +1409,57 @@ static int radeon_modeset_create_props(struct radeo= n_device *rdev) if (!ASIC_IS_AVIVO(rdev)) { sz =3D ARRAY_SIZE(radeon_tmds_pll_enum_list); rdev->mode_info.tmds_pll_property =3D - drm_property_create_enum(rdev->ddev, 0, + drm_property_create_enum(rdev_to_drm(rdev), 0, "tmds_pll", radeon_tmds_pll_enum_list, sz); } =20 rdev->mode_info.load_detect_property =3D - drm_property_create_range(rdev->ddev, 0, "load detection", 0, 1); + drm_property_create_range(rdev_to_drm(rdev), 0, "load detection", 0, 1); if (!rdev->mode_info.load_detect_property) return -ENOMEM; =20 - drm_mode_create_scaling_mode_property(rdev->ddev); + drm_mode_create_scaling_mode_property(rdev_to_drm(rdev)); =20 sz =3D ARRAY_SIZE(radeon_tv_std_enum_list); rdev->mode_info.tv_std_property =3D - drm_property_create_enum(rdev->ddev, 0, + drm_property_create_enum(rdev_to_drm(rdev), 0, "tv standard", radeon_tv_std_enum_list, sz); =20 sz =3D ARRAY_SIZE(radeon_underscan_enum_list); rdev->mode_info.underscan_property =3D - drm_property_create_enum(rdev->ddev, 0, + drm_property_create_enum(rdev_to_drm(rdev), 0, "underscan", radeon_underscan_enum_list, sz); =20 rdev->mode_info.underscan_hborder_property =3D - drm_property_create_range(rdev->ddev, 0, + drm_property_create_range(rdev_to_drm(rdev), 0, "underscan hborder", 0, 128); if (!rdev->mode_info.underscan_hborder_property) return -ENOMEM; =20 rdev->mode_info.underscan_vborder_property =3D - drm_property_create_range(rdev->ddev, 0, + drm_property_create_range(rdev_to_drm(rdev), 0, "underscan vborder", 0, 128); if (!rdev->mode_info.underscan_vborder_property) return -ENOMEM; =20 sz =3D ARRAY_SIZE(radeon_audio_enum_list); rdev->mode_info.audio_property =3D - drm_property_create_enum(rdev->ddev, 0, + drm_property_create_enum(rdev_to_drm(rdev), 0, "audio", radeon_audio_enum_list, sz); =20 sz =3D ARRAY_SIZE(radeon_dither_enum_list); rdev->mode_info.dither_property =3D - drm_property_create_enum(rdev->ddev, 0, + drm_property_create_enum(rdev_to_drm(rdev), 0, "dither", radeon_dither_enum_list, sz); =20 sz =3D ARRAY_SIZE(radeon_output_csc_enum_list); rdev->mode_info.output_csc_property =3D - drm_property_create_enum(rdev->ddev, 0, + drm_property_create_enum(rdev_to_drm(rdev), 0, "output_csc", radeon_output_csc_enum_list, sz); =20 @@ -1578,29 +1578,29 @@ int radeon_modeset_init(struct radeon_device *rdev) int i; int ret; =20 - drm_mode_config_init(rdev->ddev); + drm_mode_config_init(rdev_to_drm(rdev)); rdev->mode_info.mode_config_initialized =3D true; =20 - rdev->ddev->mode_config.funcs =3D &radeon_mode_funcs; + rdev_to_drm(rdev)->mode_config.funcs =3D &radeon_mode_funcs; =20 if (radeon_use_pflipirq =3D=3D 2 && rdev->family >=3D CHIP_R600) - rdev->ddev->mode_config.async_page_flip =3D true; + rdev_to_drm(rdev)->mode_config.async_page_flip =3D true; =20 if (ASIC_IS_DCE5(rdev)) { - rdev->ddev->mode_config.max_width =3D 16384; - rdev->ddev->mode_config.max_height =3D 16384; + rdev_to_drm(rdev)->mode_config.max_width =3D 16384; + rdev_to_drm(rdev)->mode_config.max_height =3D 16384; } else if (ASIC_IS_AVIVO(rdev)) { - rdev->ddev->mode_config.max_width =3D 8192; - rdev->ddev->mode_config.max_height =3D 8192; + rdev_to_drm(rdev)->mode_config.max_width =3D 8192; + rdev_to_drm(rdev)->mode_config.max_height =3D 8192; } else { - rdev->ddev->mode_config.max_width =3D 4096; - rdev->ddev->mode_config.max_height =3D 4096; + rdev_to_drm(rdev)->mode_config.max_width =3D 4096; + rdev_to_drm(rdev)->mode_config.max_height =3D 4096; } =20 - rdev->ddev->mode_config.preferred_depth =3D 24; - rdev->ddev->mode_config.prefer_shadow =3D 1; + rdev_to_drm(rdev)->mode_config.preferred_depth =3D 24; + rdev_to_drm(rdev)->mode_config.prefer_shadow =3D 1; =20 - rdev->ddev->mode_config.fb_modifiers_not_supported =3D true; + rdev_to_drm(rdev)->mode_config.fb_modifiers_not_supported =3D true; =20 ret =3D radeon_modeset_create_props(rdev); if (ret) { @@ -1618,11 +1618,11 @@ int radeon_modeset_init(struct radeon_device *rdev) =20 /* allocate crtcs */ for (i =3D 0; i < rdev->num_crtc; i++) { - radeon_crtc_init(rdev->ddev, i); + radeon_crtc_init(rdev_to_drm(rdev), i); } =20 /* okay we should have all the bios connectors */ - ret =3D radeon_setup_enc_conn(rdev->ddev); + ret =3D radeon_setup_enc_conn(rdev_to_drm(rdev)); if (!ret) { return ret; } @@ -1639,7 +1639,7 @@ int radeon_modeset_init(struct radeon_device *rdev) /* setup afmt */ radeon_afmt_init(rdev); =20 - drm_kms_helper_poll_init(rdev->ddev); + drm_kms_helper_poll_init(rdev_to_drm(rdev)); =20 /* do pm late init */ ret =3D radeon_pm_late_init(rdev); @@ -1650,11 +1650,11 @@ int radeon_modeset_init(struct radeon_device *rdev) void radeon_modeset_fini(struct radeon_device *rdev) { if (rdev->mode_info.mode_config_initialized) { - drm_kms_helper_poll_fini(rdev->ddev); + drm_kms_helper_poll_fini(rdev_to_drm(rdev)); radeon_hpd_fini(rdev); - drm_helper_force_disable_all(rdev->ddev); + drm_helper_force_disable_all(rdev_to_drm(rdev)); radeon_afmt_fini(rdev); - drm_mode_config_cleanup(rdev->ddev); + drm_mode_config_cleanup(rdev_to_drm(rdev)); rdev->mode_info.mode_config_initialized =3D false; } =20 diff --git a/drivers/gpu/drm/radeon/radeon_fbdev.c b/drivers/gpu/drm/radeon= /radeon_fbdev.c index 02bf25759059..fb70de29545c 100644 --- a/drivers/gpu/drm/radeon/radeon_fbdev.c +++ b/drivers/gpu/drm/radeon/radeon_fbdev.c @@ -67,7 +67,7 @@ static int radeon_fbdev_create_pinned_object(struct drm_f= b_helper *fb_helper, int height =3D mode_cmd->height; u32 cpp; =20 - info =3D drm_get_format_info(rdev->ddev, mode_cmd); + info =3D drm_get_format_info(rdev_to_drm(rdev), mode_cmd); cpp =3D info->cpp[0]; =20 /* need to align pitch with crtc limits */ @@ -148,15 +148,15 @@ static int radeon_fbdev_fb_open(struct fb_info *info,= int user) struct radeon_device *rdev =3D fb_helper->dev->dev_private; int ret; =20 - ret =3D pm_runtime_get_sync(rdev->ddev->dev); + ret =3D pm_runtime_get_sync(rdev_to_drm(rdev)->dev); if (ret < 0 && ret !=3D -EACCES) goto err_pm_runtime_mark_last_busy; =20 return 0; =20 err_pm_runtime_mark_last_busy: - pm_runtime_mark_last_busy(rdev->ddev->dev); - pm_runtime_put_autosuspend(rdev->ddev->dev); + pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev); + pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev); return ret; } =20 @@ -165,8 +165,8 @@ static int radeon_fbdev_fb_release(struct fb_info *info= , int user) struct drm_fb_helper *fb_helper =3D info->par; struct radeon_device *rdev =3D fb_helper->dev->dev_private; =20 - pm_runtime_mark_last_busy(rdev->ddev->dev); - pm_runtime_put_autosuspend(rdev->ddev->dev); + pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev); + pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev); =20 return 0; } @@ -236,7 +236,7 @@ static int radeon_fbdev_fb_helper_fb_probe(struct drm_f= b_helper *fb_helper, ret =3D -ENOMEM; goto err_radeon_fbdev_destroy_pinned_object; } - ret =3D radeon_framebuffer_init(rdev->ddev, fb, &mode_cmd, gobj); + ret =3D radeon_framebuffer_init(rdev_to_drm(rdev), fb, &mode_cmd, gobj); if (ret) { DRM_ERROR("failed to initialize framebuffer %d\n", ret); goto err_kfree; @@ -374,12 +374,12 @@ void radeon_fbdev_setup(struct radeon_device *rdev) fb_helper =3D kzalloc(sizeof(*fb_helper), GFP_KERNEL); if (!fb_helper) return; - drm_fb_helper_prepare(rdev->ddev, fb_helper, bpp_sel, &radeon_fbdev_fb_he= lper_funcs); + drm_fb_helper_prepare(rdev_to_drm(rdev), fb_helper, bpp_sel, &radeon_fbde= v_fb_helper_funcs); =20 - ret =3D drm_client_init(rdev->ddev, &fb_helper->client, "radeon-fbdev", + ret =3D drm_client_init(rdev_to_drm(rdev), &fb_helper->client, "radeon-fb= dev", &radeon_fbdev_client_funcs); if (ret) { - drm_err(rdev->ddev, "Failed to register client: %d\n", ret); + drm_err(rdev_to_drm(rdev), "Failed to register client: %d\n", ret); goto err_drm_client_init; } =20 @@ -394,13 +394,13 @@ void radeon_fbdev_setup(struct radeon_device *rdev) =20 void radeon_fbdev_set_suspend(struct radeon_device *rdev, int state) { - if (rdev->ddev->fb_helper) - drm_fb_helper_set_suspend(rdev->ddev->fb_helper, state); + if (rdev_to_drm(rdev)->fb_helper) + drm_fb_helper_set_suspend(rdev_to_drm(rdev)->fb_helper, state); } =20 bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo = *robj) { - struct drm_fb_helper *fb_helper =3D rdev->ddev->fb_helper; + struct drm_fb_helper *fb_helper =3D rdev_to_drm(rdev)->fb_helper; struct drm_gem_object *gobj; =20 if (!fb_helper) diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon= /radeon_fence.c index 4fb780d96f32..daff61586be5 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -150,7 +150,7 @@ int radeon_fence_emit(struct radeon_device *rdev, rdev->fence_context + ring, seq); radeon_fence_ring_emit(rdev, ring, *fence); - trace_radeon_fence_emit(rdev->ddev, ring, (*fence)->seq); + trace_radeon_fence_emit(rdev_to_drm(rdev), ring, (*fence)->seq); radeon_fence_schedule_check(rdev, ring); return 0; } @@ -489,7 +489,7 @@ static long radeon_fence_wait_seq_timeout(struct radeon= _device *rdev, if (!target_seq[i]) continue; =20 - trace_radeon_fence_wait_begin(rdev->ddev, i, target_seq[i]); + trace_radeon_fence_wait_begin(rdev_to_drm(rdev), i, target_seq[i]); radeon_irq_kms_sw_irq_get(rdev, i); } =20 @@ -511,7 +511,7 @@ static long radeon_fence_wait_seq_timeout(struct radeon= _device *rdev, continue; =20 radeon_irq_kms_sw_irq_put(rdev, i); - trace_radeon_fence_wait_end(rdev->ddev, i, target_seq[i]); + trace_radeon_fence_wait_end(rdev_to_drm(rdev), i, target_seq[i]); } =20 return r; @@ -995,7 +995,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(radeon_debugfs_gpu_reset_fops, void radeon_debugfs_fence_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("radeon_gpu_reset", 0444, root, rdev, &radeon_debugfs_gpu_reset_fops); diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/r= adeon_gem.c index 2ef201a072f1..9dd4ff09d562 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -899,7 +899,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_gem_info); void radeon_gem_debugfs_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("radeon_gem_info", 0444, root, rdev, &radeon_debugfs_gem_info_fops); diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/r= adeon_i2c.c index 3d174390a8af..1f16619ed06e 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c @@ -1011,7 +1011,7 @@ void radeon_i2c_add(struct radeon_device *rdev, struct radeon_i2c_bus_rec *rec, const char *name) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); int i; =20 for (i =3D 0; i < RADEON_MAX_I2C_BUS; i++) { --=20 2.45.2 From nobody Wed Dec 17 15:54:17 2025 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE6B719B59A for ; Mon, 24 Jun 2024 15:13:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719242000; cv=none; b=tqMp+Ym0eDPqm4WzSiOFWx8+BI40GloC90iC8EtHK/aKcQq2/uuTxjWHSnw6lUdhaJ+I5YojEst/fhot2oZCRAZ1YJDyuGrslaYFJsjIQuwHO1jH+3aXe8H1x3+OKv5TiJ7LB8f5zdK/mmKK1gH6nTcsAiRpUXoL2Aie9Tcv3/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719242000; c=relaxed/simple; bh=qfXs+kkhAooij6bggnb4t89DDknkHMh3vckE9AGippM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UqNy0zvDdz0TUs0OHV9xrfTD7ILk2YskS1XR2/MmTr9tsec68bV42yHi+WFSTfvcav288hug1XvvMhfJb86znvuNn/djfIHMwOLdM6mKL3bYGMs5wpMckAFxdXFhvrfDQPM8WTcrbX4jG2cfGTwn0XIaBhUaRk54RVRKyRTuqjQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dtjHui11; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dtjHui11" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-795482e114cso401274485a.1 for ; Mon, 24 Jun 2024 08:13:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719241998; x=1719846798; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=etIk1t7xwF8U2fX330UeuA5bc53bbuVw/GGdUgl3Jaw=; b=dtjHui11HYSzkqPZZAftZsWUj+KEys3Jua9C5EebbzrF2cMsk65iFOFr62n+Z3Hcnn RTfGAL7hRvuTKR7Ns63CwCsy1zWKxZe5p7v30koI+uXjbPtzYV/mnQ08u/pgqBRcxfes HGQrUg/J18nFbK7/9KpqtGozae9JXWHv06vRQ6FX2h/9MZnBvLgqJtLhXouunpkS+ON6 YsZwJWHcfgMIaR2yCpQY1zzoPaSlwefmajSjSx9/lcyVGiUPDEhxpKWnZI4HAp7/O2vK GFcqwxQ5dlDpSoxmNRpxrgXQD/msQUB9TmibRWfkmGLNLp3D1sGzmrlONXoOn6obiFbQ eGGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719241998; x=1719846798; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=etIk1t7xwF8U2fX330UeuA5bc53bbuVw/GGdUgl3Jaw=; b=aU0inpknIX6hJm0qqNX1j6mXhj9eO3m5CRPTM7RLSjJWL53nikPVKKnlGg78rBE2cK X+DkI3OpOIeVyqC4Ay3IW1SqyMvAw6RCLTx0l2vVMu8lDxhTDNeRrJth4j+SHswZVIYt DABHZe2pNyKrkf9GWRSvGeqSqNUeKdmmd9dg+9rnEUCBMbBTwqXjQLSdcuTHo6CIuJSA oyWXqPetAhmNCtE/Mv+l+c3U/wRHDyp0ro1n1fXvxTa3nwHI9n+jJ2+yQOKIoogn+1Rp qtxEvQvucs6u/prq8DR0oTezSdyz1hui5GcTLmuf4Y0ESKWJdJgakZBGvVMlmbAGDnRo VrxQ== X-Forwarded-Encrypted: i=1; AJvYcCWQ8rLV/KFVI0XIPFO973BMRb460NBf8wiMqLEeO8nbKIdXYiareGR4Slkl/o0Gdlny4X1AoCntC+Nd8buJENQDA+6yay81uzUiUMfI X-Gm-Message-State: AOJu0YwZ9D/YhlrUrMOMFA6f5sdB2sS6cv202UecTJBfecN5FDz+eNQl IS/la7YrQY4CMvsWVym1wYTVad+e+R5ofHw9+G/Xkll8pgx4tXPYMSjp17H+ X-Google-Smtp-Source: AGHT+IGk8sdltoK4CMZcc6ZsHT7/YkIkoE47OHcxu3b57yqSNBejms53caZQFrYB5DsGvPCwcx0/4g== X-Received: by 2002:a05:6214:d06:b0:6b5:49c9:ed51 with SMTP id 6a1803df08f44-6b549c9ef51mr50964256d6.31.1719241997594; Mon, 24 Jun 2024 08:13:17 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b529eb3decsm27243976d6.12.2024.06.24.08.13.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 08:13:17 -0700 (PDT) From: Wu Hoi Pok To: Cc: Thomas Zimmermann , Wu Hoi Pok , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/7] drm/radeon: rdev->ddev to rdev_to_drm(rdev) 5 Date: Mon, 24 Jun 2024 11:10:50 -0400 Message-ID: <20240624151122.23724-7-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240624151122.23724-1-wuhoipok@gmail.com> References: <20240624151122.23724-1-wuhoipok@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Please refer to patch 1. Signed-off-by: Wu Hoi Pok --- drivers/gpu/drm/radeon/radeon_ib.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 ++++++------ drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 20 ++++++++++---------- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/ra= deon_ib.c index 63d914f3414d..1aa41cc3f991 100644 --- a/drivers/gpu/drm/radeon/radeon_ib.c +++ b/drivers/gpu/drm/radeon/radeon_ib.c @@ -309,7 +309,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_sa_info); static void radeon_debugfs_sa_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("radeon_sa_info", 0444, root, rdev, &radeon_debugfs_sa_info_fops); diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/rade= on/radeon_irq_kms.c index c4dda908666c..9961251b44ba 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -80,7 +80,7 @@ static void radeon_hotplug_work_func(struct work_struct *= work) { struct radeon_device *rdev =3D container_of(work, struct radeon_device, hotplug_work.work); - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_mode_config *mode_config =3D &dev->mode_config; struct drm_connector *connector; =20 @@ -101,7 +101,7 @@ static void radeon_dp_work_func(struct work_struct *wor= k) { struct radeon_device *rdev =3D container_of(work, struct radeon_device, dp_work); - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_mode_config *mode_config =3D &dev->mode_config; struct drm_connector *connector; =20 @@ -197,7 +197,7 @@ static void radeon_driver_irq_uninstall_kms(struct drm_= device *dev) =20 static int radeon_irq_install(struct radeon_device *rdev, int irq) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); int ret; =20 if (irq =3D=3D IRQ_NOTCONNECTED) @@ -218,7 +218,7 @@ static int radeon_irq_install(struct radeon_device *rde= v, int irq) =20 static void radeon_irq_uninstall(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct pci_dev *pdev =3D to_pci_dev(dev->dev); =20 radeon_driver_irq_uninstall_kms(dev); @@ -322,9 +322,9 @@ int radeon_irq_kms_init(struct radeon_device *rdev) spin_lock_init(&rdev->irq.lock); =20 /* Disable vblank irqs aggressively for power-saving */ - rdev->ddev->vblank_disable_immediate =3D true; + rdev_to_drm(rdev)->vblank_disable_immediate =3D true; =20 - r =3D drm_vblank_init(rdev->ddev, rdev->num_crtc); + r =3D drm_vblank_init(rdev_to_drm(rdev), rdev->num_crtc); if (r) { return r; } diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeo= n/radeon_object.c index a955f8a2f7fe..450ff7daa46c 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -150,7 +150,7 @@ int radeon_bo_create(struct radeon_device *rdev, bo =3D kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); if (bo =3D=3D NULL) return -ENOMEM; - drm_gem_private_object_init(rdev->ddev, &bo->tbo.base, size); + drm_gem_private_object_init(rdev_to_drm(rdev), &bo->tbo.base, size); bo->rdev =3D rdev; bo->surface_reg =3D -1; INIT_LIST_HEAD(&bo->list); diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/ra= deon_pm.c index 2d9d9f46f243..b4fb7e70320b 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -282,7 +282,7 @@ static void radeon_pm_set_clocks(struct radeon_device *= rdev) =20 if (rdev->irq.installed) { i =3D 0; - drm_for_each_crtc(crtc, rdev->ddev) { + drm_for_each_crtc(crtc, rdev_to_drm(rdev)) { if (rdev->pm.active_crtcs & (1 << i)) { /* This can fail if a modeset is in progress */ if (drm_crtc_vblank_get(crtc) =3D=3D 0) @@ -299,7 +299,7 @@ static void radeon_pm_set_clocks(struct radeon_device *= rdev) =20 if (rdev->irq.installed) { i =3D 0; - drm_for_each_crtc(crtc, rdev->ddev) { + drm_for_each_crtc(crtc, rdev_to_drm(rdev)) { if (rdev->pm.req_vblank & (1 << i)) { rdev->pm.req_vblank &=3D ~(1 << i); drm_crtc_vblank_put(crtc); @@ -671,7 +671,7 @@ static ssize_t radeon_hwmon_show_temp(struct device *de= v, char *buf) { struct radeon_device *rdev =3D dev_get_drvdata(dev); - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); int temp; =20 /* Can't get temperature when the card is off */ @@ -715,7 +715,7 @@ static ssize_t radeon_hwmon_show_sclk(struct device *de= v, struct device_attribute *attr, char *buf) { struct radeon_device *rdev =3D dev_get_drvdata(dev); - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); u32 sclk =3D 0; =20 /* Can't get clock frequency when the card is off */ @@ -740,7 +740,7 @@ static ssize_t radeon_hwmon_show_vddc(struct device *de= v, struct device_attribute *attr, char *buf) { struct radeon_device *rdev =3D dev_get_drvdata(dev); - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); u16 vddc =3D 0; =20 /* Can't get vddc when the card is off */ @@ -1692,7 +1692,7 @@ void radeon_pm_fini(struct radeon_device *rdev) =20 static void radeon_pm_compute_clocks_old(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; =20 @@ -1765,7 +1765,7 @@ static void radeon_pm_compute_clocks_old(struct radeo= n_device *rdev) =20 static void radeon_pm_compute_clocks_dpm(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; struct radeon_connector *radeon_connector; @@ -1826,7 +1826,7 @@ static bool radeon_pm_in_vbl(struct radeon_device *rd= ev) */ for (crtc =3D 0; (crtc < rdev->num_crtc) && in_vbl; crtc++) { if (rdev->pm.active_crtcs & (1 << crtc)) { - vbl_status =3D radeon_get_crtc_scanoutpos(rdev->ddev, + vbl_status =3D radeon_get_crtc_scanoutpos(rdev_to_drm(rdev), crtc, USE_REAL_VBLANKSTART, &vpos, &hpos, NULL, NULL, @@ -1918,7 +1918,7 @@ static void radeon_dynpm_idle_work_handler(struct wor= k_struct *work) static int radeon_debugfs_pm_info_show(struct seq_file *m, void *unused) { struct radeon_device *rdev =3D m->private; - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); =20 if ((rdev->flags & RADEON_IS_PX) && (ddev->switch_power_state !=3D DRM_SWITCH_POWER_ON)) { @@ -1955,7 +1955,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_pm_info); static void radeon_debugfs_pm_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("radeon_pm_info", 0444, root, rdev, &radeon_debugfs_pm_info_fops); diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/= radeon_ring.c index 8d1d458286a8..581ae20c46e4 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -550,7 +550,7 @@ static void radeon_debugfs_ring_init(struct radeon_devi= ce *rdev, struct radeon_r { #if defined(CONFIG_DEBUG_FS) const char *ring_name =3D radeon_debugfs_ring_idx_to_name(ring->idx); - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 if (ring_name) debugfs_create_file(ring_name, 0444, root, ring, diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/r= adeon_ttm.c index 5c65b6dfb99a..69d0c12fa419 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -682,8 +682,8 @@ int radeon_ttm_init(struct radeon_device *rdev) =20 /* No others user of address space so set it to 0 */ r =3D ttm_device_init(&rdev->mman.bdev, &radeon_bo_driver, rdev->dev, - rdev->ddev->anon_inode->i_mapping, - rdev->ddev->vma_offset_manager, + rdev_to_drm(rdev)->anon_inode->i_mapping, + rdev_to_drm(rdev)->vma_offset_manager, rdev->need_swiotlb, dma_addressing_limited(&rdev->pdev->dev)); if (r) { @@ -890,7 +890,7 @@ static const struct file_operations radeon_ttm_gtt_fops= =3D { static void radeon_ttm_debugfs_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct drm_minor *minor =3D rdev->ddev->primary; + struct drm_minor *minor =3D rdev_to_drm(rdev)->primary; struct dentry *root =3D minor->debugfs_root; =20 debugfs_create_file("radeon_vram", 0444, root, rdev, --=20 2.45.2 From nobody Wed Dec 17 15:54:17 2025 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C71BA19CD18 for ; Mon, 24 Jun 2024 15:13:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719242004; cv=none; b=cF+p40fg15NmKu0vPUywxB1Z1oJmVUl63JpdT1N1MMSGyIAlOaCHHRS7jWqxWHcHN3Ei9CPwhlSKXAUMQ1peTnO0WuR4ojqRaU9tVNDvDZIXmXMa3ROVAmM6iNfelhe54lcEpDaiLDVsSkLRVLszMf1VbM2lt1Gsowv+dAW4jHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719242004; c=relaxed/simple; bh=D7KJ2HSxB7PIGbb9WDmXXZsKodedlLslsjiC1jbTloI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MF6BOOMv1LUVE8eFgOOHW/ylxyhwCei3Gp47qECf3JmN+6PUl0t6ITps5HplaRPnAiJwNozCY2QkwRWl9tohJg/MwW7wUqFLWUQyk5DH+h9moUUqeH2waFvftVCY8dJm1MmmnpPrluEu0mP/MzoRlPxwB7wRmsWt6+W66XB88pE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LElEpYDp; arc=none smtp.client-ip=209.85.210.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LElEpYDp" Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6f9b4d69f53so2473267a34.0 for ; Mon, 24 Jun 2024 08:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719242002; x=1719846802; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gOCAjND5OJytF3iiE7FsJqbOE8iBaZkfj12tePjBSS4=; b=LElEpYDprJoIOCYdGnwYLnsPkuWRFsjcfPrDmDt3WsTfCmDFRtG2NtZ1Hp8wtY/Hgm b9RzOUGGgmp8O7UXcWmDMY7iTBSVb098j7gQBlQnZ2QqihPTS488GjaplfVqw6rUaJDk Zp4sx8NShPBf+aZBPvkAKDUbIFlrq7+wjcJ5gR+4hopm3OJ3VPFCV5JX6GBXgdNPJVmY UYf5en25qN7ggeDCnFmD4QXPwW7yJBJuHrXnjEZqDepQjPmdRSpclae70V3jVrnnTAtF 6JGiQ+SdzSLOPGXDCmuW8Arn0DXtiukLQ5OBPKRyRKRHcOiKg/fl8CrAsctBxSlHtonh Q2RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719242002; x=1719846802; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gOCAjND5OJytF3iiE7FsJqbOE8iBaZkfj12tePjBSS4=; b=CAFivLXkw6e1Qm5QNqcksWvFuMGRE/bLQZEOs4Panyt9k/lxe+YOLAHMO86OG4xKnN gnfUjwwKjlBI4Ha3g8/HQwxNNRzoPrQbQabwGUQtEQHZFxSMbptGYkavvv4m6MxCiwEG b/wreVzaCTzxJScAU7psmciyBQOU1sI/YGqhJHu5YPzvvD448W498AJ9RqZqxiOBkOcX AITpmEgMcaj0P8Zu/TErz+aoTOlBCWYzly2u5G2Z4P629tfBngHFZ83Yhmq8+mfLu1xr xUQpP97ZBATOxjgoDmEU4R9cI6olUzXEbzWaTBOUM5RTa0nlMuOLnTdtum1yJhMO8qDq d2pw== X-Forwarded-Encrypted: i=1; AJvYcCUVssHo8Z9to/j785MZQvL8uVz3Tc+r1Kg4nOANUQ9Q7+UC5pcOBM5CN4ltjCPU/kKvbj9xSHRbPra8c91/pWqT+YUvk72DSDwUpUzg X-Gm-Message-State: AOJu0YzmVCNSL6oqGlhlXCtaJPcM0DxzzXiAtzTdWqJ1jcsScdrWzIHg JJzgio2ZfxVf/NsPe62bbf7jyE2kTXwcIzons1Tz+ooYoYfpwkvX X-Google-Smtp-Source: AGHT+IGJZeIHR3bYjnZt2BJ48CgCThRslXvSl5y4f7Smq6oTjV8wFy4GC+RgRSYhcSELHg5KH2QuUQ== X-Received: by 2002:a05:6830:2693:b0:6f9:6299:1175 with SMTP id 46e09a7af769-700af9343c1mr6868586a34.13.1719242001851; Mon, 24 Jun 2024 08:13:21 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b529eb3decsm27243976d6.12.2024.06.24.08.13.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 08:13:21 -0700 (PDT) From: Wu Hoi Pok To: Cc: Thomas Zimmermann , Wu Hoi Pok , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/7] drm/radeon: rdev->ddev to rdev_to_drm(rdev) 6 Date: Mon, 24 Jun 2024 11:10:51 -0400 Message-ID: <20240624151122.23724-8-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240624151122.23724-1-wuhoipok@gmail.com> References: <20240624151122.23724-1-wuhoipok@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Please refer to patch 1. Signed-off-by: Wu Hoi Pok --- drivers/gpu/drm/radeon/rs400.c | 6 +++--- drivers/gpu/drm/radeon/rs600.c | 14 +++++++------- drivers/gpu/drm/radeon/rs690.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 4 ++-- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index d4d1501e6576..d6c18fd740ec 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c @@ -379,7 +379,7 @@ DEFINE_SHOW_ATTRIBUTE(rs400_debugfs_gart_info); static void rs400_debugfs_pcie_gart_info_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("rs400_gart_info", 0444, root, rdev, &rs400_debugfs_gart_info_fops); @@ -474,7 +474,7 @@ int rs400_resume(struct radeon_device *rdev) RREG32(R_0007C0_CP_STAT)); } /* post */ - radeon_combios_asic_init(rdev->ddev); + radeon_combios_asic_init(rdev_to_drm(rdev)); /* Resume clock after posting */ r300_clock_startup(rdev); /* Initialize surface registers */ @@ -552,7 +552,7 @@ int rs400_init(struct radeon_device *rdev) return -EINVAL; =20 /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize memory controller */ rs400_mc_init(rdev); /* Fence driver */ diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 5c162778899b..88c8e91ea651 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c @@ -321,7 +321,7 @@ void rs600_pm_misc(struct radeon_device *rdev) =20 void rs600_pm_prepare(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 tmp; @@ -339,7 +339,7 @@ void rs600_pm_prepare(struct radeon_device *rdev) =20 void rs600_pm_finish(struct radeon_device *rdev) { - struct drm_device *ddev =3D rdev->ddev; + struct drm_device *ddev =3D rdev_to_drm(rdev); struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; u32 tmp; @@ -408,7 +408,7 @@ void rs600_hpd_set_polarity(struct radeon_device *rdev, =20 void rs600_hpd_init(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned enable =3D 0; =20 @@ -435,7 +435,7 @@ void rs600_hpd_init(struct radeon_device *rdev) =20 void rs600_hpd_fini(struct radeon_device *rdev) { - struct drm_device *dev =3D rdev->ddev; + struct drm_device *dev =3D rdev_to_drm(rdev); struct drm_connector *connector; unsigned disable =3D 0; =20 @@ -797,7 +797,7 @@ int rs600_irq_process(struct radeon_device *rdev) /* Vertical blank interrupts */ if (G_007EDC_LB_D1_VBLANK_INTERRUPT(rdev->irq.stat_regs.r500.disp_int)) { if (rdev->irq.crtc_vblank_int[0]) { - drm_handle_vblank(rdev->ddev, 0); + drm_handle_vblank(rdev_to_drm(rdev), 0); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -806,7 +806,7 @@ int rs600_irq_process(struct radeon_device *rdev) } if (G_007EDC_LB_D2_VBLANK_INTERRUPT(rdev->irq.stat_regs.r500.disp_int)) { if (rdev->irq.crtc_vblank_int[1]) { - drm_handle_vblank(rdev->ddev, 1); + drm_handle_vblank(rdev_to_drm(rdev), 1); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -1133,7 +1133,7 @@ int rs600_init(struct radeon_device *rdev) return -EINVAL; =20 /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize memory controller */ rs600_mc_init(rdev); r100_debugfs_rbbm_init(rdev); diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 14fb0819b8c1..016eb4992803 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -845,7 +845,7 @@ int rs690_init(struct radeon_device *rdev) return -EINVAL; =20 /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize memory controller */ rs690_mc_init(rdev); rv515_debugfs(rdev); diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index bbc6ccabf788..1b4dfb645585 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -255,7 +255,7 @@ DEFINE_SHOW_ATTRIBUTE(rv515_debugfs_ga_info); void rv515_debugfs(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - struct dentry *root =3D rdev->ddev->primary->debugfs_root; + struct dentry *root =3D rdev_to_drm(rdev)->primary->debugfs_root; =20 debugfs_create_file("rv515_pipes_info", 0444, root, rdev, &rv515_debugfs_pipes_info_fops); @@ -636,7 +636,7 @@ int rv515_init(struct radeon_device *rdev) if (radeon_boot_test_post_card(rdev) =3D=3D false) return -EINVAL; /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* initialize AGP */ if (rdev->flags & RADEON_IS_AGP) { r =3D radeon_agp_init(rdev); diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 9ce12fa3c356..7d4b0bf59109 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -1935,7 +1935,7 @@ int rv770_init(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); /* Fence driver */ radeon_fence_driver_init(rdev); /* initialize AGP */ diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 15759c8ca5b7..6c95575ce109 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -6277,7 +6277,7 @@ int si_irq_process(struct radeon_device *rdev) event_name =3D "vblank"; =20 if (rdev->irq.crtc_vblank_int[crtc_idx]) { - drm_handle_vblank(rdev->ddev, crtc_idx); + drm_handle_vblank(rdev_to_drm(rdev), crtc_idx); rdev->pm.vblank_sync =3D true; wake_up(&rdev->irq.vblank_queue); } @@ -6839,7 +6839,7 @@ int si_init(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); /* Initialize clocks */ - radeon_get_clock_info(rdev->ddev); + radeon_get_clock_info(rdev_to_drm(rdev)); =20 /* Fence driver */ radeon_fence_driver_init(rdev); --=20 2.45.2