From nobody Wed Dec 17 17:41:45 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