From nobody Fri Dec 19 06:01:31 2025 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 7533015572F for ; Sun, 30 Jun 2024 17:00:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766836; cv=none; b=ArqxN4ewJSTdKV9Lf6ikkALfV8f7SmQNGQOx0sO4CJkj4IEUwGR0Jj6/kFV/bVAopvmy7/tOKX6PD8wfR0hGXuuKaHwqtRJcORywpRj9WixRiWp1Z/2uKQuxxpJDGnydz72R2GhbYykjhp2nLzdUaKivKft5Ggdp1QQ608IOxUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766836; c=relaxed/simple; bh=iX3Lh3JQVijtFa9VNA6uEUMFceyEx9AFavXCRd3VyW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mf8LKntHh41Mm2Ypv5mcbwY3C2lap1C1YVvO4eaxlTUjt0tPB+rlTOyWATwkSPh2W0MEg2rcPxq8ioaLojk03HNBl6d/7xuMGRkt4Y1pE7Vvq2G4xeYmfVqQp7s3X8JzgQHrz4XkhPTS+wswJPF8YJkJOoH8s5xVNKwisw6YG5I= 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=FUAFoTlv; arc=none smtp.client-ip=209.85.222.172 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="FUAFoTlv" Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-79d55fe9097so177206985a.3 for ; Sun, 30 Jun 2024 10:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719766834; x=1720371634; 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=aOAqEF8HBq/c8/HLVMEZy1JjMjgUXa4TTTkMry5URs4=; b=FUAFoTlvoGnSlZOPo8ZZ7XH0D8xaiM4YQc/FLiomUSkTXCNKkQUmKFgGspj79CwVpT lvGWpuo1EUgOUXHOFR4wqtYkVJZN0YmlDr/0ktPWjJqU3HBmFMIipsRQxYSVmnArfc/K kUbg906e++efYtWZKAJ/AY0AQJ18+UzALL+PdKOMhHTReiMG2MFVhZZnB0lQLPDUhjdx E7mId+DpxfcccYEF/wn1nb0ltbMTsFqIKyMGnxMmBo506P11xHgd2zO8OG57XB6PZuHQ d6JSFXDvcBHLvU6maArW6QU3EzEnTt3px2ih7zvWvPSW8CAyjOEKHpZ0iEoCBLqq1lr9 QI4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719766834; x=1720371634; 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=aOAqEF8HBq/c8/HLVMEZy1JjMjgUXa4TTTkMry5URs4=; b=TNRmHKjlZ/2zMvSwurZM5dC2KkgVbnyHUJXtm/Vuo7ozGT89MuK+mqRxi2OwGIPY4z 2H3K4aoFgZSDBI/nTt6ZhX4pVuJr+ONXyWtk3CCZnbdGlhC/DhG/W/kHbB3rDb9rI7k+ iO2GkGxSDtU4hetJADw+0u7QaOK78f4+15tyRPKCMgD9FtaVHp9kVPvnK7AnUmacuBnX r5BtRnlbsI3+xfbQFrsO20b2m35z2pC2xvWoXNkKdULIRgfJ5QfuqWNryU+/BccDJjsj LycxhGekeSoMNzPdz8BWDFODBzs61kMoFqLhM0VZgOYzPeTfmj5BmIFUQqoqfvub01LF ji9g== X-Forwarded-Encrypted: i=1; AJvYcCV7fdxC+IhK8MxYacV2Gwpyru0vtKGNkuGHGiANYJ/Fy7S9KkgNBkDOQdcaf+PBOvrI6U8lMpBSQaMHhSlQu0jwAInjPdS/islurtOj X-Gm-Message-State: AOJu0Yx8AUMN/OG0cG8HuX1PhIMorKhPv2mZVPwCvOO83G/UBhXdtpvh 4HP8BtBiT72Tn7Rn4b8G3JURceDSu5LsiOgGiF8j78Jm3HlL3Xe4 X-Google-Smtp-Source: AGHT+IHk5xMH+iHy4kgznjXyO/Fbae7oHqigKr2e4C+Oquw5T9HXa7nj+zH8AokmUX3S0CDkJ/rPMw== X-Received: by 2002:a05:620a:1098:b0:79d:561c:bba1 with SMTP id af79cd13be357-79d7b9d68b8mr412701885a.25.1719766834330; Sun, 30 Jun 2024 10:00:34 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69295f5esm263431785a.56.2024.06.30.10.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 10:00:34 -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/6] drm/radeon: change variable name "dev" to "ddev" for consistency Date: Sun, 30 Jun 2024 12:59:17 -0400 Message-ID: <20240630165949.117634-2-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630165949.117634-1-wuhoipok@gmail.com> References: <20240630165949.117634-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" In the probe function of amdgpu, it uses "ddev" as the name of "struct drm_= device *", so I suggest renaming it to be consistent. Signed-off-by: Wu Hoi Pok Reviewed-by: Thomas Zimmermann Tested-by: Thomas Zimmermann --- drivers/gpu/drm/radeon/radeon_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/r= adeon_drv.c index 7bf08164140e..739bb1da9dcc 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -259,7 +259,7 @@ 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; int ret; =20 if (!ent) @@ -300,28 +300,28 @@ 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); + ddev =3D drm_dev_alloc(&kms_driver, &pdev->dev); + if (IS_ERR(ddev)) + return PTR_ERR(ddev); =20 ret =3D pci_enable_device(pdev); if (ret) goto err_free; =20 - pci_set_drvdata(pdev, dev); + pci_set_drvdata(pdev, ddev); =20 - ret =3D drm_dev_register(dev, ent->driver_data); + ret =3D drm_dev_register(ddev, ent->driver_data); 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 --=20 2.45.2 From nobody Fri Dec 19 06:01:31 2025 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 7F3F115664C for ; Sun, 30 Jun 2024 17:00:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766840; cv=none; b=uHJeQdwU9E3bqffO6NkKdPwZw2Na+9xaG5chSq+KrZCBWfJVpnXWU+blkjjDkeuk50rqOgU2UOAyhsUVFld04+Y3sUwbdcclsN8cm1nCxYdt+fkeruoDvJqX0Z5Dq8DhpvcUoG7mF1tv9nzSZtzuOTtwEp0ytVamLK3xpjA/+Co= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766840; c=relaxed/simple; bh=QOitObv8cUyLYNALEgmobT3Xc1Io3M5A325QgAWj2Ws=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T74wEcteiDpygUSNlzIfOjGrE3/EEOtVhXOFeSVIFSo8eAsqRBtceT/AAXFn2tD5cciiicblwosGRSGLxKkLynr/IBTtG21/GVa+LaLEbvtSwyjFzL0f/7rziL29wfEuIA8nWag57r4Vmev5xYZ60nVBeFwHD+kvgOc3dnxHhvs= 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=XAYm1h6/; arc=none smtp.client-ip=209.85.222.180 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="XAYm1h6/" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-79c05313ec8so116899285a.3 for ; Sun, 30 Jun 2024 10:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719766838; x=1720371638; 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=3+fUm0J60rhD0JfSfR+ec8NGlbRdea8idCqnnknLyK4=; b=XAYm1h6/sNhMSRxDPQ6r6j4YenPrnUiHl8bPacN8sgwZURGzrQD4t/ZaCUy1REsz6t GAk67Pet0zJAcbeL75XjI++WHCU/am3tZCNWulsoJ2OLFgZ/Hql1Gl8VIfbPoXeUbLym +kybzAY9sSQ99wq2NR/gIspTmKHWGRpuvCvnVLl8y5rB2LRI5xLphLQ6uM1uxLtEdlbR H1VrqNQwuXPy7VWtK6LYqTCx3In9pQQywiFM6XxpImfi3vtPzohQ8UuSRNqbqXBRDSJm wvcjUSmdy1D6P4/08/B+750MmTZoMklgDibkN2VbKL+7L7ItaFEKtEIi2YRJ0CeM44SM tGXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719766838; x=1720371638; 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=3+fUm0J60rhD0JfSfR+ec8NGlbRdea8idCqnnknLyK4=; b=EyP/b1K5eUs9W+2BD0szDPYCSJHg7jTHj5clAmq+a6EUb5JQNoQqwAhjctn1ycC5+g sis5xSIJLfgGxHaqvmCSOtYgRbYgDsaZuZUxL1HnjkKiIF4yKBJkklESIC0qhq1LO3cA vfCVmJJ3WP1pf1zWr3azlDpQjTt0e2zM0Oxh6OCdcjzOB7GelSxQxLlfof0ShlR5E/OH ntQa70MyLXPipWJzC5X9MTLZNIkiNO5EUlhViSlWBRjJ5SJOvI6RV0F1/V7iuxYVww/x Iv7OBzgJhJSQDkHqeyF4PTxHCh6fAcBUhG/VH/ZUjlc/rPiU7nsYoi0N9a22pPmLfSf2 yzbw== X-Forwarded-Encrypted: i=1; AJvYcCW+GL1oDHkqNXLUxDP1VvtMAy09rW6hAsIPSeqh5bfOmBb4TTuxDmgkLfHDTqk/wmtWTHOqEPFMzBKn/5y7HaYLvi5J781CLC42/anq X-Gm-Message-State: AOJu0YxSCe9EA6qGT9nqyrbiXBMe3Y+x0WiCm4mzK/Q8QkhxS8dJUXQD wIHDqecQb7ENgJM48SFH/WGyleP5IsfSKIMF7UQ09/cgioiz2vto X-Google-Smtp-Source: AGHT+IGTdfbTavrCYOtrr5ya6VIyVg2UfyDv+wbK3tnZFumCzPT8mI4PkDxBQsgVXsZo2s4ZzqGaqg== X-Received: by 2002:a05:620a:21db:b0:79d:747c:75b6 with SMTP id af79cd13be357-79d7b9f2333mr428624885a.40.1719766838374; Sun, 30 Jun 2024 10:00:38 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69295f5esm263431785a.56.2024.06.30.10.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 10:00:38 -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/6] drm/radeon: remove load callback from kms_driver Date: Sun, 30 Jun 2024 12:59:18 -0400 Message-ID: <20240630165949.117634-3-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630165949.117634-1-wuhoipok@gmail.com> References: <20240630165949.117634-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" The ".load" callback in "struct drm_driver" is deprecated. In order to remo= ve the callback, we have to manually call "radeon_driver_load_kms" instead. Signed-off-by: Wu Hoi Pok Acked-by: Thomas Zimmermann Tested-by: Thomas Zimmermann --- drivers/gpu/drm/radeon/radeon_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/r= adeon_drv.c index 739bb1da9dcc..88d3de2a79f8 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -310,6 +310,10 @@ static int radeon_pci_probe(struct pci_dev *pdev, =20 pci_set_drvdata(pdev, ddev); =20 + ret =3D radeon_driver_load_kms(ddev, flags); + if (ret) + goto err_agp; + ret =3D drm_dev_register(ddev, ent->driver_data); if (ret) goto err_agp; @@ -569,7 +573,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, --=20 2.45.2 From nobody Fri Dec 19 06:01:31 2025 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 665B3156C78 for ; Sun, 30 Jun 2024 17:00:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766844; cv=none; b=vA6orimEX7d1aG1wG9xwO5AoH58uMC6vHe/WAMhakwyKUWP7HXtxSo4f1iDqv8m+WEjgKBssdvbLXYwMcoJgDFiXY8vihs9u/SbUlc8pR/Z8yyZAI+gSCiLaOwdd3TEKiKn+1od0idcYnQIIY23RPFTAkoO0XELMcZ0iRqYhWaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766844; c=relaxed/simple; bh=/RZaGLmr7Ug0J1QGj1sNNuCF3duc6YzDgUOKrMEySao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uXcwWn1w9eCZaMGqigZxd5JyWSPWpONHCHxtvess2cn4/M+v/x7kIxlP2koA5qYkgQJqsVWe7AqeM6nuNBML3WxVpYYoZFBwxNly+9FkC/xvgtZqj7rDfp+mFHQLM8jiXCLz8eXSLGBZd9rQSunS00zEdPBGJNk8L5qI6GWCca8= 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=cLhWlKiV; arc=none smtp.client-ip=209.85.222.176 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="cLhWlKiV" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-79c05313eb5so201829485a.1 for ; Sun, 30 Jun 2024 10:00:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719766842; x=1720371642; 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=8QLGAW+ynl8vrQtYcMfXzZ7X2GgW9XGKGc2Rji6SiN0=; b=cLhWlKiVv2vxC0ZsUgRt0XItuE2bm6Esc7EOasV+uTj9bxcY2tgSQBxrnae1CyksXM UcOVQQx7Rah+6phuJ3Qqke9U3kzKjcM+mBdDWJr51ePipU5XZZXJPelt32VoFqtf4v9q 455hBqLEH2Ds0vYCf0SLg+4lYFxqc+pNzoCYzQgdzvlVMfFi7KX76zEx3BsXMwxuUlR8 nejaaSAO9+Z7XemXMTsgmuzDrcHDyjhOoyAkZI3w78QelNfdr3Aqn8HMTg139Mu1BDok vMYxCG/iKOcPhnrAVIoHaLEm1IKVNDQ+VR4T9wnjI47iMc7bh7Y9X+5BazEtJhLtFlzd 7jsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719766842; x=1720371642; 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=8QLGAW+ynl8vrQtYcMfXzZ7X2GgW9XGKGc2Rji6SiN0=; b=ipclEiNL/0kompRZi8BI4JcWTCrB5f8HZwhMH5fE2wiD9MrnYOt6hKL4jOtBWwnBB1 OhdOQYKAiV+4PsvSK+m43E6wDkXTv2JeC3EhAkf15FLxNAkFYTHy4gBCEMPma3PXqYLK jQeXCcCOAJqz/mqfKLND4aWMOJRHoM+sVHsFc+cHKKxhqLroA8Uv2zjBFrKWK4SR9XFF vzhLIfzUFsQ3/HUfTWOxJV45vwIpGAkJpbKA2KpS+A4HYjuyeqahNDDSp6uBkTuTU3nB HmLh9omwG4uWSZFrzhuENDh3CSaTtp/pTP1/7SjWLtA7s85bmspVR/ED4cumqj04IJZ1 1OVg== X-Forwarded-Encrypted: i=1; AJvYcCWA8aWEdLWvYXiSVAc3jxBV7ylCrAim4oGh3n6KMZYvAfhWx//H9aY5MrZRWs3woUEn3ud+nyWVpDeyd+q/wSgnpEbO/3HMhwO+9oRw X-Gm-Message-State: AOJu0YzN/SsFNCHA71zpDtL7USOyud4WT8FgYdh6lOqEp4bHunefk6R7 y++ziaHrz0plpQKOrLLaO+dZFcScECimEYjPCbbEBia+6AVWk+c7 X-Google-Smtp-Source: AGHT+IGtMyrH/5c1fTXATxN1H5bbXW5O5iGXqlIdcuzLUpq4fPCLGzb/lvYkgdM8YMFaKQxHlNRx5Q== X-Received: by 2002:a05:620a:5783:b0:797:bc08:f495 with SMTP id af79cd13be357-79d7b9f1df1mr383929985a.38.1719766842329; Sun, 30 Jun 2024 10:00:42 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69295f5esm263431785a.56.2024.06.30.10.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 10:00:42 -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/6] drm/radeon: use variable flags as parameter Date: Sun, 30 Jun 2024 12:59:19 -0400 Message-ID: <20240630165949.117634-4-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630165949.117634-1-wuhoipok@gmail.com> References: <20240630165949.117634-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" To be consistent with amdgpu driver, use "flags" as the parameter because it is already assigned as "ent->driver_data". Signed-off-by: Wu Hoi Pok Reviewed-by: Thomas Zimmermann Tested-by: Thomas Zimmermann --- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/r= adeon_drv.c index 88d3de2a79f8..7b8aa8406751 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -314,7 +314,7 @@ static int radeon_pci_probe(struct pci_dev *pdev, if (ret) goto err_agp; =20 - ret =3D drm_dev_register(ddev, ent->driver_data); + ret =3D drm_dev_register(ddev, flags); if (ret) goto err_agp; =20 --=20 2.45.2 From nobody Fri Dec 19 06:01:31 2025 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 76EB515746E for ; Sun, 30 Jun 2024 17:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766848; cv=none; b=UsQicXrVBQnPyShFoDpfH35k0bH+De3q8Hd/4GNMuAKgLO44XCJ88ZIKOdtkNfMRxiF6U3OMWxT5YJiSDsi5llz5LZvh8ycPI60j58vq+fK9kret2HGu/JeukTKYYkvzX4lIfdlsu5sDdNLKt7aMauJPyDuE9t+Pyrt+3dhNm7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766848; c=relaxed/simple; bh=nEpCkBiwbFODLXA9jzwipHEHIfkSgL3slFEN2sohEBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E7Ior3QC9PPXIMT1Z2vt6WXxSosE+idNZXGQpwu+sVx7hAEWSDQh8V4eF7m4dWBwK6hgbrMiLMmVTaUgaN6r0+83h0DIRAwKryRFPnJ4X3dV9ucO5NKH7p6PTWCauFsZwqaFQD1vt1iwQZsHDRYyGUpc/PWWK/k3DhXqhq2ZV3g= 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=jSc+/DYY; arc=none smtp.client-ip=209.85.222.171 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="jSc+/DYY" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-79c0e7ec66dso200012685a.1 for ; Sun, 30 Jun 2024 10:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719766846; x=1720371646; 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=fHutpqbU2XFBkO4ZS+HSx6BtgstQ81ZFAirtiKOfnNQ=; b=jSc+/DYYRrzUWnZEUSAut1jN/KIPqveva6xF8D1lU0rcuwXYHqzdcQraNaSEGujXOc 5aKsRLizEOIMUXNdfeFA5YXJavgyNG8PXs1nH6jRtZ+0xi4wSUlVo6674NnVZimLX6/d odd6+KT4O+4xMI3f56ksEN++Oroy7OGTy7MRP8TzKw01mcL3NhZu1EunbmzBW6rkgTbn 0P8PR0CJuGhKQLj7kWoPJpZJPy3rhyprUmEa44HdtVkQpZ+U0OBdVxV4mwYkOiQ1tnJX XpSw8JK3Iyps4UmYWJdaly6lhPrIACyWYib/glsSO9//lsshnpf4wp+oCsalP55/1DsX BzRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719766846; x=1720371646; 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=fHutpqbU2XFBkO4ZS+HSx6BtgstQ81ZFAirtiKOfnNQ=; b=KJIzQx5J3bHorZDnBaeOhC/9LsCvB6HKys80Av3hYqIQ3BnYKEYwPzNXmwbeuoEOGg z5l/mDhwGjiAml1F6/HW3HMJj1Ez33HSGiNZqEVUdqZBvqESe5lRhyaah53Z7rOVNlrX cKozEg1hskVnHHcjNqoop6moWsBrkSZskhDWV+SlrF+4LZAKaA4gUlsuYIiARZ1qW+4c 4L+HoJyQrxRouIgG8kLxL9dy/oQI9sO9Aqi3KCzyoRKTj9sMQ8jh7oulQR3Mg5wyJSNp QgXq/C5dcppVNyNILSX1nulIJ9bZBpwG9JbdzPm8s0RUVkGXTR/BKIFVuhg4xo4URkYC nWgg== X-Forwarded-Encrypted: i=1; AJvYcCXDycF7OGs0BmiW1qP8aTqSaY6MqY2iMYjIg2eM4ypoyqI288wrTwC9rL4CN6BXJq1z0Zjw1SmofqAawBiJDwXLFojURxTlAyqQWp7f X-Gm-Message-State: AOJu0YwgvrKf1e+aRXHRajORYT+KHWwrSX+kXAHVxcIV3/PihTCrh+Vn 3HvkahkcmXhnb/mANN364I3lQp4t4f1O+zkDGQqTNsQUvPLagL3v X-Google-Smtp-Source: AGHT+IH0ztPyCY6Dqt4NpzMUYWlI0A2tAzXkZ1Uarh7nDBydP0UxmseHQ2j6rrqIVN9lnOUSv3vNKQ== X-Received: by 2002:a05:620a:204d:b0:79b:f641:e6c with SMTP id af79cd13be357-79d7b9b0fcdmr432140085a.14.1719766846526; Sun, 30 Jun 2024 10:00:46 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69295f5esm263431785a.56.2024.06.30.10.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 10:00: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 4/6] drm/radeon: add helper rdev_to_drm(rdev) Date: Sun, 30 Jun 2024 12:59:20 -0400 Message-ID: <20240630165949.117634-5-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630165949.117634-1-wuhoipok@gmail.com> References: <20240630165949.117634-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" Add helper rdev_to_drm(rdev), similar to amdgpu, most function should access the "drm_device" with "rdev_to_drm(rdev)" instead, where amdgpu has "adev_to_drm(adev)". It also makes changing from "*drm_device" to "drm_devi= ce" in "radeon_devicce" later on easier. Signed-off-by: Wu Hoi Pok Reviewed-by: Thomas Zimmermann Tested-by: Thomas Zimmermann --- drivers/gpu/drm/radeon/radeon.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeo= n.h index 0999c8eaae94..ae35c102a487 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -2476,6 +2476,11 @@ void r100_io_wreg(struct radeon_device *rdev, u32 re= g, u32 v); u32 cik_mm_rdoorbell(struct radeon_device *rdev, u32 index); void cik_mm_wdoorbell(struct radeon_device *rdev, u32 index, u32 v); =20 +static inline struct drm_device *rdev_to_drm(struct radeon_device *rdev) +{ + return rdev->ddev; +} + /* * Cast helper */ --=20 2.45.2 From nobody Fri Dec 19 06:01:31 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 82C0E157495 for ; Sun, 30 Jun 2024 17:00:52 +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=1719766855; cv=none; b=tK3Uf9cCDzs5FAi8tzcVXT24eqGqnUTFhxj0bd/x6InQAX4IrtUNP9ufqQBhRYWOJTydMf3/aLPVHiYou/S0qSSlUjGuoEzr0gaLSREiVz++WvBOLhRzpheC5T3+pH71rZdsdfiajriXxS/Y/h7KWA01p9nQVNrGnhtPspg/9HQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766855; c=relaxed/simple; bh=svCgnKSAhvNxQRmTgr/gK8VJoWb0uqLDzgRJlQSHDRE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OoVoMsgseEGto3NVKXgVhW6wLhiTg+iFRbFBbOJtRMsMFua+yeXozdeR2PIzlZ+4OxnpF/8jnrwHheH/sgXxl5WDJBbTTLkH5ZzUjANr3wbaPrjn1w5RmkJPcQp5sQhOO+RgfGqdGwYLEZ9ycmwgGX835fLz0pFREMZmwddCBUY= 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=OJ1FqH8l; 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="OJ1FqH8l" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-79c06c08149so151771885a.3 for ; Sun, 30 Jun 2024 10:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719766851; x=1720371651; 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=Smvs4vuMdN3Aj0bTTLBjsBaOupxd5LRfzbKsXvHNR1U=; b=OJ1FqH8l8yESQIHoFric7BCB/4YzD0UTkLyDyClrnsPExK7eSSPkVvU8yjy51P2R3R VyE7q5MdhR/OokOOI9yz7ckvxHkBIqij1p4CjztB880O+ZSHVLUH9l1Hxcdq88XAFFjB YVRz9C8/aR126lR6IcOnQ52sovSt59irVgE8pp3OUP/muK/uMF/V50PJ/027QuAyYjhd H1TUluyR1Kk0t8Q5Uc+yxD0iHZhtDSgJln1hEDE4rroVCrBiP0zSV6/a5uDYYRr8JYvB V4aJOlTWtDiwKGOq1umPZkION7mVV3x/g4mtSoWrUieLHUjX4i0ONLjsCJ/b0BUPMzso BUXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719766851; x=1720371651; 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=Smvs4vuMdN3Aj0bTTLBjsBaOupxd5LRfzbKsXvHNR1U=; b=KwD8TLl2D0iG8Ljuy0TtBXCSwQzY5vGCIYfL32mrPhQghJqsmZubCwbFHX2YEpN7gl IqSdfbkW5zAnl3F8qKKd3AeSNEQdjHaxNcW3kmzJmC/DW3NO4UtSOAeanR4+LAijw2+U fLivYb1Gyjp0ukZ8e7V7Os3vGUpv0/hQx2hlBEtAsBW6C1kdStvdZ4wl8n1oI4Nk0t7Y Q3Wi9/oXjKXtCo1JGxj82TG9BqrVXBDizT5QCO7g1CVCjWbD5Dcy4GJDJTW4IlT5Fp9u xpzNamYa1uIzP0XoTYpoCZ3gif2ZnxG0mKyi97SvWlrTB/euJ2pTfS6ZvR1FdJoqqshY ROTw== X-Forwarded-Encrypted: i=1; AJvYcCX9FFfj+wVfvetbztt0vTT512woNA1z2TA7aQk/hK2UmixBzczbXSnWiMZR0PTuDNIB7yvbZ47cjeXs2X9NR5fANWon+Y13BSXuJ9MR X-Gm-Message-State: AOJu0YyIjff7i3QJKyj5lC++qNnmHa8Lh6WRs3ldtFEK/kv3z9eXw7pj vL4YBCM82p+qS6jZWRs/s5M3QcgU0l4cPZq5TIEEQ+CkrO95JxCT X-Google-Smtp-Source: AGHT+IH+4n6O/Lqwl2Ulx08IIjzHht+AxM4tBt4x8h5kKzXhv/vakQtIZ+956dN1WL9je6+4+NkvHg== X-Received: by 2002:a05:620a:4622:b0:79d:544c:bf20 with SMTP id af79cd13be357-79d7ba8596fmr516598785a.55.1719766851101; Sun, 30 Jun 2024 10:00:51 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69295f5esm263431785a.56.2024.06.30.10.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 10:00:50 -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/6] drm/radeon: change rdev->ddev to rdev_to_drm(rdev) Date: Sun, 30 Jun 2024 12:59:21 -0400 Message-ID: <20240630165949.117634-6-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630165949.117634-1-wuhoipok@gmail.com> References: <20240630165949.117634-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" This patch changes the way "drm_device" is accessed. It uses "rdev_to_drm(r= dev)" instead of accessing the struct member directly. Signed-off-by: Wu Hoi Pok Reviewed-by: Thomas Zimmermann Tested-by: Thomas Zimmermann --- 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 +++---- 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 +- 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 ++-- drivers/gpu/drm/radeon/radeon_device.c | 10 +-- 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 +- 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 +- 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 +- 36 files changed, 159 insertions(+), 159 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); 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; 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; diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeo= n/radeon_device.c index afbb3a80c0c6..32851632643d 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 @@ -1847,7 +1847,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..829d44cf6759 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++) { 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, 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 From nobody Fri Dec 19 06:01:31 2025 Received: from mail-vs1-f53.google.com (mail-vs1-f53.google.com [209.85.217.53]) (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 1F2E2155C95 for ; Sun, 30 Jun 2024 17:00:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766858; cv=none; b=YV+58AhyHVe5UQM8RySTk2giWraYr3seiIVujrR635pRfMJ9KxfqkWQEf+RCB4ePxLvXvYE5rTzKBVALqqPW/0Uzg/nYhBAnV8PevS3QzP3OngbTy7fZL1BrL29yzmaw8n+nnVuQm2LTAYOeWwj3vZNPHefBXBw/BoMqUt2q6Nc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719766858; c=relaxed/simple; bh=ZCp5CV1hVSoB2TB0mtSm+dzqvtA1HPlMxyojPG9ZVTo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PYNP5X+ESXeQRiqKBb2uiz5KrusCNMkrlama07vM+ccyMyVt3tRLrD2k4QgYLy11B0w5m7fXtGTVTCOp7za+EOUfrzkfu2420dFjAHkKF6xot+X8LbSB/RKa2emPdSv+bFwMpUHGk43y5fpxM/1QIbVSPWAqBepXok6CiLp/tyY= 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=mG9dgFwj; arc=none smtp.client-ip=209.85.217.53 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="mG9dgFwj" Received: by mail-vs1-f53.google.com with SMTP id ada2fe7eead31-48f5b8cde8cso760046137.2 for ; Sun, 30 Jun 2024 10:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719766856; x=1720371656; 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=KlhaFNhfAx0+KHxeTlQ2k5JPN6j1xoSeVgNpNKUjC6k=; b=mG9dgFwjKtW6ZOxIrF3Cbij/tvQHUpZcQk1vyNX1SKneC+TnP4mm/K7Fi88ytkTy2c /Z7eKVeaBpZZB/rdCFfun1zxOlMg14/QS5Hpz4jMHa24R34TpEf0f+PfUCPg/zx+NMfQ prVba6bleqhfQRAP7m2b1VWPwTT6AWNbNeyncwv3e1nBzcTyAwZx8ieHy+R8GEdDIp59 D2b0m5qjQdX4tLByILcWR3vpOwxKTUOEeyzc9SwA/b8WCAsWgVAcfq3FJCiGalRVh+76 Wr3GtyfU3Xa4DQBww8SqwtvFTssyG1kzrlVwrizHyWCmGwUtV2xw6up42PnTmJ1+cxmf 0Q/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719766856; x=1720371656; 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=KlhaFNhfAx0+KHxeTlQ2k5JPN6j1xoSeVgNpNKUjC6k=; b=SIzri9RkngjOzQpHpGVkkB78OgleBhXPdOSYj1IOhrzjl69zSffF0rxYaPgUo8QNLr Bz+vrkcBGybjJ5V57vOrPfK95cmKTab6aUNbP8gl91Huw6u40QRFG7D97ffQ1NSBmzMU SuTP0c4LlcwudybPJnrrBSTxip84Ir+zSLQ5Sch7bwu//gixtvZTjmfFutoCsLGNnfwW 6q/6OVkIofXvwOA+T2n0PPNX5KSi3YjOlEJUtfqfWYyL1uiuUYx9+5SppX8B5RjuBs4t pcVcKsMh0hsbxsDQPSlRoNvdmKZuZJnxYH3H8bqBKLhmwMTVqVXi0WY5xrWAOWaW4HsM yJCg== X-Forwarded-Encrypted: i=1; AJvYcCXmLcSt7FVCIGY/y1rQ0mJWdzVhf5uWEz7THmxGtsQ8sbAQUkUuQtQZxPbIdGoaAuTJmri/uk6HUJo3sX7PJuSmGTscCVwq4ma9+Dhj X-Gm-Message-State: AOJu0Yz1SU7XV8ethHnpZjHldr2BqqPMcK77cF0cyGsL2OCqRqmejq5s +X/QwhRHw22CsDehyLDfzkjca/8Cbbmbu08GqVUj1DC5aPiP/A9k X-Google-Smtp-Source: AGHT+IGr3xK4iR6mDCCPUhjjys3YyHdCiX4Ihwv6WPfrUP+aK8l7ib9jc6QMcFospdyQcQZlG8qHDA== X-Received: by 2002:a05:6102:3a13:b0:48f:2afe:88f1 with SMTP id ada2fe7eead31-48faf0cf479mr4714159137.16.1719766855731; Sun, 30 Jun 2024 10:00:55 -0700 (PDT) Received: from localhost.localdomain ([142.198.217.108]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69295f5esm263431785a.56.2024.06.30.10.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 10:00:55 -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/6] drm/radeon: change drm_dev_alloc to devm_drm_dev_alloc Date: Sun, 30 Jun 2024 12:59:22 -0400 Message-ID: <20240630165949.117634-7-wuhoipok@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630165949.117634-1-wuhoipok@gmail.com> References: <20240630165949.117634-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" "drm_dev_alloc" is deprecated, in order to use the newer "devm_drm_dev_allo= c", the "drm_device" is stored inside "radeon_device", by changing "rdev_to_drm= (rdev)" other functions still gain access to the member "drm_device". Also, "devm_d= rm_dev_alloc" is now allocating "radeon_device", allocation inside "radeon_driver_load_km= s" has to be removed. In "radeon_device_init", it originally assigned "rdev->dev" etc. However it= is already done right after "devm_drm_dev_alloc" as you can see down below. It is bett= er remove them. Signed-off-by: Wu Hoi Pok Reviewed-by: Thomas Zimmermann Tested-by: Thomas Zimmermann --- drivers/gpu/drm/radeon/radeon.h | 4 ++-- drivers/gpu/drm/radeon/radeon_device.c | 3 --- drivers/gpu/drm/radeon/radeon_drv.c | 12 +++++++++--- drivers/gpu/drm/radeon/radeon_kms.c | 8 +------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeo= n.h index ae35c102a487..fd8a4513025f 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; @@ -2478,7 +2478,7 @@ void cik_mm_wdoorbell(struct radeon_device *rdev, u32= index, u32 v); =20 static inline struct drm_device *rdev_to_drm(struct radeon_device *rdev) { - return rdev->ddev; + return &rdev->ddev; } =20 /* diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeo= n/radeon_device.c index 32851632643d..554b236c2328 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1285,9 +1285,6 @@ int radeon_device_init(struct radeon_device *rdev, 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; diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/r= adeon_drv.c index 7b8aa8406751..f36aa71c57c7 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -260,6 +260,7 @@ static int radeon_pci_probe(struct pci_dev *pdev, { unsigned long flags =3D 0; struct drm_device *ddev; + struct radeon_device *rdev; int ret; =20 if (!ent) @@ -300,9 +301,14 @@ static int radeon_pci_probe(struct pci_dev *pdev, if (ret) return ret; =20 - ddev =3D drm_dev_alloc(&kms_driver, &pdev->dev); - if (IS_ERR(ddev)) - return PTR_ERR(ddev); + 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) diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/r= adeon_kms.c index a16590c6247f..645e33bf7947 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -104,15 +104,9 @@ void radeon_driver_unload_kms(struct drm_device *dev) int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) { struct pci_dev *pdev =3D to_pci_dev(dev->dev); - struct radeon_device *rdev; + struct radeon_device *rdev =3D dev->dev_private; 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 2.45.2