* [PATCH] drm/radeon: release digital encoder before asking for new one.
@ 2015-02-26 1:32 Dave Airlie
2015-02-26 2:05 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Dave Airlie @ 2015-02-26 1:32 UTC (permalink / raw)
To: dri-devel
From: Dave Airlie <airlied@redhat.com>
This stops a DRM_ERROR that says we already used the encoder.
Reported-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
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@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon: release digital encoder before asking for new one.
2015-02-26 1:32 [PATCH] drm/radeon: release digital encoder before asking for new one Dave Airlie
@ 2015-02-26 2:05 ` Alex Deucher
2015-02-26 2:46 ` Dieter Nützel
0 siblings, 1 reply; 3+ messages in thread
From: Alex Deucher @ 2015-02-26 2:05 UTC (permalink / raw)
To: Dave Airlie; +Cc: Maling list - DRI developers
On Wed, Feb 25, 2015 at 8:32 PM, Dave Airlie <airlied@gmail.com> wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> This stops a DRM_ERROR that says we already used the encoder.
>
> Reported-by: Dieter Nützel <Dieter@nuetzel-hh.de>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
I've squashed this into the appropriate patch and pushed a new 4.1-wip tree.
Alex
> ---
> 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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon: release digital encoder before asking for new one.
2015-02-26 2:05 ` Alex Deucher
@ 2015-02-26 2:46 ` Dieter Nützel
0 siblings, 0 replies; 3+ messages in thread
From: Dieter Nützel @ 2015-02-26 2:46 UTC (permalink / raw)
To: Alex Deucher; +Cc: Maling list - DRI developers
Am 26.02.2015 03:05, schrieb Alex Deucher:
> On Wed, Feb 25, 2015 at 8:32 PM, Dave Airlie <airlied@gmail.com> wrote:
>> From: Dave Airlie <airlied@redhat.com>
>>
>> This stops a DRM_ERROR that says we already used the encoder.
>>
>> Reported-by: Dieter Nützel <Dieter@nuetzel-hh.de>
>> Signed-off-by: Dave Airlie <airlied@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@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-26 2:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-26 1:32 [PATCH] drm/radeon: release digital encoder before asking for new one Dave Airlie
2015-02-26 2:05 ` Alex Deucher
2015-02-26 2:46 ` Dieter Nützel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.