Skip to contentSkip to conversation

drm/radeon: release digital encoder before asking for new one.

PATCH In review Dave Airlie 3 participants 3 messages Feb 26, 2015

Subsystems (2)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 drm/radeon: release digital encoder before asking for new one.

From: Dave Airlie <[email protected]>

This stops a DRM_ERROR that says we already used the encoder.

---
 drivers/gpu/drm/radeon/atombios_encoders.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/radeon/atombios_encoders.c +2 -0
index e8fe2b7..0f46f68 100644
@@ -2465,6 +2465,8 @@ 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) {
+			if (dig->dig_encoder >= 0)
+				radeon_atom_release_dig_encoder(rdev, dig->dig_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)
Signature · 6 lines
2.1.0

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw
Quoted 6 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This stops a DRM_ERROR that says we already used the encoder.

I've squashed this into the appropriate patch and pushed a new 4.1-wip tree.

Alex

Quoted 20 lines
---
 drivers/gpu/drm/radeon/atombios_encoders.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/radeon/atombios_encoders.c +2 -1
index e8fe2b7..0f46f68 100644
@@ -2465,6 +2465,8 @@ 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) {
+                       if (dig->dig_encoder >= 0)
+                               radeon_atom_release_dig_encoder(rdev, dig->dig_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)
--

2.1.0

Quoted 4 lines

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

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

#2 lore raw

Am 26.02.2015 03:05, schrieb Alex Deucher:

Quoted 11 lines · Dave Airlie
Quoted 6 lines

From: Dave Airlie <[email protected]>

This stops a DRM_ERROR that says we already used the encoder.

I've squashed this into the appropriate patch and pushed a new 4.1-wip tree.

Alex

Up and running.
Thanks!

-⁠Dieter

Quoted 25 lines
Quoted 25 lines
---
 drivers/gpu/drm/radeon/atombios_encoders.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/radeon/atombios_encoders.c +2 -0
index e8fe2b7..0f46f68 100644
@@ -2465,6 +2465,8 @@ 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) {
+                       if (dig->dig_encoder >= 0)
+                               radeon_atom_release_dig_encoder(rdev, 
 dig->dig_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)

--
2.1.0

Quoted 8 lines
Quoted 4 lines

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

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

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