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

[Dieter Nützel]

Am 26.02.2015 03:05, schrieb Alex Deucher:
> On Wed, Feb 25, 2015 at 8:32 PM, Dave Airlie <airlied at gmail.com> wrote:
>> From: Dave Airlie <airlied at redhat.com>
>> 
>> This stops a DRM_ERROR that says we already used the encoder.
>> 
>> Reported-by: Dieter Nützel <Dieter at nuetzel-hh.de>
>> Signed-off-by: Dave Airlie <airlied at redhat.com>
> 
> I've squashed this into the appropriate patch and pushed a new 4.1-wip 
> tree.
> 
> Alex

Up and running.
Thanks!

-⁠Dieter

>> ---
>>  drivers/gpu/drm/radeon/atombios_encoders.c | 2 ++
>>  1 file changed, 2 insertions(+)
>> 
>> diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
>> b/drivers/gpu/drm/radeon/atombios_encoders.c
>> index e8fe2b7..0f46f68 100644
>> --- a/drivers/gpu/drm/radeon/atombios_encoders.c
>> +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
>> @@ -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
>> 
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel