From: Oded Gabbay <oded.gabbay@amd.com>
To: David Airlie <airlied@linux.ie>,
Alex Deucher <alexander.deucher@amd.com>,
Jerome Glisse <j.glisse@gmail.com>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
"John Bridgman" <John.Bridgman@amd.com>,
"Andrew Lewycky" <Andrew.Lewycky@amd.com>,
"Joerg Roedel" <joro@8bytes.org>,
"Oded Gabbay" <oded.gabbay@amd.com>,
"Christian König" <christian.koenig@amd.com>
Subject: [PATCH v4 02/23] drm/radeon/cik: Don't touch int of pipes 1-7
Date: Wed, 24 Sep 2014 23:45:16 +0300 [thread overview]
Message-ID: <1411591537-31636-3-git-send-email-oded.gabbay@amd.com> (raw)
In-Reply-To: <1411591537-31636-1-git-send-email-oded.gabbay@amd.com>
amdkfd should set interrupts for pipes 1-7.
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
---
drivers/gpu/drm/radeon/cik.c | 71 +-------------------------------------------
1 file changed, 1 insertion(+), 70 deletions(-)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 1530e37..e789988 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -7291,8 +7291,7 @@ static int cik_irq_init(struct radeon_device *rdev)
int cik_irq_set(struct radeon_device *rdev)
{
u32 cp_int_cntl;
- u32 cp_m1p0, cp_m1p1, cp_m1p2, cp_m1p3;
- u32 cp_m2p0, cp_m2p1, cp_m2p2, cp_m2p3;
+ u32 cp_m1p0;
u32 crtc1 = 0, crtc2 = 0, crtc3 = 0, crtc4 = 0, crtc5 = 0, crtc6 = 0;
u32 hpd1, hpd2, hpd3, hpd4, hpd5, hpd6;
u32 grbm_int_cntl = 0;
@@ -7326,13 +7325,6 @@ int cik_irq_set(struct radeon_device *rdev)
dma_cntl1 = RREG32(SDMA0_CNTL + SDMA1_REGISTER_OFFSET) & ~TRAP_ENABLE;
cp_m1p0 = RREG32(CP_ME1_PIPE0_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
- cp_m1p1 = RREG32(CP_ME1_PIPE1_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
- cp_m1p2 = RREG32(CP_ME1_PIPE2_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
- cp_m1p3 = RREG32(CP_ME1_PIPE3_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
- cp_m2p0 = RREG32(CP_ME2_PIPE0_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
- cp_m2p1 = RREG32(CP_ME2_PIPE1_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
- cp_m2p2 = RREG32(CP_ME2_PIPE2_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
- cp_m2p3 = RREG32(CP_ME2_PIPE3_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
if (rdev->flags & RADEON_IS_IGP)
thermal_int = RREG32_SMC(CG_THERMAL_INT_CTRL) &
@@ -7354,33 +7346,6 @@ int cik_irq_set(struct radeon_device *rdev)
case 0:
cp_m1p0 |= TIME_STAMP_INT_ENABLE;
break;
- case 1:
- cp_m1p1 |= TIME_STAMP_INT_ENABLE;
- break;
- case 2:
- cp_m1p2 |= TIME_STAMP_INT_ENABLE;
- break;
- case 3:
- cp_m1p2 |= TIME_STAMP_INT_ENABLE;
- break;
- default:
- DRM_DEBUG("si_irq_set: sw int cp1 invalid pipe %d\n", ring->pipe);
- break;
- }
- } else if (ring->me == 2) {
- switch (ring->pipe) {
- case 0:
- cp_m2p0 |= TIME_STAMP_INT_ENABLE;
- break;
- case 1:
- cp_m2p1 |= TIME_STAMP_INT_ENABLE;
- break;
- case 2:
- cp_m2p2 |= TIME_STAMP_INT_ENABLE;
- break;
- case 3:
- cp_m2p2 |= TIME_STAMP_INT_ENABLE;
- break;
default:
DRM_DEBUG("si_irq_set: sw int cp1 invalid pipe %d\n", ring->pipe);
break;
@@ -7397,33 +7362,6 @@ int cik_irq_set(struct radeon_device *rdev)
case 0:
cp_m1p0 |= TIME_STAMP_INT_ENABLE;
break;
- case 1:
- cp_m1p1 |= TIME_STAMP_INT_ENABLE;
- break;
- case 2:
- cp_m1p2 |= TIME_STAMP_INT_ENABLE;
- break;
- case 3:
- cp_m1p2 |= TIME_STAMP_INT_ENABLE;
- break;
- default:
- DRM_DEBUG("si_irq_set: sw int cp2 invalid pipe %d\n", ring->pipe);
- break;
- }
- } else if (ring->me == 2) {
- switch (ring->pipe) {
- case 0:
- cp_m2p0 |= TIME_STAMP_INT_ENABLE;
- break;
- case 1:
- cp_m2p1 |= TIME_STAMP_INT_ENABLE;
- break;
- case 2:
- cp_m2p2 |= TIME_STAMP_INT_ENABLE;
- break;
- case 3:
- cp_m2p2 |= TIME_STAMP_INT_ENABLE;
- break;
default:
DRM_DEBUG("si_irq_set: sw int cp2 invalid pipe %d\n", ring->pipe);
break;
@@ -7512,13 +7450,6 @@ int cik_irq_set(struct radeon_device *rdev)
WREG32(SDMA0_CNTL + SDMA1_REGISTER_OFFSET, dma_cntl1);
WREG32(CP_ME1_PIPE0_INT_CNTL, cp_m1p0);
- WREG32(CP_ME1_PIPE1_INT_CNTL, cp_m1p1);
- WREG32(CP_ME1_PIPE2_INT_CNTL, cp_m1p2);
- WREG32(CP_ME1_PIPE3_INT_CNTL, cp_m1p3);
- WREG32(CP_ME2_PIPE0_INT_CNTL, cp_m2p0);
- WREG32(CP_ME2_PIPE1_INT_CNTL, cp_m2p1);
- WREG32(CP_ME2_PIPE2_INT_CNTL, cp_m2p2);
- WREG32(CP_ME2_PIPE3_INT_CNTL, cp_m2p3);
WREG32(GRBM_INT_CNTL, grbm_int_cntl);
--
1.9.1
next prev parent reply other threads:[~2014-09-24 21:02 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 20:45 [PATCH v4 00/23] AMDKFD Kernel Driver Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 01/23] drm/radeon: reduce number of free VMIDs and pipes in KV Oded Gabbay
2014-10-14 16:50 ` Alex Deucher
2014-09-24 20:45 ` Oded Gabbay [this message]
2014-10-14 16:51 ` [PATCH v4 02/23] drm/radeon/cik: Don't touch int of pipes 1-7 Alex Deucher
2014-09-24 20:45 ` [PATCH v4 03/23] drm/radeon: Report doorbell configuration to amdkfd Oded Gabbay
2014-10-14 16:52 ` Alex Deucher
2014-09-24 20:45 ` [PATCH v4 04/23] drm/radeon: adding synchronization for GRBM GFX Oded Gabbay
2014-10-14 16:53 ` Alex Deucher
2014-09-24 20:45 ` [PATCH v4 05/23] drm/radeon: Add radeon <--> amdkfd interface Oded Gabbay
2014-09-25 18:51 ` Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 06/23] Update MAINTAINERS and CREDITS files with amdkfd info Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 07/23] amdkfd: Add IOCTL set definitions of amdkfd Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 08/23] amdkfd: Add amdkfd skeleton driver Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 09/23] amdkfd: Add topology module to amdkfd Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 10/23] amdkfd: Add basic modules " Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 11/23] amdkfd: Add binding/unbinding calls to amd_iommu driver Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 12/23] amdkfd: Add queue module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 13/23] amdkfd: Add mqd_manager module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 14/23] amdkfd: Add kernel queue module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 15/23] amdkfd: Add module parameter of scheduling policy Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 16/23] amdkfd: Add packet manager module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 17/23] amdkfd: Add process queue " Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 18/23] amdkfd: Add device " Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 19/23] amdkfd: Add interrupt handling module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 20/23] amdkfd: Implement the create/destroy/update queue IOCTLs Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 21/23] amdkfd: Implement the Set Memory Policy IOCTL Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 22/23] amdkfd: Implement the Get Clock Counters IOCTL Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 23/23] amdkfd: Implement the Get Process Aperture IOCTL Oded Gabbay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411591537-31636-3-git-send-email-oded.gabbay@amd.com \
--to=oded.gabbay@amd.com \
--cc=Andrew.Lewycky@amd.com \
--cc=John.Bridgman@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=j.glisse@gmail.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome