drm/amdgpu/virtual_dce: drop pageflip_irq funcs
Subsystems (2)
PATCH 1/7 drm/amdgpu/virtual_dce: drop pageflip_irq funcs
Never used.
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 35 ++++++-------------------------- 1 file changed, 6 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +6 -29
@@ -209,10 +209,9 @@ static void dce_virtual_crtc_dpms(struct drm_crtc *crtc, int mode)switch (mode) {case DRM_MODE_DPMS_ON : amdgpu_crtc->enabled = true; -/* Make sure VBLANK and PFLIP interrupts are still enabled */ +/* Make sure VBLANK interrupts are still enabled */ type =amdgpu_crtc_idx_to_irq_type (adev, amdgpu_crtc->crtc_id);amdgpu_irq_update (adev, &adev->crtc_irq, type); -amdgpu_irq_update (adev, &adev->pageflip_irq, type);drm_vblank_on (dev, amdgpu_crtc->crtc_id);break ;case DRM_MODE_DPMS_STANDBY :
@@ -672,8 +671,8 @@ static enum hrtimer_restart dce_virtual_vblank_timer_handle(struct hrtimer *vbla }static void dce_virtual_set_crtc_vblank_interrupt_state (struct amdgpu_device *adev, -int crtc, -enum amdgpu_interrupt_state state) +int crtc, +enum amdgpu_interrupt_state state) {if (crtc >= adev->mode_info.num_crtc) {DRM_DEBUG ("invalid crtc %d\n" , crtc);
@@ -697,9 +696,9 @@ static void dce_virtual_set_crtc_vblank_interrupt_state(struct amdgpu_device *adstatic int dce_virtual_set_crtc_irq_state (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -unsigned type, -enum amdgpu_interrupt_state state) +struct amdgpu_irq_src *source, +unsigned type, +enum amdgpu_interrupt_state state) {switch (type) {case AMDGPU_CRTC_IRQ_VBLANK1 :
@@ -726,20 +725,6 @@ static int dce_virtual_crtc_irq(struct amdgpu_device *adev,return 0 ; } -static int dce_virtual_set_pageflip_irq_state (struct amdgpu_device *adev, -struct amdgpu_irq_src *src, -unsigned type, -enum amdgpu_interrupt_state state) -{ -if (type >= adev->mode_info.num_crtc) { -DRM_ERROR ("invalid pageflip crtc %d\n" , type); -return -EINVAL ; - } -DRM_DEBUG ("[FM]set pageflip irq type %d state %d\n" , type, state); - -return 0 ; -} -static int dce_virtual_pageflip_irq (struct amdgpu_device *adev,struct amdgpu_irq_src *source,struct amdgpu_iv_entry *entry)
@@ -793,17 +778,9 @@ static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { .process = dce_virtual_crtc_irq, }; -static const struct amdgpu_irq_src_funcs dce_virtual_pageflip_irq_funcs = { - .set = dce_virtual_set_pageflip_irq_state, - .process = dce_virtual_pageflip_irq, -}; -static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev) { adev->crtc_irq.num_types =AMDGPU_CRTC_IRQ_LAST ; adev->crtc_irq.funcs = &dce_virtual_crtc_irq_funcs; - - adev->pageflip_irq.num_types =AMDGPU_PAGEFLIP_IRQ_LAST ; - adev->pageflip_irq.funcs = &dce_virtual_pageflip_irq_funcs; }
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1475255328-21598-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/7 drm/amdgpu/virtual_dce: no need to an irq process callback
Virtual crtcs interrupts do not show up in the IV ring, so it will never be called.
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1 -16
@@ -710,21 +710,6 @@ static int dce_virtual_set_crtc_irq_state(struct amdgpu_device *adev,return 0 ; } -static int dce_virtual_crtc_irq (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -struct amdgpu_iv_entry *entry) -{ -unsigned crtc =0 ; -unsigned irq_type =AMDGPU_CRTC_IRQ_VBLANK1 ; - -if (amdgpu_irq_enabled (adev, source, irq_type)) { -drm_handle_vblank (adev->ddev, crtc); - } -dce_virtual_pageflip_irq (adev,NULL ,NULL ); -DRM_DEBUG ("IH: D%d vblank\n" , crtc +1 ); -return 0 ; -} -static int dce_virtual_pageflip_irq (struct amdgpu_device *adev,struct amdgpu_irq_src *source,struct amdgpu_iv_entry *entry)
@@ -775,7 +760,7 @@ static int dce_virtual_pageflip_irq(struct amdgpu_device *adev,static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { .set = dce_virtual_set_crtc_irq_state, - .process = dce_virtual_crtc_irq, + .process =NULL , };static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev)
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1475255328-21598-2-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 2/7] drm/amdgpu/virtual_dce: no need to an irq process callback
Quoted 57 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 2/7] drm/amdgpu/virtual_dce: no need to an irq process callbackVirtual crtcs interrupts do not show up in the IV ring, so it will never be called.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-15@@ -710,21 +710,6 @@ static int dce_virtual_set_crtc_irq_state(structamdgpu_device *adev, return 0; } -static int dce_virtual_crtc_irq (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -struct amdgpu_iv_entry *entry) -{ -unsigned crtc =0 ; -unsigned irq_type =AMDGPU_CRTC_IRQ_VBLANK1 ; - -if (amdgpu_irq_enabled (adev, source, irq_type)) { -drm_handle_vblank (adev->ddev, crtc); - } -dce_virtual_pageflip_irq (adev,NULL ,NULL ); -DRM_DEBUG ("IH: D%d vblank\n" , crtc +1 ); -return 0 ; -} - static int dce_virtual_pageflip_irq(struct amdgpu_device *adev, struct amdgpu_irq_src *source,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-1struct amdgpu_iv_entry *entry)@@ -775,7 +760,7 @@ static int dce_virtual_pageflip_irq(struct amdgpu_device *adev, static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { .set = dce_virtual_set_crtc_irq_state, - .process = dce_virtual_crtc_irq, + .process =NULL , };static void
dce_virtual_set_irq_funcs(struct amdgpu_device *adev)
--
2.5.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/7 drm/amdgpu/virtual_dce: clean up interrupt handling
In reply to a message not in the archiveWe handle the virtual interrupts from a timer so no need to try an look like we are handling IV ring events.
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 109 +++++++++++++++---------------- 1 file changed, 54 insertions(+), 55 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +54 -55
@@ -39,9 +39,6 @@static void dce_virtual_set_display_funcs (struct amdgpu_device *adev);static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev); -static int dce_virtual_pageflip_irq (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -struct amdgpu_iv_entry *entry);/** * dce_virtual_vblank_wait - vblank wait asic callback.
@@ -659,14 +656,64 @@ static void dce_virtual_set_display_funcs(struct amdgpu_device *adev) adev->mode_info.funcs = &dce_virtual_display_funcs; } +static int dce_virtual_pageflip (struct amdgpu_device *adev, +unsigned crtc_id) +{ +unsigned long flags; +struct amdgpu_crtc *amdgpu_crtc; +struct amdgpu_flip_work *works; + + amdgpu_crtc = adev->mode_info.crtcs[crtc_id]; + +if (crtc_id >= adev->mode_info.num_crtc) { +DRM_ERROR ("invalid pageflip crtc %d\n" , crtc_id); +return -EINVAL ; + } + +/* IRQ could occur when in initial stage */ +if (amdgpu_crtc ==NULL ) +return 0 ; + +spin_lock_irqsave (&adev->ddev->event_lock, flags); + works = amdgpu_crtc->pflip_works; +if (amdgpu_crtc->pflip_status !=AMDGPU_FLIP_SUBMITTED ) { +DRM_DEBUG_DRIVER ("amdgpu_crtc->pflip_status = %d != " +"AMDGPU_FLIP_SUBMITTED(%d)\n" , + amdgpu_crtc->pflip_status, +AMDGPU_FLIP_SUBMITTED ); +spin_unlock_irqrestore (&adev->ddev->event_lock, flags); +return 0 ; + } + +/* page flip completed. clean up */ + amdgpu_crtc->pflip_status =AMDGPU_FLIP_NONE ; + amdgpu_crtc->pflip_works =NULL ; + +/* wakeup usersapce */ +if (works->event) +drm_crtc_send_vblank_event (&amdgpu_crtc->base, works->event); + +spin_unlock_irqrestore (&adev->ddev->event_lock, flags); + +drm_crtc_vblank_put (&amdgpu_crtc->base); +schedule_work (&works->unpin_work); + +return 0 ; +} +static enum hrtimer_restart dce_virtual_vblank_timer_handle (struct hrtimer *vblank_timer) { - struct amdgpu_mode_info *mode_info = container_of(vblank_timer, struct amdgpu_mode_info ,vblank_timer); - struct amdgpu_device *adev = container_of(mode_info, struct amdgpu_device ,mode_info); +struct amdgpu_mode_info *mode_info = + container_of(vblank_timer, struct amdgpu_mode_info , vblank_timer); +struct amdgpu_device *adev = + container_of(mode_info, struct amdgpu_device , mode_info);unsigned crtc =0 ; +drm_handle_vblank (adev->ddev, crtc); -dce_virtual_pageflip_irq (adev,NULL ,NULL ); -hrtimer_start (vblank_timer,ktime_set (0 ,DCE_VIRTUAL_VBLANK_PERIOD ),HRTIMER_MODE_REL ); +dce_virtual_pageflip (adev, crtc); +hrtimer_start (vblank_timer,ktime_set (0 ,DCE_VIRTUAL_VBLANK_PERIOD ), +HRTIMER_MODE_REL ); +return HRTIMER_NORESTART ; }
@@ -710,54 +757,6 @@ static int dce_virtual_set_crtc_irq_state(struct amdgpu_device *adev,return 0 ; } -static int dce_virtual_pageflip_irq (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -struct amdgpu_iv_entry *entry) -{ -unsigned long flags; -unsigned crtc_id =0 ; -struct amdgpu_crtc *amdgpu_crtc; -struct amdgpu_flip_work *works; - - crtc_id =0 ; - amdgpu_crtc = adev->mode_info.crtcs[crtc_id]; - -if (crtc_id >= adev->mode_info.num_crtc) { -DRM_ERROR ("invalid pageflip crtc %d\n" , crtc_id); -return -EINVAL ; - } - -/* IRQ could occur when in initial stage */ -if (amdgpu_crtc ==NULL ) -return 0 ; - -spin_lock_irqsave (&adev->ddev->event_lock, flags); - works = amdgpu_crtc->pflip_works; -if (amdgpu_crtc->pflip_status !=AMDGPU_FLIP_SUBMITTED ) { -DRM_DEBUG_DRIVER ("amdgpu_crtc->pflip_status = %d != " -"AMDGPU_FLIP_SUBMITTED(%d)\n" , - amdgpu_crtc->pflip_status, -AMDGPU_FLIP_SUBMITTED ); -spin_unlock_irqrestore (&adev->ddev->event_lock, flags); -return 0 ; - } - -/* page flip completed. clean up */ - amdgpu_crtc->pflip_status =AMDGPU_FLIP_NONE ; - amdgpu_crtc->pflip_works =NULL ; - -/* wakeup usersapce */ -if (works->event) -drm_crtc_send_vblank_event (&amdgpu_crtc->base, works->event); - -spin_unlock_irqrestore (&adev->ddev->event_lock, flags); - -drm_crtc_vblank_put (&amdgpu_crtc->base); -schedule_work (&works->unpin_work); - -return 0 ; -} -static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { .set = dce_virtual_set_crtc_irq_state, .process =NULL ,
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1475255328-21598-3-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 3/7] drm/amdgpu/virtual_dce: clean up interrupt handling
Quoted 168 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 3/7] drm/amdgpu/virtual_dce: clean up interrupt handlingWe handle the virtual interrupts from a timer so no need to try an look like we are handling IV ring events.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 109 +++++++++++++++-------- -------- 1 file changed, 54 insertions(+), 55 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-0@@ -39,9 +39,6 @@static void dce_virtual_set_display_funcs (struct amdgpu_device *adev);static void
dce_virtual_set_irq_funcs(struct amdgpu_device *adev); -static int dce_virtual_pageflip_irq(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +50
-6-struct amdgpu_irq_src *source, - struct amdgpu_iv_entry *entry);/** * dce_virtual_vblank_wait - vblank wait asic callback. @@ -659,14 +656,64 @@ static void dce_virtual_set_display_funcs(struct amdgpu_device *adev) adev->mode_info.funcs = &dce_virtual_display_funcs; } +static int dce_virtual_pageflip (struct amdgpu_device *adev, +unsigned crtc_id) +{ +unsigned long flags; +struct amdgpu_crtc *amdgpu_crtc; +struct amdgpu_flip_work *works; + + amdgpu_crtc = adev->mode_info.crtcs[crtc_id]; + +if (crtc_id >= adev->mode_info.num_crtc) { +DRM_ERROR ("invalid pageflip crtc %d\n" , crtc_id); +return -EINVAL ; + } + +/* IRQ could occur when in initial stage */ +if (amdgpu_crtc ==NULL ) +return 0 ; + +spin_lock_irqsave (&adev->ddev->event_lock, flags); + works = amdgpu_crtc->pflip_works; +if (amdgpu_crtc->pflip_status !=AMDGPU_FLIP_SUBMITTED ) { +DRM_DEBUG_DRIVER ("amdgpu_crtc->pflip_status = %d != " +"AMDGPU_FLIP_SUBMITTED(%d)\n" , + amdgpu_crtc->pflip_status, +AMDGPU_FLIP_SUBMITTED ); +spin_unlock_irqrestore (&adev->ddev->event_lock, flags); +return 0 ; + } + +/* page flip completed. clean up */ + amdgpu_crtc->pflip_status =AMDGPU_FLIP_NONE ; + amdgpu_crtc->pflip_works =NULL ; + +/* wakeup usersapce */ +if (works->event) +drm_crtc_send_vblank_event (&amdgpu_crtc->base, works- >event); + +spin_unlock_irqrestore (&adev->ddev->event_lock, flags); + +drm_crtc_vblank_put (&amdgpu_crtc->base); +schedule_work (&works->unpin_work); + +return 0 ; +} +static enum hrtimer_restart dce_virtual_vblank_timer_handle (struct hrtimer *vblank_timer) { -struct amdgpu_mode_info *mode_info =container_of (vblank_timer, struct amdgpu_mode_info ,vblank_timer); - struct amdgpu_device *adev = container_of(mode_info, struct amdgpu_device ,mode_info); +struct amdgpu_mode_info *mode_info = + container_of(vblank_timer, struct amdgpu_mode_info , vblank_timer); +struct amdgpu_device *adev = + container_of(mode_info, struct amdgpu_device , mode_info);unsigned crtc =0 ; +drm_handle_vblank (adev->ddev, crtc); -dce_virtual_pageflip_irq (adev,NULL ,NULL ); - hrtimer_start(vblank_timer, ktime_set(0,
DCE_VIRTUAL_VBLANK_PERIOD),HRTIMER_MODE_REL);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-0+dce_virtual_pageflip (adev, crtc); + hrtimer_start(vblank_timer, ktime_set(0,
DCE_VIRTUAL_VBLANK_PERIOD),drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-48+ HRTIMER_MODE_REL); +return HRTIMER_NORESTART ; }@@ -710,54 +757,6 @@ static int dce_virtual_set_crtc_irq_state(structamdgpu_device *adev, return 0; } -static int dce_virtual_pageflip_irq (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -struct amdgpu_iv_entry *entry) -{ -unsigned long flags; -unsigned crtc_id =0 ; -struct amdgpu_crtc *amdgpu_crtc; -struct amdgpu_flip_work *works; - - crtc_id =0 ; - amdgpu_crtc = adev->mode_info.crtcs[crtc_id]; - -if (crtc_id >= adev->mode_info.num_crtc) { -DRM_ERROR ("invalid pageflip crtc %d\n" , crtc_id); -return -EINVAL ; - } - -/* IRQ could occur when in initial stage */ -if (amdgpu_crtc ==NULL ) -return 0 ; - -spin_lock_irqsave (&adev->ddev->event_lock, flags); - works = amdgpu_crtc->pflip_works; -if (amdgpu_crtc->pflip_status !=AMDGPU_FLIP_SUBMITTED ) { -DRM_DEBUG_DRIVER ("amdgpu_crtc->pflip_status = %d != " -"AMDGPU_FLIP_SUBMITTED(%d)\n" , - amdgpu_crtc->pflip_status, -AMDGPU_FLIP_SUBMITTED ); -spin_unlock_irqrestore (&adev->ddev->event_lock, flags); -return 0 ; - } - -/* page flip completed. clean up */ - amdgpu_crtc->pflip_status =AMDGPU_FLIP_NONE ; - amdgpu_crtc->pflip_works =NULL ; - -/* wakeup usersapce */ -if (works->event) -drm_crtc_send_vblank_event (&amdgpu_crtc->base, works- >event); - -spin_unlock_irqrestore (&adev->ddev->event_lock, flags); - -drm_crtc_vblank_put (&amdgpu_crtc->base); -schedule_work (&works->unpin_work); - -return 0 ; -} -static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = {drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1.set = dce_virtual_set_crtc_irq_state, .process = NULL, --2.5.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 3/7] drm/amdgpu/virtual_dce: clean up interrupt handling
In reply to a message not in the archiveQuoted 168 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 3/7] drm/amdgpu/virtual_dce: clean up interrupt handlingWe handle the virtual interrupts from a timer so no need to try an look like we are handling IV ring events.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 109 +++++++++++++++-------- -------- 1 file changed, 54 insertions(+), 55 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-0@@ -39,9 +39,6 @@static void dce_virtual_set_display_funcs (struct amdgpu_device *adev);static void
dce_virtual_set_irq_funcs(struct amdgpu_device *adev); -static int dce_virtual_pageflip_irq(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +50
-6-struct amdgpu_irq_src *source, - struct amdgpu_iv_entry *entry);/** * dce_virtual_vblank_wait - vblank wait asic callback. @@ -659,14 +656,64 @@ static void dce_virtual_set_display_funcs(struct amdgpu_device *adev) adev->mode_info.funcs = &dce_virtual_display_funcs; } +static int dce_virtual_pageflip (struct amdgpu_device *adev, +unsigned crtc_id) +{ +unsigned long flags; +struct amdgpu_crtc *amdgpu_crtc; +struct amdgpu_flip_work *works; + + amdgpu_crtc = adev->mode_info.crtcs[crtc_id]; + +if (crtc_id >= adev->mode_info.num_crtc) { +DRM_ERROR ("invalid pageflip crtc %d\n" , crtc_id); +return -EINVAL ; + } + +/* IRQ could occur when in initial stage */ +if (amdgpu_crtc ==NULL ) +return 0 ; + +spin_lock_irqsave (&adev->ddev->event_lock, flags); + works = amdgpu_crtc->pflip_works; +if (amdgpu_crtc->pflip_status !=AMDGPU_FLIP_SUBMITTED ) { +DRM_DEBUG_DRIVER ("amdgpu_crtc->pflip_status = %d != " +"AMDGPU_FLIP_SUBMITTED(%d)\n" , + amdgpu_crtc->pflip_status, +AMDGPU_FLIP_SUBMITTED ); +spin_unlock_irqrestore (&adev->ddev->event_lock, flags); +return 0 ; + } + +/* page flip completed. clean up */ + amdgpu_crtc->pflip_status =AMDGPU_FLIP_NONE ; + amdgpu_crtc->pflip_works =NULL ; + +/* wakeup usersapce */ +if (works->event) +drm_crtc_send_vblank_event (&amdgpu_crtc->base, works- >event); + +spin_unlock_irqrestore (&adev->ddev->event_lock, flags); + +drm_crtc_vblank_put (&amdgpu_crtc->base); +schedule_work (&works->unpin_work); + +return 0 ; +} +static enum hrtimer_restart dce_virtual_vblank_timer_handle (struct hrtimer *vblank_timer) { -struct amdgpu_mode_info *mode_info =container_of (vblank_timer, struct amdgpu_mode_info ,vblank_timer); - struct amdgpu_device *adev = container_of(mode_info, struct amdgpu_device ,mode_info); +struct amdgpu_mode_info *mode_info = + container_of(vblank_timer, struct amdgpu_mode_info , vblank_timer); +struct amdgpu_device *adev = + container_of(mode_info, struct amdgpu_device , mode_info);unsigned crtc =0 ; +drm_handle_vblank (adev->ddev, crtc); -dce_virtual_pageflip_irq (adev,NULL ,NULL ); - hrtimer_start(vblank_timer, ktime_set(0,
DCE_VIRTUAL_VBLANK_PERIOD),HRTIMER_MODE_REL);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-0+dce_virtual_pageflip (adev, crtc); + hrtimer_start(vblank_timer, ktime_set(0,
DCE_VIRTUAL_VBLANK_PERIOD),drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-48+ HRTIMER_MODE_REL); +return HRTIMER_NORESTART ; }@@ -710,54 +757,6 @@ static int dce_virtual_set_crtc_irq_state(structamdgpu_device *adev, return 0; } -static int dce_virtual_pageflip_irq (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -struct amdgpu_iv_entry *entry) -{ -unsigned long flags; -unsigned crtc_id =0 ; -struct amdgpu_crtc *amdgpu_crtc; -struct amdgpu_flip_work *works; - - crtc_id =0 ; - amdgpu_crtc = adev->mode_info.crtcs[crtc_id]; - -if (crtc_id >= adev->mode_info.num_crtc) { -DRM_ERROR ("invalid pageflip crtc %d\n" , crtc_id); -return -EINVAL ; - } - -/* IRQ could occur when in initial stage */ -if (amdgpu_crtc ==NULL ) -return 0 ; - -spin_lock_irqsave (&adev->ddev->event_lock, flags); - works = amdgpu_crtc->pflip_works; -if (amdgpu_crtc->pflip_status !=AMDGPU_FLIP_SUBMITTED ) { -DRM_DEBUG_DRIVER ("amdgpu_crtc->pflip_status = %d != " -"AMDGPU_FLIP_SUBMITTED(%d)\n" , - amdgpu_crtc->pflip_status, -AMDGPU_FLIP_SUBMITTED ); -spin_unlock_irqrestore (&adev->ddev->event_lock, flags); -return 0 ; - } - -/* page flip completed. clean up */ - amdgpu_crtc->pflip_status =AMDGPU_FLIP_NONE ; - amdgpu_crtc->pflip_works =NULL ; - -/* wakeup usersapce */ -if (works->event) -drm_crtc_send_vblank_event (&amdgpu_crtc->base, works- >event); - -spin_unlock_irqrestore (&adev->ddev->event_lock, flags); - -drm_crtc_vblank_put (&amdgpu_crtc->base); -schedule_work (&works->unpin_work); - -return 0 ; -} -static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = {drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1.set = dce_virtual_set_crtc_irq_state, .process = NULL, --2.5.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/7 drm/amdgpu: simplify encoder and connector setup
In reply to a message not in the archiveNo need to emulate all of the stuff for real hw.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 93 ---------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 231 +++++++++++++++---------- 2 files changed, 144 insertions(+), 180 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0 -93
@@ -1504,88 +1504,6 @@ static const struct drm_connector_funcs amdgpu_connector_edp_funcs = { .force = amdgpu_connector_dvi_force, }; -static struct drm_encoder * -amdgpu_connector_virtual_encoder (struct drm_connector *connector) -{ -int enc_id = connector->encoder_ids[0 ]; -struct drm_encoder *encoder; -int i; -for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) { -if (connector->encoder_ids[i] ==0 ) -break ; - - encoder =drm_encoder_find (connector->dev, connector->encoder_ids[i]); -if (!encoder) -continue ; - -if (encoder->encoder_type ==DRM_MODE_ENCODER_VIRTUAL ) -return encoder; - } - -/* pick the first one */ -if (enc_id) -return drm_encoder_find (connector->dev, enc_id); -return NULL ; -} - -static int amdgpu_connector_virtual_get_modes (struct drm_connector *connector) -{ -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); - -if (encoder) { -amdgpu_connector_add_common_modes (encoder, connector); - } - -return 0 ; -} - -static int amdgpu_connector_virtual_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) -{ -return MODE_OK ; -} - -static int -amdgpu_connector_virtual_dpms (struct drm_connector *connector,int mode) -{ -return 0 ; -} - -static enum drm_connector_status - -amdgpu_connector_virtual_detect (struct drm_connector *connector,bool force) -{ -return connector_status_connected; -} - -static int -amdgpu_connector_virtual_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t val) -{ -return 0 ; -} - -static void amdgpu_connector_virtual_force (struct drm_connector *connector) -{ -return ; -} - -static const struct drm_connector_helper_funcs amdgpu_connector_virtual_helper_funcs = { - .get_modes = amdgpu_connector_virtual_get_modes, - .mode_valid = amdgpu_connector_virtual_mode_valid, - .best_encoder = amdgpu_connector_virtual_encoder, -}; - -static const struct drm_connector_funcs amdgpu_connector_virtual_funcs = { - .dpms = amdgpu_connector_virtual_dpms, - .detect = amdgpu_connector_virtual_detect, - .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = amdgpu_connector_virtual_set_property, - .destroy = amdgpu_connector_destroy, - .force = amdgpu_connector_virtual_force, -}; - void amdgpu_connector_add(struct amdgpu_device *adev, uint32_t connector_id,
@@ -1970,17 +1888,6 @@ amdgpu_connector_add(struct amdgpu_device *adev, connector->interlace_allowed = false; connector->doublescan_allowed = false;break ; -case DRM_MODE_CONNECTOR_VIRTUAL : - amdgpu_dig_connector =kzalloc (sizeof (struct amdgpu_connector_atom_dig ),GFP_KERNEL ); -if (!amdgpu_dig_connector) - goto failed; - amdgpu_connector->con_priv = amdgpu_dig_connector; -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_virtual_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_virtual_helper_funcs); - subpixel_order = SubPixelHorizontalRGB; - connector->interlace_allowed = false; - connector->doublescan_allowed = false; -break ; } }
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +144 -87
299 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1475255328-21598-4-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 4/7] drm/amdgpu: simplify encoder and connector setup
Quoted 473 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 4/7] drm/amdgpu: simplify encoder and connector setupNo need to emulate all of the stuff for real hw.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 93 ---------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 231 +++++++++++++++---- ------ 2 files changed, 144 insertions(+), 180 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-24@@ -1504,88 +1504,6 @@ static const struct drm_connector_funcs amdgpu_connector_edp_funcs = { .force = amdgpu_connector_dvi_force, }; -static struct drm_encoder * -amdgpu_connector_virtual_encoder(struct drm_connector *connector) -{ -int enc_id = connector->encoder_ids[0 ]; -struct drm_encoder *encoder; -int i; -for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) { -if (connector->encoder_ids[i] ==0 ) -break ; - - encoder =drm_encoder_find (connector->dev, connector- >encoder_ids[i]); -if (!encoder) -continue ; - -if (encoder->encoder_type == DRM_MODE_ENCODER_VIRTUAL) -return encoder; - } - -/* pick the first one */ -if (enc_id) -return drm_encoder_find (connector->dev, enc_id); -return NULL ; -} - -static int amdgpu_connector_virtual_get_modes(struct drm_connector*connector) -{
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-1- struct drm_encoder *encoder =
amdgpu_connector_best_single_encoder(connector);drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-3- -if (encoder) { - amdgpu_connector_add_common_modes(encoder,connector);
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-6- } - -return 0 ; -} - -static int amdgpu_connector_virtual_mode_valid(struct drm_connector*connector,
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-7- struct drm_display_mode *mode) -{ -return MODE_OK ; -} - -static int -amdgpu_connector_virtual_dpms(struct drm_connector *connector, intmode) -{
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-6-return 0 ; -} - -static enum drm_connector_status - -amdgpu_connector_virtual_detect(struct drm_connector *connector, boolforce) -{
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-12-return connector_status_connected; -} - -static int -amdgpu_connector_virtual_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t val) -{ -return 0 ; -} - -static void amdgpu_connector_virtual_force(struct drm_connector*connector) -{
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-4-return ; -} - -static const struct drm_connector_helper_funcs
amdgpu_connector_virtual_helper_funcs= {drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-6- .get_modes = amdgpu_connector_virtual_get_modes, - .mode_valid = amdgpu_connector_virtual_mode_valid, - .best_encoder = amdgpu_connector_virtual_encoder, -}; - -static const struct drm_connector_funcs amdgpu_connector_virtual_funcs= {
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-14- .dpms = amdgpu_connector_virtual_dpms, - .detect = amdgpu_connector_virtual_detect, - .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = amdgpu_connector_virtual_set_property, - .destroy = amdgpu_connector_destroy, - .force = amdgpu_connector_virtual_force, -}; - void amdgpu_connector_add(struct amdgpu_device *adev, uint32_t connector_id,@@ -1970,17 +1888,6 @@ amdgpu_connector_add(struct amdgpu_device *adev, connector->interlace_allowed = false; connector->doublescan_allowed = false;break ; -case DRM_MODE_CONNECTOR_VIRTUAL : - amdgpu_dig_connector =kzalloc (sizeof (struct amdgpu_connector_atom_dig), GFP_KERNEL); -if (!amdgpu_dig_connector) - goto failed; - amdgpu_connector->con_priv = amdgpu_dig_connector; - drm_connector_init(dev, &amdgpu_connector->base,
&amdgpu_connector_virtual_funcs,connector_type);drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-1- drm_connector_helper_add(&amdgpu_connector-Quoted 1 line
base,
&amdgpu_connector_virtual_helper_funcs);drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +0
-4- subpixel_order = SubPixelHorizontalRGB; - connector->interlace_allowed = false; - connector->doublescan_allowed = false; -break ; } }drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-5@@ -39,6 +39,8 @@static void dce_virtual_set_display_funcs (struct amdgpu_device *adev);static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev); +static int dce_virtual_connector_encoder_init (struct amdgpu_device *adev, +int index);/** * dce_virtual_vblank_wait - vblank wait asic callback. @@ -274,24 +276,6 @@ static bool dce_virtual_crtc_mode_fixup(structdrm_crtc *crtc, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); -struct drm_device *dev = crtc->dev; -struct drm_encoder *encoder; - -/* assign the encoder to the amdgpu crtc to avoid repeated lookups later */
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1- list_for_each_entry(encoder, &dev->mode_config.encoder_list,head) {
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-3-if (encoder->crtc == crtc) { - amdgpu_crtc->encoder = encoder; - amdgpu_crtc->connector =
amdgpu_get_connector_for_encoder(encoder);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-4-break ; - } - } - if ((amdgpu_crtc->encoder == NULL) || (amdgpu_crtc->connector ==NULL)) {
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +87
-29- amdgpu_crtc->encoder =NULL ; - amdgpu_crtc->connector =NULL ; -return false; - } -return true; }@@ -370,38 +354,120 @@ static int dce_virtual_early_init(void *handle)return 0 ; } -static bool dce_virtual_get_connector_info (struct amdgpu_device *adev) +static struct drm_encoder * +dce_virtual_encoder (struct drm_connector *connector) { -struct amdgpu_i2c_bus_rec ddc_bus; -struct amdgpu_router router; -struct amdgpu_hpd hpd; +int enc_id = connector->encoder_ids[0 ]; +struct drm_encoder *encoder; +int i; + +for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) { +if (connector->encoder_ids[i] ==0 ) +break ; + + encoder =drm_encoder_find (connector->dev, connector- >encoder_ids[i]); +if (!encoder) +continue ; -/* look up gpio for ddc, hpd */ - ddc_bus.valid = false; - hpd.hpd =AMDGPU_HPD_NONE ; -/* needed for aux chan transactions */ - ddc_bus.hpd = hpd.hpd; +if (encoder->encoder_type ==DRM_MODE_ENCODER_VIRTUAL ) +return encoder; + } - memset(&router, 0, sizeof(router)); - router.ddc_valid = false; - router.cd_valid = false; -amdgpu_display_add_connector (adev, -0 , -ATOM_DEVICE_CRT1_SUPPORT , -DRM_MODE_CONNECTOR_VIRTUAL , &ddc_bus, -CONNECTOR_OBJECT_ID_VIRTUAL , - &hpd, - &router); +/* pick the first one */ + if (enc_id) +return drm_encoder_find (connector->dev, enc_id); +return NULL ; +} + +static int dce_virtual_get_modes (struct drm_connector *connector) { +struct drm_device *dev = connector->dev; +struct drm_display_mode *mode =NULL ; +unsigned i; +static const struct mode_size { +int w; +int h; + } common_modes[17 ] = { + {640 ,480 }, + {720 ,480 }, + {800 ,600 }, + {848 ,480 }, + {1024 ,768 }, + {1152 ,768 }, + {1280 ,720 }, + {1280 ,800 }, + {1280 ,854 }, + {1280 ,960 }, + {1280 ,1024 }, + {1440 ,900 }, + {1400 ,1050 }, + {1680 ,1050 }, + {1600 ,1200 }, + {1920 ,1080 }, + {1920 ,1200 } + }; + +for (i =0 ; i <17 ; i++) { + mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h,60 , false, false, false); +drm_mode_probed_add (connector, mode); + } -amdgpu_display_add_encoder (adev,ENCODER_VIRTUAL_ENUM_VIRTUAL , -ATOM_DEVICE_CRT1_SUPPORT , -0 ); + return 0; +} -amdgpu_link_encoder_connector (adev->ddev); +static int dce_virtual_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) +{ +return MODE_OK ; +} -return true; +static int +dce_virtual_dpms (struct drm_connector *connector,int mode) { +return 0 ; } +static enum drm_connector_status +dce_virtual_detect (struct drm_connector *connector,bool force) { +return connector_status_connected; +} + +static int +dce_virtual_set_property (struct drm_connector *connector, +struct drm_property *property, +uint64_t val) +{ +return 0 ; +} + +static void dce_virtual_destroy (struct drm_connector *connector) { +drm_connector_unregister (connector); +drm_connector_cleanup (connector); +kfree (connector); +} + +static void dce_virtual_force (struct drm_connector *connector) { +return ; +} + +static const struct drm_connector_helper_funcs
dce_virtual_connector_helper_funcs= {drivers/gpu/drm/amd/amdgpu/dce_virtual.c +18
-4+ .get_modes = dce_virtual_get_modes, + .mode_valid = dce_virtual_mode_valid, + .best_encoder = dce_virtual_encoder, +}; + +static const struct drm_connector_funcs dce_virtual_connector_funcs = { + .dpms = dce_virtual_dpms, + .detect = dce_virtual_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .set_property = dce_virtual_set_property, + .destroy = dce_virtual_destroy, + .force = dce_virtual_force, +}; +static int dce_virtual_sw_init (void *handle) {int r, i;@@ -430,16 +496,16 @@ static int dce_virtual_sw_init(void *handle) adev->ddev->mode_config.max_width =16384 ; adev->ddev->mode_config.max_height =16384 ; -/* allocate crtcs */ +/* allocate crtcs, encoders, connectors */ for (i =0 ; i < adev->mode_info.num_crtc; i++) { r =dce_virtual_crtc_init (adev, i);if (r)return r; + r =dce_virtual_connector_encoder_init (adev, i); +if (r) +return r; } -dce_virtual_get_connector_info (adev); -amdgpu_print_display_setup (adev->ddev); -drm_kms_helper_poll_init (adev->ddev); adev->mode_info.mode_config_initialized = true; @@ -540,8 +606,8@@ static void
dce_virtual_encoder_commit(struct drm_encoder *encoder)static void
dce_virtual_encoder_mode_set(structdrm_encoder*encoder,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +17
-37- struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) {return ; }@@ -561,10 +627,6 @@ static bool dce_virtual_encoder_mode_fixup(structdrm_encoder *encoder, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - -/* set the active encoder to connector routing */ -amdgpu_encoder_set_active_device (encoder ); - return true; }@@ -590,45 +652,40 @@ static const struct drm_encoder_funcs dce_virtual_encoder_funcs = { .destroy = dce_virtual_encoder_destroy, }; -static void dce_virtual_encoder_add (struct amdgpu_device *adev, -uint32_t encoder_enum, -uint32_t supported_device, -u16 caps) +static int dce_virtual_connector_encoder_init (struct amdgpu_device *adev, +int index) { -struct drm_device *dev = adev->ddev;struct drm_encoder *encoder; -struct amdgpu_encoder *amdgpu_encoder; - -/* see if we already added it */ -list_for_each_entry (encoder, &dev->mode_config.encoder_list, head) { - amdgpu_encoder =to_amdgpu_encoder (encoder); -if (amdgpu_encoder->encoder_enum == encoder_enum) { - amdgpu_encoder->devices |= supported_device; -return ; - } +struct drm_connector *connector; +/* add a new encoder */ + encoder =kzalloc (sizeof (struct drm_encoder ),GFP_KERNEL ); +if (!encoder) { +kfree (connector); +return -ENOMEM ; } + encoder->possible_crtcs =1 << index; +drm_encoder_init (adev->ddev, encoder, &dce_virtual_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL ); +drm_encoder_helper_add (encoder, &dce_virtual_encoder_helper_funcs); -/* add a new one */ - amdgpu_encoder =kzalloc (sizeof (struct amdgpu_encoder ), GFP_KERNEL); -if (!amdgpu_encoder) -return ; + connector =kzalloc (sizeof (struct drm_connector ),GFP_KERNEL ); +if (!connector) +return -ENOMEM ; - encoder = &amdgpu_encoder->base; - encoder->possible_crtcs =0x1 ; - amdgpu_encoder->enc_priv =NULL ; - amdgpu_encoder->encoder_enum = encoder_enum; - amdgpu_encoder->encoder_id = (encoder_enum & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; - amdgpu_encoder->devices = supported_device; - amdgpu_encoder->rmx_type =RMX_OFF ; - amdgpu_encoder->underscan_type =UNDERSCAN_OFF ; - amdgpu_encoder->is_ext_encoder = false; - amdgpu_encoder->caps = caps; - - drm_encoder_init(dev, encoder, &dce_virtual_encoder_funcs, - DRM_MODE_ENCODER_VIRTUAL,NULL);
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1- drm_encoder_helper_add(encoder,
&dce_virtual_encoder_helper_funcs);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1- DRM_INFO("[FM]encoder: %d is VIRTUAL\n", amdgpu_encoder-Quoted 1 line
encoder_id);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-0+/* add a new connector */ + drm_connector_init(adev->ddev, connector,
&dce_virtual_connector_funcs,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-0+ DRM_MODE_CONNECTOR_VIRTUAL); + drm_connector_helper_add(connector,
&dce_virtual_connector_helper_funcs);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +9
-1+ connector->display_info.subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = false; + connector->doublescan_allowed = false; +drm_connector_register (connector); + +/* link them */ +drm_mode_connector_attach_encoder (connector, encoder); + +return 0 ; } static const struct amdgpu_display_funcs dce_virtual_display_funcs = { @@ -644,8 +701,8 @@ static const struct amdgpu_display_funcs
dce_virtual_display_funcs= {drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-3.hpd_get_gpio_reg = &dce_virtual_hpd_get_gpio_reg, .page_flip = &dce_virtual_page_flip, .page_flip_get_scanoutpos = &dce_virtual_crtc_get_scanoutpos, - .add_encoder = &dce_virtual_encoder_add, - .add_connector = &amdgpu_connector_add, + .add_encoder = NULL, + .add_connector = NULL, .stop_mc_access = &dce_virtual_stop_mc_access, .resume_mc_access = &dce_virtual_resume_mc_access, }; --2.5.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/7 Revert "drm/amdgpu: Add virtual connector and encoder macros."
In reply to a message not in the archiveThis reverts commit 16925c92dbd97524655525b6816625e1f0063d12.
This is no longer necessary.
--- drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/ObjectID.h +0 -7
@@ -90,7 +90,6 @@#define ENCODER_OBJECT_ID_INTERNAL_VCE 0x24#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 0x25#define ENCODER_OBJECT_ID_INTERNAL_AMCLK 0x27 -#define ENCODER_OBJECT_ID_VIRTUAL 0x28#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF
@@ -120,7 +119,6 @@#define CONNECTOR_OBJECT_ID_eDP 0x14#define CONNECTOR_OBJECT_ID_MXM 0x15#define CONNECTOR_OBJECT_ID_LVDS_eDP 0x16 -#define CONNECTOR_OBJECT_ID_VIRTUAL 0x17/* deleted */
@@ -149,7 +147,6 @@#define GRAPH_OBJECT_ENUM_ID5 0x05#define GRAPH_OBJECT_ENUM_ID6 0x06#define GRAPH_OBJECT_ENUM_ID7 0x07 -#define GRAPH_OBJECT_ENUM_VIRTUAL 0x08/****************************************************/ /* Graphics Object ID Bit definition */
@@ -411,10 +408,6 @@GRAPH_OBJECT_ENUM_ID1 <<ENUM_ID_SHIFT |\ ENCODER_OBJECT_ID_HDMI_ANX9805 << OBJECT_ID_SHIFT) -#define ENCODER_VIRTUAL_ENUM_VIRTUAL ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ - GRAPH_OBJECT_ENUM_VIRTUAL << ENUM_ID_SHIFT |\ - ENCODER_OBJECT_ID_VIRTUAL << OBJECT_ID_SHIFT) -/****************************************************/ /* Connector Object ID definition - Shared with BIOS */ /****************************************************/
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1475255328-21598-5-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 5/7] Revert "drm/amdgpu: Add virtual connector and encoder macros."
Quoted 64 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 5/7] Revert "drm/amdgpu: Add virtual connector and encoder macros."This reverts commit
16925c92dbd97524655525b6816625e1f0063d12.This is no longer necessary.
--- drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 ------- 1 file changed, 7 deletions(-)drivers/gpu/drm/amd/amdgpu/ObjectID.h +0
-5@@ -90,7 +90,6 @@#define ENCODER_OBJECT_ID_INTERNAL_VCE 0x24#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 0x25#define ENCODER_OBJECT_ID_INTERNAL_AMCLK 0x27 -#define ENCODER_OBJECT_ID_VIRTUAL 0x28#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF@@ -120,7 +119,6 @@#define CONNECTOR_OBJECT_ID_eDP 0x14#define CONNECTOR_OBJECT_ID_MXM 0x15#define CONNECTOR_OBJECT_ID_LVDS_eDP 0x16 -#define CONNECTOR_OBJECT_ID_VIRTUAL 0x17/* deleted */ @@ -149,7 +147,6 @@#define GRAPH_OBJECT_ENUM_ID5 0x05#define GRAPH_OBJECT_ENUM_ID6 0x06#define GRAPH_OBJECT_ENUM_ID7 0x07 -#define GRAPH_OBJECT_ENUM_VIRTUAL 0x08/****************************************************/ /* Graphics Object ID Bit definition */ @@ -411,10 +408,6 @@GRAPH_OBJECT_ENUM_ID1 <<ENUM_ID_SHIFT |\ENCODER_OBJECT_ID_HDMI_ANX9805 << OBJECT_ID_SHIFT) -#define ENCODER_VIRTUAL_ENUM_VIRTUAL ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ - GRAPH_OBJECT_ENUM_VIRTUAL <<
ENUM_ID_SHIFT|\
-ENCODER_OBJECT_ID_VIRTUAL<<OBJECT_ID_SHIFT)
-
/****************************************************/ /* Connector Object ID definition - Shared with BIOS */
/****************************************************/ --
2.5.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/7 drm/amdgpu: rename amdgpu_whether_enable_virtual_display
In reply to a message not in the archiveto match the other functions in that file.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -2
@@ -1231,7 +1231,7 @@ int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev,return 1 ; } -static void amdgpu_whether_enable_virtual_display (struct amdgpu_device *adev) +static void amdgpu_device_enable_virtual_display (struct amdgpu_device *adev) { adev->enable_virtual_display = false;
@@ -1261,7 +1261,7 @@ static int amdgpu_early_init(struct amdgpu_device *adev) {int i, r; -amdgpu_whether_enable_virtual_display (adev); +amdgpu_device_enable_virtual_display (adev);switch (adev->asic_type) {case CHIP_TOPAZ :
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1475255328-21598-6-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 6/7] drm/amdgpu: rename amdgpu_whether_enable_virtual_display
Quoted 45 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 6/7] drm/amdgpu: renameamdgpu_whether_enable_virtual_displayto match the other functions in that file.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-3@@ -1231,7 +1231,7 @@ int amdgpu_ip_block_version_cmp(structamdgpu_device *adev, return 1; } -static void amdgpu_whether_enable_virtual_display (struct amdgpu_device *adev) +static void amdgpu_device_enable_virtual_display (struct amdgpu_device +*adev) { adev->enable_virtual_display = false;@@ -1261,7 +1261,7 @@ static int amdgpu_early_init(struct amdgpu_device *adev) {int i, r; -amdgpu_whether_enable_virtual_display (adev); +amdgpu_device_enable_virtual_display (adev);switch (adev->asic_type) {case CHIP_TOPAZ : --2.5.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/7 drm/amd/amdgpu: For virtual display, enable multi crtcs. (v3)
In reply to a message not in the archiveFrom: Emily Deng <[email protected]>
Enable multi crtcs for virtual display, user can set the number of crtcs by amdgpu module parameter virtual_display.
v2: make timers per crtc
v3: agd: simplify implementation
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 ++-- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 48 +++++++++++++++--------------- 4 files changed, 52 insertions(+), 32 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +23 -5
@@ -1238,20 +1238,38 @@ static void amdgpu_device_enable_virtual_display(struct amdgpu_device *adev)if (amdgpu_virtual_display) {struct drm_device *ddev = adev->ddev;const char *pci_address_name =pci_name (ddev->pdev); -char *pciaddstr, *pciaddstr_tmp, *pciaddname; +char *pciaddstr, *pciaddstr_tmp, *pciaddname_tmp, *pciaddname; pciaddstr =kstrdup (amdgpu_virtual_display,GFP_KERNEL ); pciaddstr_tmp = pciaddstr; -while ((pciaddname =strsep (&pciaddstr_tmp,";" ))) { +while ((pciaddname_tmp =strsep (&pciaddstr_tmp,";" ))) { + pciaddname =strsep (&pciaddname_tmp,"," );if (!strcmp (pci_address_name, pciaddname)) { +long num_crtc; +int res =-1 ; + adev->enable_virtual_display = true; + +if (pciaddname_tmp) + res =kstrtol (pciaddname_tmp,10 , + &num_crtc); + +if (!res) { +if (num_crtc <1 ) + num_crtc =1 ; +if (num_crtc >6 ) + num_crtc =6 ; + adev->mode_info.num_crtc = num_crtc; + }else { + adev->mode_info.num_crtc =1 ; + }break ; } } -DRM_INFO ("virtual display string:%s, %s:virtual_display:%d\n" , - amdgpu_virtual_display, pci_address_name, - adev->enable_virtual_display); +DRM_INFO ("virtual display string:%s, %s:virtual_display:%d, num_crtc:%d\n" , + amdgpu_virtual_display, pci_address_name, + adev->enable_virtual_display, adev->mode_info.num_crtc);kfree (pciaddstr); }
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -201,7 +201,8 @@ module_param_named(pg_mask, amdgpu_pg_mask, uint, 0444);MODULE_PARM_DESC (disable_cu,"Disable CUs (se.sh.cu,...)" );module_param_named (disable_cu, amdgpu_disable_cu, charp,0444 ); -MODULE_PARM_DESC (virtual_display,"Enable virtual display feature (the virtual_display will be set like xxxx:xx:xx.x;xxxx:xx:xx.x)" ); +MODULE_PARM_DESC (virtual_display, +"Enable virtual display feature (the virtual_display will be set like xxxx:xx:xx.x,x;xxxx:xx:xx.x,x)" );module_param_named (virtual_display, amdgpu_virtual_display, charp,0444 );static const struct pci_device_id pciidlist[] = {
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +3 -2
@@ -341,8 +341,6 @@ struct amdgpu_mode_info {int num_dig;/* number of dig blocks */ int disp_priority;const struct amdgpu_display_funcs *funcs; -struct hrtimer vblank_timer; -enum amdgpu_interrupt_state vsync_timer_enabled; };#define AMDGPU_MAX_BL_LEVEL 0xFF
@@ -413,6 +411,9 @@ struct amdgpu_crtc {u32 wm_high;u32 lb_vblank_lead_lines;struct drm_display_mode hw_mode; +/* for virtual dce */ +struct hrtimer vblank_timer; +enum amdgpu_interrupt_state vsync_timer_enabled; };struct amdgpu_encoder_atom_dig {
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +24 -24
86 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1475255328-21598-7-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 7/7] drm/amd/amdgpu: For virtual display, enable multi crtcs. (v3)
Quoted 240 lines
-----Original Message-----
From: Alex Deucher [mailto:[email protected]]
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deng, Emily <[email protected]>; Deucher, Alexander <[email protected]>
Subject: [PATCH 7/7] drm/amd/amdgpu: For virtual display, enable multi crtcs. (v3)From: Emily Deng <[email protected]>
Enable multi crtcs for virtual display, user can set the number of crtcs by amdgpu module parameter
virtual_display.v2: make timers per crtc
v3: agd: simplify implementationSigned-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 ++-- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 48 +++++++++++++++-------- ------- 4 files changed, 52 insertions(+), 32 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +21
-5@@ -1238,20 +1238,38 @@ static void amdgpu_device_enable_virtual_display(struct amdgpu_device *adev) if (amdgpu_virtual_display) {struct drm_device *ddev = adev->ddev;const char *pci_address_name =pci_name (ddev->pdev); -char *pciaddstr, *pciaddstr_tmp, *pciaddname; +char *pciaddstr, *pciaddstr_tmp, *pciaddname_tmp, *pciaddname; pciaddstr =kstrdup (amdgpu_virtual_display,GFP_KERNEL ); pciaddstr_tmp = pciaddstr; -while ((pciaddname =strsep (&pciaddstr_tmp,";" ))) { +while ((pciaddname_tmp =strsep (&pciaddstr_tmp,";" ))) { + pciaddname =strsep (&pciaddname_tmp,"," );if (!strcmp (pci_address_name, pciaddname)) { +long num_crtc; +int res =-1 ; + adev->enable_virtual_display = true; + +if (pciaddname_tmp) + res =kstrtol (pciaddname_tmp,10 , + &num_crtc); + +if (!res) { +if (num_crtc <1 ) + num_crtc =1 ; +if (num_crtc >6 ) + num_crtc =6 ; + adev->mode_info.num_crtc = num_crtc; + }else { + adev->mode_info.num_crtc =1 ; + }break ; } } -DRM_INFO ("virtual display string:%s, %s:virtual_display:%d\n", - amdgpu_virtual_display, pci_address_name, - adev->enable_virtual_display); + DRM_INFO("virtual display string:%s, %s:virtual_display:%d,num_crtc:%d\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+ amdgpu_virtual_display, pci_address_name, + adev->enable_virtual_display, adev-Quoted 1 line
mode_info.num_crtc);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0kfree (pciaddstr); }drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +3
-1@@ -201,7 +201,8 @@ module_param_named(pg_mask, amdgpu_pg_mask, uint, 0444); MODULE_PARM_DESC(disable_cu, "Disable CUs (se.sh.cu,...)");module_param_named (disable_cu, amdgpu_disable_cu, charp,0444 ); -MODULE_PARM_DESC(virtual_display, "Enable virtual display feature (the virtual_display will be set like xxxx:xx:xx.x;xxxx:xx:xx.x)"); +MODULE_PARM_DESC (virtual_display, + "Enable virtual display feature (the virtual_display will be set +like xxxx:xx:xx.x,x;xxxx:xx:xx.x,x)"); module_param_named(virtual_display, amdgpu_virtual_display, charp,0444);
static const struct
pci_device_idpciidlist[] = { diff --gita/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.hb/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 7b0eff7..1e23334 100644drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +3
-2@@ -341,8 +341,6 @@ struct amdgpu_mode_info {int num_dig;/* number of dig blocks */ int disp_priority;const struct amdgpu_display_funcs *funcs; -struct hrtimer vblank_timer; -enum amdgpu_interrupt_state vsync_timer_enabled; };#define AMDGPU_MAX_BL_LEVEL 0xFF@@ -413,6 +411,9 @@ struct amdgpu_crtc {u32 wm_high;u32 lb_vblank_lead_lines;struct drm_display_mode hw_mode; +/* for virtual dce */ +struct hrtimer vblank_timer; +enum amdgpu_interrupt_state vsync_timer_enabled; };struct amdgpu_encoder_atom_dig {drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-0@@ -335,6 +335,7 @@ static int dce_virtual_crtc_init(struct amdgpu_device *adev, int index) amdgpu_crtc->pll_id =ATOM_PPLL_INVALID ; amdgpu_crtc->encoder =NULL ; amdgpu_crtc->connector =NULL ; + amdgpu_crtc->vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ; drm_crtc_helper_add(&amdgpu_crtc->base,
&dce_virtual_crtc_helper_funcs);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +6
-9return 0 ;@@ -344,11 +345,9 @@ static int dce_virtual_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; - adev->mode_info.vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ;dce_virtual_set_display_funcs (adev);dce_virtual_set_irq_funcs (adev); - adev->mode_info.num_crtc =1 ; adev->mode_info.num_hpd =1 ; adev->mode_info.num_dig =1 ;return 0 ;@@ -760,14 +759,13 @@ static int dce_virtual_pageflip(structamdgpu_device *adev, static enum hrtimer_restart dce_virtual_vblank_timer_handle(struct hrtimer *vblank_timer) { - struct amdgpu_mode_info *mode_info = - container_of(vblank_timer, struct amdgpu_mode_info , vblank_timer); -struct amdgpu_device *adev = - container_of(mode_info, struct amdgpu_device , mode_info); -unsigned crtc =0 ; +struct amdgpu_crtc *amdgpu_crtc =container_of (vblank_timer, + struct amdgpu_crtc, vblank_timer); +struct drm_device *ddev = amdgpu_crtc->base.dev; +struct amdgpu_device *adev = ddev->dev_private; -drm_handle_vblank (adev->ddev, crtc); -dce_virtual_pageflip (adev, crtc); +drm_handle_vblank (ddev, amdgpu_crtc->crtc_id); +dce_virtual_pageflip (adev, amdgpu_crtc->crtc_id); hrtimer_start(vblank_timer, ktime_set(0,
DCE_VIRTUAL_VBLANK_PERIOD),drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-0HRTIMER_MODE_REL);@@ -783,18 +781,22 @@ static voiddce_virtual_set_crtc_vblank_interrupt_state(struct
amdgpu_device*addrivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-2return ; } -if (state && !adev->mode_info.vsync_timer_enabled) { +if (state && !adev->mode_info.crtcs[crtc]->vsync_timer_enabled) {DRM_DEBUG ("Enable software vsync timer\n" ); - hrtimer_init(&adev->mode_info.vblank_timer,
CLOCK_MONOTONIC,HRTIMER_MODE_REL);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1- hrtimer_set_expires(&adev->mode_info.vblank_timer,
ktime_set(0, DCE_VIRTUAL_VBLANK_PERIOD));drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1- adev->mode_info.vblank_timer.function =
dce_virtual_vblank_timer_handle;drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-1- hrtimer_start(&adev->mode_info.vblank_timer, ktime_set(0,
DCE_VIRTUAL_VBLANK_PERIOD),HRTIMER_MODE_REL);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +3
-1- }else if (!state && adev->mode_info.vsync_timer_enabled) { +hrtimer_init (&adev->mode_info.crtcs[crtc]->vblank_timer, +CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); + hrtimer_set_expires(&adev->mode_info.crtcs[crtc]-Quoted 1 line
vblank_timer,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-0+ ktime_set(0,
DCE_VIRTUAL_VBLANK_PERIOD));drivers/gpu/drm/amd/amdgpu/dce_virtual.c +4
-0+ adev->mode_info.crtcs[crtc]->vblank_timer.function = + dce_virtual_vblank_timer_handle; + hrtimer_start(&adev->mode_info.crtcs[crtc]->vblank_timer, + ktime_set(0, DCE_VIRTUAL_VBLANK_PERIOD),
HRTIMER_MODE_REL);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-0+ } else if (!state && adev->mode_info.crtcs[crtc]-Quoted 1 line
vsync_timer_enabled)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-1+{DRM_DEBUG ("Disable software vsync timer\n" ); -hrtimer_cancel (&adev->mode_info.vblank_timer); + hrtimer_cancel(&adev->mode_info.crtcs[crtc]-Quoted 1 line
vblank_timer);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-1} - adev->mode_info.vsync_timer_enabled = state; + adev->mode_info.crtcs[crtc]->vsync_timer_enabled = state; DRM_DEBUG("[FM]set crtc %d vblank interrupt state %d\n", crtc,state); }
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +5
-8@@ -804,13 +806,11 @@ static int dce_virtual_set_crtc_irq_state(structamdgpu_device *adev, unsigned type, enum amdgpu_interrupt_state state) { - switch (type) { - case AMDGPU_CRTC_IRQ_VBLANK1: - dce_virtual_set_crtc_vblank_interrupt_state(adev, 0, state); -break ; -default : -break ; - } + if (type > AMDGPU_CRTC_IRQ_VBLANK6) + return -EINVAL; + +dce_virtual_set_crtc_vblank_interrupt_state (adev ,type ,state ); +return 0 ; } --
Quoted 1 line
2.5.5
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 30.09.2016 um 19:08 schrieb Alex Deucher:
Quoted 3 lines
Never used.
Signed-off-by Alex Deucher <[email protected]>
Quoted 73 lines
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 35 ++++++-------------------------- 1 file changed, 6 insertions(+), 29 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +6
-25@@ -209,10 +209,9 @@ static void dce_virtual_crtc_dpms(struct drm_crtc *crtc, int mode)switch (mode) {case DRM_MODE_DPMS_ON : amdgpu_crtc->enabled = true; -/* Make sure VBLANK and PFLIP interrupts are still enabled */ +/* Make sure VBLANK interrupts are still enabled */ type =amdgpu_crtc_idx_to_irq_type (adev, amdgpu_crtc->crtc_id);amdgpu_irq_update (adev, &adev->crtc_irq, type); -amdgpu_irq_update (adev, &adev->pageflip_irq, type);drm_vblank_on (dev, amdgpu_crtc->crtc_id);break ;case DRM_MODE_DPMS_STANDBY :@@ -672,8 +671,8 @@ static enum hrtimer_restart dce_virtual_vblank_timer_handle(struct hrtimer *vbla }static void dce_virtual_set_crtc_vblank_interrupt_state (struct amdgpu_device *adev, -int crtc, -enum amdgpu_interrupt_state state) +int crtc, +enum amdgpu_interrupt_state state) {if (crtc >= adev->mode_info.num_crtc) {DRM_DEBUG ("invalid crtc %d\n" , crtc);@@ -697,9 +696,9 @@ static void dce_virtual_set_crtc_vblank_interrupt_state(struct amdgpu_device *adstatic int dce_virtual_set_crtc_irq_state (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -unsigned type, -enum amdgpu_interrupt_state state) +struct amdgpu_irq_src *source, +unsigned type, +enum amdgpu_interrupt_state state) {switch (type) {case AMDGPU_CRTC_IRQ_VBLANK1 :@@ -726,20 +725,6 @@ static int dce_virtual_crtc_irq(struct amdgpu_device *adev,return 0 ; } -static int dce_virtual_set_pageflip_irq_state (struct amdgpu_device *adev, -struct amdgpu_irq_src *src, -unsigned type, -enum amdgpu_interrupt_state state) -{ -if (type >= adev->mode_info.num_crtc) { -DRM_ERROR ("invalid pageflip crtc %d\n" , type); -return -EINVAL ; - } -DRM_DEBUG ("[FM]set pageflip irq type %d state %d\n" , type, state); - -return 0 ; -} -static int dce_virtual_pageflip_irq (struct amdgpu_device *adev,struct amdgpu_irq_src *source,struct amdgpu_iv_entry *entry)@@ -793,17 +778,9 @@ static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { .process = dce_virtual_crtc_irq, }; -static const struct amdgpu_irq_src_funcs dce_virtual_pageflip_irq_funcs = { - .set = dce_virtual_set_pageflip_irq_state, - .process = dce_virtual_pageflip_irq, -};
drivers/gpu/drm/amd/amdgpu/dce_virtual.c static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { · line 786
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-4-static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev) { adev->crtc_irq.num_types =AMDGPU_CRTC_IRQ_LAST ; adev->crtc_irq.funcs = &dce_virtual_crtc_irq_funcs; - - adev->pageflip_irq.num_types =AMDGPU_PAGEFLIP_IRQ_LAST ; - adev->pageflip_irq.funcs = &dce_virtual_pageflip_irq_funcs; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deng, Emily
Reviewed-by Emily DengQuoted 107 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Saturday, October 01, 2016 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 1/7] drm/amdgpu/virtual_dce: droppageflip_irqfuncsNever used.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 35 ++++++----------------------- --- 1 file changed, 6 insertions(+), 29 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-2@@ -209,10 +209,9 @@ static void dce_virtual_crtc_dpms(struct drm_crtc *crtc, int mode)switch (mode) {case DRM_MODE_DPMS_ON : amdgpu_crtc->enabled = true; -/* Make sure VBLANK and PFLIP interrupts are still enabled */ +/* Make sure VBLANK interrupts are still enabled */ type =amdgpu_crtc_idx_to_irq_type (adev, amdgpu_crtc- >crtc_id);amdgpu_irq_update (adev, &adev->crtc_irq, type); -amdgpu_irq_update (adev, &adev->pageflip_irq, type);drm_vblank_on (dev, amdgpu_crtc->crtc_id);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-2break ;case DRM_MODE_DPMS_STANDBY :@@ -672,8 +671,8 @@ static enum hrtimer_restart dce_virtual_vblank_timer_handle(struct hrtimer *vbla } static void dce_virtual_set_crtc_vblank_interrupt_state(struct amdgpu_device *adev, - int crtc, - enum amdgpu_interrupt_state state) + int crtc, + enum amdgpu_interrupt_state state){
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-0if (crtc >= adev->mode_info.num_crtc) { DRM_DEBUG("invalid crtc %d\n", crtc); @@ -697,9 +696,9@@ static void dce_virtual_set_crtc_vblank_interrupt_state(struct
amdgpu_device*adstatic int dce_virtual_set_crtc_irq_state(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +3
-17-struct amdgpu_irq_src *source, - unsigned type, - enum amdgpu_interrupt_state state) +struct amdgpu_irq_src *source, + unsigned type, + enum amdgpu_interrupt_state state) { switch (type) { case AMDGPU_CRTC_IRQ_VBLANK1:@@ -726,20 +725,6 @@ static int dce_virtual_crtc_irq(structamdgpu_device *adev, return 0; } -static int dce_virtual_set_pageflip_irq_state (struct amdgpu_device *adev, -struct amdgpu_irq_src *src, -unsigned type, -enum amdgpu_interrupt_state state) -{ -if (type >= adev->mode_info.num_crtc) { -DRM_ERROR ("invalid pageflip crtc %d\n" , type); -return -EINVAL ; - } -DRM_DEBUG ("[FM]set pageflip irq type %d state %d\n" , type, state); - -return 0 ; -} - static int dce_virtual_pageflip_irq(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-9struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry)@@ -793,17 +778,9 @@ static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { .process = dce_virtual_crtc_irq, }; -static const struct amdgpu_irq_src_funcs dce_virtual_pageflip_irq_funcs = { - .set = dce_virtual_set_pageflip_irq_state, - .process = dce_virtual_pageflip_irq, -}; -static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev) { adev->crtc_irq.num_types =AMDGPU_CRTC_IRQ_LAST ; adev->crtc_irq.funcs = &dce_virtual_crtc_irq_funcs; - - adev->pageflip_irq.num_types =AMDGPU_PAGEFLIP_IRQ_LAST ; - adev->pageflip_irq.funcs = &dce_virtual_pageflip_irq_funcs; } --2.5.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx