Re: [PATCH] drm/etnaviv: fix broken build

Fri, 14 Dec 2018 01:40:38 -0800 

Am 14.12.18 um 09:41 schrieb Daniel Vetter:

On Fri, Dec 14, 2018 at 08:41:34AM +0100, Christian König wrote:

Fix a broken build because of a typo in
"drm/scheduler: Add drm_sched_suspend/resume_timeout()".

Signed-off-by: Christian König <[email protected]>

Maybe core and cross-driver changes should go in through drm-misc or
similar, where we do a lot more compile testing across all drivers. At
least if you touch other drivers.


This was actually reported by kbuild on amd-staging-drm-next as well.
The problem was rather that I didn't reacted because I thought that this was a rebase/merge conflict and not a real problem. 



Anyway Dave fixed this up already in his merge request, see

commit e7df065a697783ecb5c6eaa5692d78dcfceb71dd
Merge: e69aa5f9b97f 674e78acae0d
Author: Dave Airlie <[email protected]>
Date:   Thu Dec 13 09:49:04 2018 +1000

     Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux 
into drm-next
[airlied: make etnaviv build again] 

Ok, thanks. Good to know and sorry for the noise.

Christian.



Cheeers, Daniel


---
  drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c 
b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
index fd6bad2100cf..a07c828c6a9a 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
@@ -135,13 +135,13 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
                    mmu_size + gpu->buffer.size;
/* Add in the active command buffers */ 
-       spin_lock_irqsave(&sched->job_list_lock, flags);
+       spin_lock_irqsave(&gpu->sched->job_list_lock, flags);
        list_for_each_entry(s_job, &gpu->sched.ring_mirror_list, node) {
                submit = to_etnaviv_submit(s_job);
                file_size += submit->cmdbuf.size;
                n_obj++;
        }
-       spin_unlock_irqrestore(&sched->job_list_lock, flags);
+       spin_unlock_irqrestore(&gpu->sched->job_list_lock, flags);
/* Add in the active buffer objects */ 
        list_for_each_entry(vram, &gpu->mmu->mappings, mmu_node) {
@@ -183,14 +183,14 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
                              gpu->buffer.size,
                              etnaviv_cmdbuf_get_va(&gpu->buffer));
- spin_lock_irqsave(&sched->job_list_lock, flags); 
+       spin_lock_irqsave(&gpu->sched->job_list_lock, flags);
        list_for_each_entry(s_job, &gpu->sched.ring_mirror_list, node) {
                submit = to_etnaviv_submit(s_job);
                etnaviv_core_dump_mem(&iter, ETDUMP_BUF_CMD,
                                      submit->cmdbuf.vaddr, submit->cmdbuf.size,
                                      etnaviv_cmdbuf_get_va(&submit->cmdbuf));
        }
-       spin_unlock_irqrestore(&sched->job_list_lock, flags);
+       spin_unlock_irqrestore(&gpu->sched->job_list_lock, flags);
/* Reserve space for the bomap */ 
        if (n_bomap_pages) {
--
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel


_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to