radeon MST support - initial pieces
Subsystems (3)
Dave Airlie
maintainerHey,
So I've had this work done for ages and gotten a bit stalled, it only kind off works, but I think I'm better sending it out for review and making getting some insight from AMD folks.
It applies on top of the auxch native patch I've send already and Alex fixed up.
It detects my 5k monitor and sees both halves, however for some reason one half is colored slighty different than the other, not sure what isn't getting loaded properly, also with an MST hub and DVI adapter I get some wierd mode timings that confuse one of my monitors at some resolutions, again not many ideas on why that is.
Its hidden behind a radeon module option defauled to off for now.
The 27" 5K imacs looks like they really want MST support.
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 1/10 drm/dp_mst: add a function to retrieve vcpi slots
From: Dave Airlie <[email protected]>
radeon requires this to get the slots for later filling out a table on every transition.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 13 +++++++++++++ include/drm/drm_dp_mst_helper.h | 2 ++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +13 -0
@@ -2319,6 +2319,19 @@ out: }EXPORT_SYMBOL (drm_dp_mst_allocate_vcpi); +int drm_dp_mst_get_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port) +{ +int slots =0 ; + port =drm_dp_get_validated_port_ref (mgr, port); +if (!port) +return slots; + + slots = port->vcpi.num_slots; +drm_dp_put_port (port); +return slots; +} +EXPORT_SYMBOL (drm_dp_mst_get_vcpi_slots); +/** * drm_dp_mst_reset_vcpi_slots() - Reset number of slots to 0 for VCPI * @mgr: manager for this port
include/drm/drm_dp_mst_helper.h +2 -0
@@ -486,6 +486,8 @@ int drm_dp_calc_pbn_mode(int clock, int bpp);bool drm_dp_mst_allocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port,int pbn,int *slots); +int drm_dp_mst_get_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 01/10] drm/dp_mst: add a function to retrieve vcpi slots
Quoted 16 lines · Dave Airlie
From: Dave Airlie <[email protected]>
radeon requires this to get the slots for later filling out a table on every transition.
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/drm_dp_mst_topology.c | 13 +++++++++++++ include/drm/drm_dp_mst_helper.h | 2 ++ 2 files changed, 15 insertions(+)drivers/gpu/drm/drm_dp_mst_topology.c +0
-0
drivers/gpu/drm/drm_dp_mst_topology.c out: · line 2321
Quoted 3 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -2319,6 +2319,19 @@ out: }EXPORT_SYMBOL (drm_dp_mst_allocate_vcpi);
kerneldoc would be great here ;-)
-Daniel
Quoted 36 lines
drivers/gpu/drm/drm_dp_mst_topology.c +13
-0+int drm_dp_mst_get_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port) +{ +int slots =0 ; + port =drm_dp_get_validated_port_ref (mgr, port); +if (!port) +return slots; + + slots = port->vcpi.num_slots; +drm_dp_put_port (port); +return slots; +} +EXPORT_SYMBOL (drm_dp_mst_get_vcpi_slots); +/** * drm_dp_mst_reset_vcpi_slots() - Reset number of slots to 0 for VCPI * @mgr: manager for this port include/drm/drm_dp_mst_helper.h +2
-0@@ -486,6 +486,8 @@ int drm_dp_calc_pbn_mode(int clock, int bpp);bool drm_dp_mst_allocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port,int pbn,int *slots); +int drm_dp_mst_get_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 2/10 radeon: introduce a dp_work handler
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This is to be called on short HPD irqs, just introduce the basic infrastructure for it.
--- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_irq_kms.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/radeon/radeon.h +1 -0
@@ -2408,6 +2408,7 @@ struct radeon_device {struct radeon_rlc rlc;struct radeon_mec mec;struct work_struct hotplug_work; +struct work_struct dp_work;struct work_struct audio_work;int num_crtc;/* number of crtcs */ struct mutex dc_hw_i2c_mutex;/* display controller hw i2c mutex */
drivers/gpu/drm/radeon/radeon_irq_kms.c +4 -0
@@ -87,6 +87,9 @@ static void radeon_hotplug_work_func(struct work_struct *work)drm_helper_hpd_irq_event (dev); } +static void radeon_dp_work_func (struct work_struct *work) +{ +}/** * radeon_driver_irq_preinstall_kms - drm irq preinstall callback *
@@ -276,6 +279,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev) }INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); +INIT_WORK (&rdev->dp_work, radeon_dp_work_func);INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); rdev->irq.installed = true;
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 3/10 radeon/evergreen: add support for short HPD irqs
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This adds support for processing short irqs, and triggering the dp_work.
--- drivers/gpu/drm/radeon/evergreen.c | 101 ++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 12 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +89 -12
@@ -4389,12 +4389,12 @@ int evergreen_irq_set(struct radeon_device *rdev)return 0 ; } - hpd1 =RREG32 (DC_HPD1_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd2 =RREG32 (DC_HPD2_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd3 =RREG32 (DC_HPD3_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd4 =RREG32 (DC_HPD4_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd5 =RREG32 (DC_HPD5_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd6 =RREG32 (DC_HPD6_INT_CONTROL ) & ~DC_HPDx_INT_EN; + hpd1 =RREG32 (DC_HPD1_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd2 =RREG32 (DC_HPD2_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd3 =RREG32 (DC_HPD3_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd4 =RREG32 (DC_HPD4_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd5 =RREG32 (DC_HPD5_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd6 =RREG32 (DC_HPD6_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN);if (rdev->family ==CHIP_ARUBA ) thermal_int =RREG32 (TN_CG_THERMAL_INT_CTRL ) & ~(THERM_INT_MASK_HIGH |THERM_INT_MASK_LOW );
@@ -4483,27 +4483,27 @@ int evergreen_irq_set(struct radeon_device *rdev) }if (rdev->irq.hpd[0 ]) {DRM_DEBUG ("evergreen_irq_set: hpd 1\n" ); - hpd1 |= DC_HPDx_INT_EN; + hpd1 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[1 ]) {DRM_DEBUG ("evergreen_irq_set: hpd 2\n" ); - hpd2 |= DC_HPDx_INT_EN; + hpd2 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[2 ]) {DRM_DEBUG ("evergreen_irq_set: hpd 3\n" ); - hpd3 |= DC_HPDx_INT_EN; + hpd3 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[3 ]) {DRM_DEBUG ("evergreen_irq_set: hpd 4\n" ); - hpd4 |= DC_HPDx_INT_EN; + hpd4 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[4 ]) {DRM_DEBUG ("evergreen_irq_set: hpd 5\n" ); - hpd5 |= DC_HPDx_INT_EN; + hpd5 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[5 ]) {DRM_DEBUG ("evergreen_irq_set: hpd 6\n" ); - hpd6 |= DC_HPDx_INT_EN; + hpd6 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.afmt[0 ]) {DRM_DEBUG ("evergreen_irq_set: hdmi 0\n" );
@@ -4694,6 +4694,38 @@ static void evergreen_irq_ack(struct radeon_device *rdev) tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); } + +if (rdev->irq.stat_regs.evergreen.disp_int &DC_HPD1_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD1_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD1_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont &DC_HPD2_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD2_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD2_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &DC_HPD3_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD3_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD3_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &DC_HPD4_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD4_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD4_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &DC_HPD5_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD5_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD6_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.afmt_status1 &AFMT_AZ_FORMAT_WTRIG ) { tmp =RREG32 (AFMT_AUDIO_PACKET_CONTROL +EVERGREEN_CRTC0_REGISTER_OFFSET ); tmp |=AFMT_AZ_FORMAT_WTRIG_ACK ;
@@ -4774,6 +4806,7 @@ int evergreen_irq_process(struct radeon_device *rdev)u32 ring_index;bool queue_hotplug = false;bool queue_hdmi = false; +bool queue_dp = false;bool queue_thermal = false;u32 status, addr;
@@ -5013,6 +5046,48 @@ restart_ih:DRM_DEBUG ("IH: HPD6\n" ); }break ; +case 6 : +if (rdev->irq.stat_regs.evergreen.disp_int &DC_HPD1_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int &= ~DC_HPD1_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 1\n" ); + } +break ; +case 7 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont &DC_HPD2_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont &= ~DC_HPD2_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 2\n" ); + } +break ; +case 8 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &DC_HPD3_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont2 &= ~DC_HPD3_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 3\n" ); + } +break ; +case 9 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &DC_HPD4_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont3 &= ~DC_HPD4_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 4\n" ); + } +break ; +case 10 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &DC_HPD5_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont4 &= ~DC_HPD5_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 5\n" ); + } +break ; +case 11 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont5 &= ~DC_HPD6_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 6\n" ); + } +break ;default :DRM_DEBUG ("Unhandled interrupt: %d %d\n" , src_id, src_data);break ;
@@ -5141,6 +5216,8 @@ restart_ih: rptr &= rdev->ih.ptr_mask;WREG32 (IH_RB_RPTR , rptr); } +if (queue_dp) +schedule_work (&rdev->dp_work);if (queue_hotplug)schedule_work (&rdev->hotplug_work);if (queue_hdmi)
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 4/10 radeon/si: add support for short HPD irqs
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This adds support to process short HPD irqs on SI gpus.
--- drivers/gpu/drm/radeon/si.c | 100 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 88 insertions(+), 12 deletions(-)
drivers/gpu/drm/radeon/si.c +88 -12
@@ -6051,12 +6051,12 @@ int si_irq_set(struct radeon_device *rdev) (CNTX_BUSY_INT_ENABLE |CNTX_EMPTY_INT_ENABLE );if (!ASIC_IS_NODCE (rdev)) { - hpd1 =RREG32 (DC_HPD1_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd2 =RREG32 (DC_HPD2_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd3 =RREG32 (DC_HPD3_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd4 =RREG32 (DC_HPD4_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd5 =RREG32 (DC_HPD5_INT_CONTROL ) & ~DC_HPDx_INT_EN; - hpd6 =RREG32 (DC_HPD6_INT_CONTROL ) & ~DC_HPDx_INT_EN; + hpd1 =RREG32 (DC_HPD1_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd2 =RREG32 (DC_HPD2_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd3 =RREG32 (DC_HPD3_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd4 =RREG32 (DC_HPD4_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd5 =RREG32 (DC_HPD5_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); + hpd6 =RREG32 (DC_HPD6_INT_CONTROL ) & ~(DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN); } dma_cntl =RREG32 (DMA_CNTL +DMA0_REGISTER_OFFSET ) & ~TRAP_ENABLE ;
@@ -6119,27 +6119,27 @@ int si_irq_set(struct radeon_device *rdev) }if (rdev->irq.hpd[0 ]) {DRM_DEBUG ("si_irq_set: hpd 1\n" ); - hpd1 |= DC_HPDx_INT_EN; + hpd1 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[1 ]) {DRM_DEBUG ("si_irq_set: hpd 2\n" ); - hpd2 |= DC_HPDx_INT_EN; + hpd2 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[2 ]) {DRM_DEBUG ("si_irq_set: hpd 3\n" ); - hpd3 |= DC_HPDx_INT_EN; + hpd3 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[3 ]) {DRM_DEBUG ("si_irq_set: hpd 4\n" ); - hpd4 |= DC_HPDx_INT_EN; + hpd4 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[4 ]) {DRM_DEBUG ("si_irq_set: hpd 5\n" ); - hpd5 |= DC_HPDx_INT_EN; + hpd5 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }if (rdev->irq.hpd[5 ]) {DRM_DEBUG ("si_irq_set: hpd 6\n" ); - hpd6 |= DC_HPDx_INT_EN; + hpd6 |= DC_HPDx_INT_EN | DC_HPDx_RX_INT_EN; }WREG32 (CP_INT_CNTL_RING0 , cp_int_cntl);
@@ -6299,6 +6299,37 @@ static inline void si_irq_ack(struct radeon_device *rdev) tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); } + +if (rdev->irq.stat_regs.evergreen.disp_int &DC_HPD1_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD1_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD1_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont &DC_HPD2_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD2_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD2_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &DC_HPD3_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD3_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD3_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &DC_HPD4_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD4_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD4_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &DC_HPD5_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD5_INT_CONTROL , tmp); + } +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_RX_INTERRUPT ) { + tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp |= DC_HPDx_RX_INT_ACK; +WREG32 (DC_HPD6_INT_CONTROL , tmp); + } }static void si_irq_disable (struct radeon_device *rdev)
@@ -6364,6 +6395,7 @@ int si_irq_process(struct radeon_device *rdev)u32 src_id, src_data, ring_id;u32 ring_index;bool queue_hotplug = false; +bool queue_dp = false;bool queue_thermal = false;u32 status, addr;
@@ -6604,6 +6636,48 @@ restart_ih:DRM_DEBUG ("IH: HPD6\n" ); }break ; +case 6 : +if (rdev->irq.stat_regs.evergreen.disp_int &DC_HPD1_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int &= ~DC_HPD1_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 1\n" ); + } +break ; +case 7 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont &DC_HPD2_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont &= ~DC_HPD2_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 2\n" ); + } +break ; +case 8 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &DC_HPD3_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont2 &= ~DC_HPD3_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 3\n" ); + } +break ; +case 9 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &DC_HPD4_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont3 &= ~DC_HPD4_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 4\n" ); + } +break ; +case 10 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &DC_HPD5_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont4 &= ~DC_HPD5_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 5\n" ); + } +break ; +case 11 : +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_RX_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont5 &= ~DC_HPD6_RX_INTERRUPT ; + queue_dp = true; +DRM_DEBUG ("IH: HPD_RX 6\n" ); + } +break ;default :DRM_DEBUG ("Unhandled interrupt: %d %d\n" , src_id, src_data);break ;
@@ -6682,6 +6756,8 @@ restart_ih: rptr &= rdev->ih.ptr_mask;WREG32 (IH_RB_RPTR , rptr); } +if (queue_dp) +schedule_work (&rdev->dp_work);if (queue_hotplug)schedule_work (&rdev->hotplug_work);if (queue_thermal && rdev->pm.dpm_enabled)
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 5/10 radeon/fb: add wrapper functions around fb connector add/remove
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
These are just two wrappers to be used in the MST code later.
--- drivers/gpu/drm/radeon/radeon_fb.c | 10 ++++++++++ drivers/gpu/drm/radeon/radeon_mode.h | 4 ++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/radeon/radeon_fb.c +10 -0
@@ -434,3 +434,13 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)return true;return false; } + +void radeon_fb_add_connector (struct radeon_device *rdev,struct drm_connector *connector) +{ +drm_fb_helper_add_one_connector (&rdev->mode_info.rfbdev->helper, connector); +} + +void radeon_fb_remove_connector (struct radeon_device *rdev,struct drm_connector *connector) +{ +drm_fb_helper_remove_one_connector (&rdev->mode_info.rfbdev->helper, connector); +}
drivers/gpu/drm/radeon/radeon_mode.h +4 -0
@@ -932,6 +932,10 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)void radeon_fb_output_poll_changed (struct radeon_device *rdev);void radeon_crtc_handle_vblank (struct radeon_device *rdev,int crtc_id); + +void radeon_fb_add_connector (struct radeon_device *rdev,struct drm_connector *connector); +void radeon_fb_remove_connector (struct radeon_device *rdev,struct drm_connector *connector); +void radeon_crtc_handle_flip (struct radeon_device *rdev,int crtc_id);int radeon_align_pitch (struct radeon_device *rdev,int width,int bpp,bool tiled);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 6/10 drm/radeon: add some MST registers
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
These registers will be used later to setup
--- drivers/gpu/drm/radeon/ni_reg.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/gpu/drm/radeon/ni_reg.h +37 -0
@@ -83,4 +83,41 @@# define NI_REGAMMA_PROG_B 4# define NI_OVL_REGAMMA_MODE (x) (((x) & 0x7) << 4) +#define NI_DP_MSE_LINK_TIMING 0x73a0 +# define NI_DP_MSE_LINK_FRAME (((x) & 0x3ff) << 0) +# define NI_DP_MSE_LINK_LINE (((x) & 0x3) << 16) + +#define NI_DP_MSE_MISC_CNTL 0x736c +# define NI_DP_MSE_BLANK_CODE (((x) & 0x1) << 0) +# define NI_DP_MSE_TIMESTAMP_MODE (((x) & 0x1) << 4) +# define NI_DP_MSE_ZERO_ENCODER (((x) & 0x1) << 8) + +#define NI_DP_MSE_RATE_CNTL 0x7384 + +#define NI_DP_MSE_RATE_UPDATE 0x738c + +#define NI_DP_MSE_SAT0 0x7390 +# define NI_DP_MSE_SAT_SRC0 (x) (((x) & 0x7) << 0) +# define NI_DP_MSE_SAT_SLOT_COUNT0 (x) (((x) & 0x3f) << 8) +# define NI_DP_MSE_SAT_SRC1 (x) (((x) & 0x7) << 16) +# define NI_DP_MSE_SAT_SLOT_COUNT1 (x) (((x) & 0x3f) << 24) + +#define NI_DP_MSE_SAT1 0x7394 + +#define NI_DP_MSE_SAT2 0x7398 + +#define NI_DP_MSE_SAT_UPDATE 0x739c + +#define NI_DIG_BE_CNTL 0x7140 +# define NI_DIG_FE_SOURCE_SELECT (x) (((x) & 0x7f) << 8) +# define NI_DIG_FE_DIG_MODE (x) (((x) & 0x7) << 16) +# define NI_DIG_HPD_SELECT (x) (((x) & 0x7) << 28) + +#define NI_DIG_FE_CNTL 0x7000 +# define NI_DIG_SOURCE_SELECT (x) (((x) & 0x3) << 0) +# define NI_DIG_STEREOSYNC_SELECT (x) (((x) & 0x3) << 4) +# define NI_DIG_STEREOSYNC_GATE_EN (x) (((x) & 0x1) << 8) +# define NI_DIG_DUAL_LINK_ENABLE (x) (((x) & 0x1) << 16) +# define NI_DIG_SWAP (x) (((x) & 0x1) << 18) +# define NI_DIG_SYMCLK_FE_ON (0x1 << 24)#endif
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 7/10 drm/radeon: add new atombios encoder/transmitter interfaces
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
These allow overriding the encoder id with the frontend, we need this for setting up MST.
--- drivers/gpu/drm/radeon/atombios_encoders.c | 29 ++++++++++++++++++++++++----- drivers/gpu/drm/radeon/radeon_mode.h | 4 ++++ 2 files changed, 28 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/atombios_encoders.c +24 -5
@@ -819,7 +819,7 @@ union dig_encoder_control { };void -atombios_dig_encoder_setup (struct drm_encoder *encoder,int action,int panel_mode) +atombios_dig_encoder_setup2 (struct drm_encoder *encoder,int action,int panel_mode,int enc_override) {struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private;
@@ -916,7 +916,10 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_moif (ENCODER_MODE_IS_DP (args.v3.ucEncoderMode) && (dp_clock ==270000 )) args.v1.ucConfig |=ATOM_ENCODER_CONFIG_V3_DPLINKRATE_2_70GHZ ; - args.v3.acConfig.ucDigSel = dig->dig_encoder; +if (enc_override !=-1 ) + args.v3.acConfig.ucDigSel = enc_override; +else + args.v3.acConfig.ucDigSel = dig->dig_encoder; args.v3.ucBitPerColor =radeon_atom_get_bpc (encoder);break ;case 4 :
@@ -944,7 +947,11 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_moelse args.v1.ucConfig |=ATOM_ENCODER_CONFIG_V4_DPLINKRATE_1_62GHZ ; } - args.v4.acConfig.ucDigSel = dig->dig_encoder; + +if (enc_override !=-1 ) + args.v4.acConfig.ucDigSel = enc_override; +else + args.v4.acConfig.ucDigSel = dig->dig_encoder; args.v4.ucBitPerColor =radeon_atom_get_bpc (encoder);if (hpd_id ==RADEON_HPD_NONE ) args.v4.ucHPD_ID =0 ;
@@ -965,6 +972,12 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo } +void +atombios_dig_encoder_setup (struct drm_encoder *encoder,int action,int panel_mode) +{ +atombios_dig_encoder_setup2 (encoder, action, panel_mode,-1 ); +} +union dig_transmitter_control {DIG_TRANSMITTER_CONTROL_PS_ALLOCATION v1;DIG_TRANSMITTER_CONTROL_PARAMETERS_V2 v2;
@@ -974,7 +987,7 @@ union dig_transmitter_control { };void -atombios_dig_transmitter_setup (struct drm_encoder *encoder,int action,uint8_t lane_num,uint8_t lane_set) +atombios_dig_transmitter_setup2 (struct drm_encoder *encoder,int action,uint8_t lane_num,uint8_t lane_set,int fe) {struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private;
@@ -1324,7 +1337,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t args.v5.asConfig.ucHPDSel =0 ; else args.v5.asConfig.ucHPDSel = hpd_id + 1; - args.v5.ucDigEncoderSel =1 << dig_encoder; + args.v5.ucDigEncoderSel = (fe !=-1 ) ? (1 << fe) : (1 << dig_encoder); args.v5.ucDPLaneSet = lane_set;break ;default :
@@ -1340,6 +1353,12 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_tatom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); } +void +atombios_dig_transmitter_setup (struct drm_encoder *encoder,int action,uint8_t lane_num,uint8_t lane_set) +{ +atombios_dig_transmitter_setup2 (encoder, action, lane_num, lane_set,-1 ); +} +bool atombios_set_edp_panel_power (struct drm_connector *connector,int action) {
drivers/gpu/drm/radeon/radeon_mode.h +4 -0
@@ -715,11 +715,15 @@ extern ssize_t radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg);extern void atombios_dig_encoder_setup (struct drm_encoder *encoder,int action,int panel_mode); +extern void atombios_dig_encoder_setup2 (struct drm_encoder *encoder,int action,int panel_mode,int enc_override);extern void radeon_atom_encoder_init (struct radeon_device *rdev);extern void radeon_atom_disp_eng_pll_init (struct radeon_device *rdev);extern void atombios_dig_transmitter_setup (struct drm_encoder *encoder,int action,uint8_t lane_num,uint8_t lane_set); +extern void atombios_dig_transmitter_setup2 (struct drm_encoder *encoder, +int action,uint8_t lane_num, +uint8_t lane_set,int fe);extern void radeon_atom_ext_encoder_setup_ddc (struct drm_encoder *encoder);extern struct drm_encoder *radeon_get_external_encoder (struct drm_encoder *encoder);void radeon_atom_copy_swap (u8 *dst,u8 *src,u8 num_bytes,bool to_le);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 8/10 drm/radeon: export max link rate calculation
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
We need this in the MST code later.
--- drivers/gpu/drm/radeon/atombios_dp.c | 4 ++-- drivers/gpu/drm/radeon/radeon_mode.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/atombios_dp.c +2 -2
@@ -303,8 +303,8 @@ static int dp_get_max_dp_pix_clock(int link_rate,/***** radeon specific DP functions *****/ -static int radeon_dp_get_max_link_rate (struct drm_connector *connector, -u8 dpcd[DP_DPCD_SIZE ]) +int radeon_dp_get_max_link_rate (struct drm_connector *connector, +u8 dpcd[DP_DPCD_SIZE ]) {int max_link_rate;
drivers/gpu/drm/radeon/radeon_mode.h +2 -0
@@ -708,6 +708,8 @@ extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);extern bool radeon_dp_getdpcd (struct radeon_connector *radeon_connector);extern int radeon_dp_get_panel_mode (struct drm_encoder *encoder,struct drm_connector *connector); +int radeon_dp_get_max_link_rate (struct drm_connector *connector, +u8 *dpcd);extern void radeon_dp_set_rx_power_state (struct drm_connector *connector,u8 power_state);extern void radeon_dp_aux_init (struct radeon_connector *radeon_connector);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 9/10 drm/radeon: improve encoder picking functions
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
For MST we need to be able to pick front end encoders separate from backend, but only for MST, so we need to make the encoder picking interface smarter.
--- drivers/gpu/drm/radeon/atombios_encoders.c | 80 +++++++++++++++++++++--------- drivers/gpu/drm/radeon/radeon_mode.h | 6 +++ 2 files changed, 63 insertions(+), 23 deletions(-)
drivers/gpu/drm/radeon/atombios_encoders.c +57 -23
@@ -2015,7 +2015,14 @@ atombios_apply_encoder_quirks(struct drm_encoder *encoder, } } -static int radeon_atom_pick_dig_encoder (struct drm_encoder *encoder) +void radeon_atom_release_dig_encoder (struct radeon_device *rdev,int enc_idx) +{ +if (enc_idx <0 ) +return ; + rdev->mode_info.active_encoders &= ~(1 << enc_idx); +} + +int radeon_atom_pick_dig_encoder (struct drm_encoder *encoder,int fe_idx) {struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private;
@@ -2024,71 +2031,79 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder)struct drm_encoder *test_encoder;struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;uint32_t dig_enc_in_use =0 ; +int enc_idx =-1 ; +if (fe_idx >=0 ) { + enc_idx = fe_idx; + goto assigned; + }if (ASIC_IS_DCE6 (rdev)) {/* DCE6 */ switch (radeon_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_UNIPHY :if (dig->linkb) -return 1 ; + enc_idx =1 ;else -return 0 ; + enc_idx =0 ;break ;case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 :if (dig->linkb) -return 3 ; + enc_idx =3 ;else -return 2 ; + enc_idx =2 ;break ;case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 :if (dig->linkb) -return 5 ; + enc_idx =5 ;else -return 4 ; + enc_idx =4 ;break ;case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 : -return 6 ; + enc_idx =6 ;break ; } + goto assigned; }else if (ASIC_IS_DCE4 (rdev)) {/* DCE4/5 */ if (ASIC_IS_DCE41 (rdev) && !ASIC_IS_DCE61 (rdev)) {/* ontario follows DCE4 */ if (rdev->family ==CHIP_PALM ) {if (dig->linkb) -return 1 ; + enc_idx =1 ;else -return 0 ; + enc_idx =0 ; }else /* llano follows DCE3.2 */ -return radeon_crtc->crtc_id; + enc_idx = radeon_crtc->crtc_id; }else {switch (radeon_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_UNIPHY :if (dig->linkb) -return 1 ; + enc_idx =1 ;else -return 0 ; + enc_idx =0 ;break ;case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 :if (dig->linkb) -return 3 ; + enc_idx =3 ;else -return 2 ; + enc_idx =2 ;break ;case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 :if (dig->linkb) -return 5 ; + enc_idx =5 ;else -return 4 ; + enc_idx =4 ;break ; } } + goto assigned; }/* on DCE32 and encoder can driver any block so just crtc id */ if (ASIC_IS_DCE32 (rdev)) { -return radeon_crtc->crtc_id; + enc_idx = radeon_crtc->crtc_id; + goto assigned; }/* on DCE3 - LVTMA can only be driven by DIGB */
@@ -2116,6 +2131,17 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder)if (!(dig_enc_in_use &1 ))return 0 ;return 1 ; + +assigned: +if (enc_idx ==-1 ) { +DRM_ERROR ("Got encoder index incorrect - returning 0\n" ); +return 0 ; + } +if (rdev->mode_info.active_encoders & (1 << enc_idx)) { +DRM_ERROR ("chosen encoder in use %d\n" , enc_idx); + } + rdev->mode_info.active_encoders |= (1 << enc_idx); +return enc_idx; }/* This only needs to be called once at startup */
@@ -2370,7 +2396,7 @@ static void radeon_atom_encoder_prepare(struct drm_encoder *encoder) ENCODER_OBJECT_ID_NONE)) {struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;if (dig) { - dig->dig_encoder =radeon_atom_pick_dig_encoder (encoder); + dig->dig_encoder =radeon_atom_pick_dig_encoder (encoder,-1 );if (radeon_encoder->active_device &ATOM_DEVICE_DFP_SUPPORT ) {if (rdev->family >=CHIP_R600 ) dig->afmt = rdev->mode_info.afmt[dig->dig_encoder];
@@ -2472,10 +2498,18 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder) disable_done:if (radeon_encoder_is_digital (encoder)) { - dig = radeon_encoder->enc_priv; - dig->dig_encoder =-1 ; - } - radeon_encoder->active_device =0 ; +if (atombios_get_encoder_mode (encoder) ==ATOM_ENCODER_MODE_HDMI ) { +if (rdev->asic->display.hdmi_enable) +radeon_hdmi_enable (rdev, encoder, false); + } +if (atombios_get_encoder_mode (encoder) !=ATOM_ENCODER_MODE_DP_MST ) { + dig = radeon_encoder->enc_priv; +radeon_atom_release_dig_encoder (rdev, dig->dig_encoder); + dig->dig_encoder =-1 ; + radeon_encoder->active_device =0 ; + } + }else + radeon_encoder->active_device =0 ; }/* these are handled by the primary encoders */
drivers/gpu/drm/radeon/radeon_mode.h +6 -0
@@ -265,6 +265,9 @@ struct radeon_mode_info {u16 firmware_flags;/* pointer to backlight encoder */ struct radeon_encoder *bl_encoder; + +/* bitmask for active encoder frontends */ +uint32_t active_encoders; };#define RADEON_MAX_BL_LEVEL 0xFF
@@ -945,4 +948,7 @@ void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connectorvoid radeon_crtc_handle_flip (struct radeon_device *rdev,int crtc_id);int radeon_align_pitch (struct radeon_device *rdev,int width,int bpp,bool tiled); + +int radeon_atom_pick_dig_encoder (struct drm_encoder *encoder,int fe_idx); +void radeon_atom_release_dig_encoder (struct radeon_device *rdev,int enc_idx);#endif
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 10/10 drm/radeon: add DisplayPort MST support
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This adds initial DP 1.2 MST support to radeon, on CAYMAN and up in theory.
This is off by default.
--- drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 11 +- drivers/gpu/drm/radeon/atombios_encoders.c | 13 + drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 1 + drivers/gpu/drm/radeon/radeon_connectors.c | 64 ++- drivers/gpu/drm/radeon/radeon_device.c | 5 + drivers/gpu/drm/radeon/radeon_dp_mst.c | 814 +++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_drv.c | 4 + drivers/gpu/drm/radeon/radeon_encoders.c | 14 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 11 + drivers/gpu/drm/radeon/radeon_mode.h | 42 ++ 12 files changed, 976 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_dp_mst.c
drivers/gpu/drm/radeon/Makefile +1 -1
@@ -81,7 +81,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ rv770_smc.o cypress_dpm.o btc_dpm.o sumo_dpm.o sumo_smc.o trinity_dpm.o \ trinity_smc.o ni_dpm.o si_smc.o si_dpm.o kv_smc.o kv_dpm.o ci_smc.o \ ci_dpm.o dce6_afmt.o radeon_vm.o radeon_ucode.o radeon_ib.o \ - radeon_sync.o radeon_audio.o radeon_dp_auxch.o + radeon_sync.o radeon_audio.o radeon_dp_auxch.o radeon_dp_mst.o radeon-$(CONFIG_MMU_NOTIFIER) += radeon_mn.o
drivers/gpu/drm/radeon/atombios_crtc.c +10 -1
@@ -606,6 +606,13 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, } } +if (radeon_encoder->is_mst_encoder) { +struct radeon_encoder_mst *mst_enc = radeon_encoder->enc_priv; +struct radeon_connector_atom_dig *dig_connector = mst_enc->connector->con_priv; + + dp_clock = dig_connector->dp_clock; + } +/* use recommended ref_div for ss */ if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) {if (radeon_crtc->ss_enabled) {
@@ -952,7 +959,9 @@ static bool atombios_crtc_prepare_pll(struct drm_crtc *crtc, struct drm_display_ radeon_crtc->bpc =8 ; radeon_crtc->ss_enabled = false; -if ((radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT |ATOM_DEVICE_DFP_SUPPORT )) || +if (radeon_encoder->is_mst_encoder) { +radeon_dp_mst_prepare_pll (crtc, mode); + }else if ((radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT |ATOM_DEVICE_DFP_SUPPORT )) || (radeon_encoder_get_dp_bridge_encoder_id (radeon_crtc->encoder) !=ENCODER_OBJECT_ID_NONE )) {struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; struct drm_connector *connector =
drivers/gpu/drm/radeon/atombios_encoders.c +13 -0
@@ -671,7 +671,15 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)struct drm_connector *connector;struct radeon_connector *radeon_connector;struct radeon_connector_atom_dig *dig_connector; +struct radeon_encoder_atom_dig *dig_enc; +if (radeon_encoder_is_digital (encoder)) { + dig_enc = radeon_encoder->enc_priv; +if (dig_enc->active_mst_links) +return ATOM_ENCODER_MODE_DP_MST ; + } +if (radeon_encoder->is_mst_encoder || radeon_encoder->offset) +return ATOM_ENCODER_MODE_DP_MST ;/* dp bridges are always DP */ if (radeon_encoder_get_dp_bridge_encoder_id (encoder) !=ENCODER_OBJECT_ID_NONE )return ATOM_ENCODER_MODE_DP ;
@@ -1703,6 +1711,11 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)case DRM_MODE_DPMS_STANDBY :case DRM_MODE_DPMS_SUSPEND :case DRM_MODE_DPMS_OFF : + +/* don't power off encoders with active MST links */ +if (dig->active_mst_links) +return ; +if (ASIC_IS_DCE4 (rdev)) {if (ENCODER_MODE_IS_DP (atombios_get_encoder_mode (encoder)) && connector)atombios_dig_encoder_setup (encoder,ATOM_ENCODER_CMD_DP_VIDEO_OFF ,0 );
drivers/gpu/drm/radeon/radeon.h +1 -0
@@ -112,6 +112,7 @@ extern int radeon_use_pflipirq;extern int radeon_bapm;extern int radeon_backlight;extern int radeon_auxch; +extern int radeon_mst;/* * Copy from radeon_drv.h so we don't have to include both and have conflicting
drivers/gpu/drm/radeon/radeon_atombios.c +1 -0
@@ -845,6 +845,7 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)radeon_link_encoder_connector (dev); +radeon_setup_mst_connector (dev);return true; }
drivers/gpu/drm/radeon/radeon_connectors.c +61 -3
100 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_device.c +5 -0
@@ -1442,6 +1442,11 @@ int radeon_device_init(struct radeon_device *rdev,DRM_ERROR ("registering gem debugfs failed (%d).\n" , r); } + r =radeon_mst_debugfs_init (rdev); +if (r) { +DRM_ERROR ("registering mst debugfs failed (%d).\n" , r); + } +if (rdev->flags &RADEON_IS_AGP && !rdev->accel_working) {/* Acceleration not working on AGP card try again * with fallback to PCI or PCIE GART
drivers/gpu/drm/radeon/radeon_dp_mst.c new file +814 -0
814 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_drv.c +4 -0
@@ -191,6 +191,7 @@ int radeon_use_pflipirq = 2;int radeon_bapm =-1 ;int radeon_backlight =-1 ;int radeon_auxch =-1 ; +int radeon_mst =0 ;MODULE_PARM_DESC (no_wb,"Disable AGP writeback for scratch registers" );module_param_named (no_wb, radeon_no_wb, int,0444 );
@@ -279,6 +280,9 @@ module_param_named(backlight, radeon_backlight, int, 0444);MODULE_PARM_DESC (auxch,"Use native auxch experimental support (1 = enable, 0 = disable, -1 = auto)" );module_param_named (auxch, radeon_auxch, int,0444 ); +MODULE_PARM_DESC (mst,"DisplayPort MST experimental support (1 = enable, 0 = disable)" ); +module_param_named (mst, radeon_mst, int,0444 ); +static struct pci_device_id pciidlist[] = { radeon_PCI_IDS };
drivers/gpu/drm/radeon/radeon_encoders.c +13 -1
@@ -244,7 +244,16 @@ radeon_get_connector_for_encoder(struct drm_encoder *encoder)list_for_each_entry (connector, &dev->mode_config.connector_list, head) { radeon_connector =to_radeon_connector (connector); -if (radeon_encoder->active_device & radeon_connector->devices) +if (radeon_encoder->is_mst_encoder) { +struct radeon_encoder_mst *mst_enc; + +if (!radeon_connector->is_mst_connector) +continue ; + + mst_enc = radeon_encoder->enc_priv; +if (mst_enc->connector == radeon_connector->mst_port) +return connector; + }else if (radeon_encoder->active_device & radeon_connector->devices)return connector; }return NULL ;
@@ -390,6 +399,9 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder,case DRM_MODE_CONNECTOR_DVID :case DRM_MODE_CONNECTOR_HDMIA :case DRM_MODE_CONNECTOR_DisplayPort: +if (radeon_connector->is_mst_connector) +return false; + dig_connector = radeon_connector->con_priv;if ((dig_connector->dp_sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) || (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
drivers/gpu/drm/radeon/radeon_irq_kms.c +11 -0
@@ -89,6 +89,17 @@ static void radeon_hotplug_work_func(struct work_struct *work)static void radeon_dp_work_func (struct work_struct *work) { + struct radeon_device *rdev = container_of(work, struct radeon_device, + dp_work); +struct drm_device *dev = rdev->ddev; +struct drm_mode_config *mode_config = &dev->mode_config; +struct drm_connector *connector; + +/* this should take a mutex */ +if (mode_config->num_connector) { +list_for_each_entry (connector, &mode_config->connector_list, head) +radeon_connector_hotplug (connector); + } }/** * radeon_driver_irq_preinstall_kms - drm irq preinstall callback
drivers/gpu/drm/radeon/radeon_mode.h +42 -0
91 lines not on this page · raw message
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 15 lines · Dave Airlie
Hey,
So I've had this work done for ages and gotten a bit stalled, it only kind off works, but I think I'm better sending it out for review and making getting some insight from AMD folks.
It applies on top of the auxch native patch I've send already and Alex fixed up.
It detects my 5k monitor and sees both halves, however for some reason one half is colored slighty different than the other, not sure what isn't getting loaded properly, also with an MST hub and DVI adapter I get some wierd mode timings that confuse one of my monitors at some resolutions, again not many ideas on why that is.
Quoted 3 lines
Its hidden behind a radeon module option defauled to off for now.
The 27" 5K imacs looks like they really want MST support.
Looks good. I've applied it to my 4.1-wip tree to soak for a bit and also added a few minor cleanups.
Alex
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel