[PATCH] drm/radeon: fix logic error in atombios_encoders.c

[Michel Dänzer]

On Mit, 2012-11-14 at 09:13 -0500, alexdeucher at gmail.com wrote: 
> From: Alex Deucher 
> 
> Fixes:
> https://bugzilla.kernel.org/show_bug.cgi?id=50431
> 
> Reported-by: David Binderman 
> Signed-off-by: Alex Deucher 
> Cc: stable at vger.kernel.org

Reviewed-by: Michel D?nzer 


>  drivers/gpu/drm/radeon/atombios_encoders.c |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
> b/drivers/gpu/drm/radeon/atombios_encoders.c
> index ba498f8..010bae1 100644
> --- a/drivers/gpu/drm/radeon/atombios_encoders.c
> +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
> @@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder 
> *encoder, int mode)
>   atombios_dig_transmitter_setup(encoder, 
> ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
>   atombios_dig_transmitter_setup(encoder, 
> ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
>   /* some early dce3.2 boards have a bug in their 
> transmitter control table */
> - if ((rdev->family != CHIP_RV710) || (rdev->family != 
> CHIP_RV730))
> + if ((rdev->family != CHIP_RV710) && (rdev->family != 
> CHIP_RV730))

Ouch, the compiler didn't warn about this always evaluating to true?


-- 
Earthling Michel D?nzer   |   http://www.amd.com
Libre software enthusiast |  Debian, X and DRI developer

[PATCH] drm/radeon: fix logic error in atombios_encoders.c

[Alex Deucher]

On Wed, Nov 14, 2012 at 9:32 AM, Michel D?nzer  wrote:
> On Mit, 2012-11-14 at 09:13 -0500, alexdeucher at gmail.com wrote:
>> From: Alex Deucher 
>>
>> Fixes:
>> https://bugzilla.kernel.org/show_bug.cgi?id=50431
>>
>> Reported-by: David Binderman 
>> Signed-off-by: Alex Deucher 
>> Cc: stable at vger.kernel.org
>
> Reviewed-by: Michel D?nzer 
>
>
>>  drivers/gpu/drm/radeon/atombios_encoders.c |2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
>> b/drivers/gpu/drm/radeon/atombios_encoders.c
>> index ba498f8..010bae1 100644
>> --- a/drivers/gpu/drm/radeon/atombios_encoders.c
>> +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
>> @@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder 
>> *encoder, int mode)
>>   atombios_dig_transmitter_setup(encoder, 
>> ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
>>   atombios_dig_transmitter_setup(encoder, 
>> ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
>>   /* some early dce3.2 boards have a bug in their 
>> transmitter control table */
>> - if ((rdev->family != CHIP_RV710) || (rdev->family != 
>> CHIP_RV730))
>> + if ((rdev->family != CHIP_RV710) && (rdev->family != 
>> CHIP_RV730))
>
> Ouch, the compiler didn't warn about this always evaluating to true?

Nope.  At least not on any of my machines.

>
>
> --
> Earthling Michel D?nzer   |   http://www.amd.com
> Libre software enthusiast |  Debian, X and DRI developer

[PATCH] drm/radeon: fix logic error in atombios_encoders.c

[alexdeuc...@gmail.com]

From: Alex Deucher 

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=50431

Reported-by: David Binderman 
Signed-off-by: Alex Deucher 
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/radeon/atombios_encoders.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
b/drivers/gpu/drm/radeon/atombios_encoders.c
index ba498f8..010bae1 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, 
int mode)
atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
/* some early dce3.2 boards have a bug in their 
transmitter control table */
-   if ((rdev->family != CHIP_RV710) || (rdev->family != 
CHIP_RV730))
+   if ((rdev->family != CHIP_RV710) && (rdev->family != 
CHIP_RV730))
atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
}
if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && 
connector) {
-- 
1.7.7.5

[PATCH] drm/radeon: fix logic error in atombios_encoders.c

[alexdeucher]

From: Alex Deucher alexander.deuc...@amd.com

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=50431

Reported-by: David Binderman dcb...@hotmail.com
Signed-off-by: Alex Deucher alexander.deuc...@amd.com
Cc: sta...@vger.kernel.org
---
 drivers/gpu/drm/radeon/atombios_encoders.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
b/drivers/gpu/drm/radeon/atombios_encoders.c
index ba498f8..010bae1 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, 
int mode)
atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
/* some early dce3.2 boards have a bug in their 
transmitter control table */
-   if ((rdev-family != CHIP_RV710) || (rdev-family != 
CHIP_RV730))
+   if ((rdev-family != CHIP_RV710)  (rdev-family != 
CHIP_RV730))
atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
}
if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder))  
connector) {
-- 
1.7.7.5

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/radeon: fix logic error in atombios_encoders.c

[Michel Dänzer]

On Mit, 2012-11-14 at 09:13 -0500, alexdeuc...@gmail.com wrote: 
 From: Alex Deucher alexander.deuc...@amd.com
 
 Fixes:
 https://bugzilla.kernel.org/show_bug.cgi?id=50431
 
 Reported-by: David Binderman dcb...@hotmail.com
 Signed-off-by: Alex Deucher alexander.deuc...@amd.com
 Cc: sta...@vger.kernel.org

Reviewed-by: Michel Dänzer michel.daen...@amd.com


  drivers/gpu/drm/radeon/atombios_encoders.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
 b/drivers/gpu/drm/radeon/atombios_encoders.c
 index ba498f8..010bae1 100644
 --- a/drivers/gpu/drm/radeon/atombios_encoders.c
 +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
 @@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder 
 *encoder, int mode)
   atombios_dig_transmitter_setup(encoder, 
 ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
   atombios_dig_transmitter_setup(encoder, 
 ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
   /* some early dce3.2 boards have a bug in their 
 transmitter control table */
 - if ((rdev-family != CHIP_RV710) || (rdev-family != 
 CHIP_RV730))
 + if ((rdev-family != CHIP_RV710)  (rdev-family != 
 CHIP_RV730))

Ouch, the compiler didn't warn about this always evaluating to true?


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast |  Debian, X and DRI developer
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/radeon: fix logic error in atombios_encoders.c

[Alex Deucher]

On Wed, Nov 14, 2012 at 9:32 AM, Michel Dänzer mic...@daenzer.net wrote:
 On Mit, 2012-11-14 at 09:13 -0500, alexdeuc...@gmail.com wrote:
 From: Alex Deucher alexander.deuc...@amd.com

 Fixes:
 https://bugzilla.kernel.org/show_bug.cgi?id=50431

 Reported-by: David Binderman dcb...@hotmail.com
 Signed-off-by: Alex Deucher alexander.deuc...@amd.com
 Cc: sta...@vger.kernel.org

 Reviewed-by: Michel Dänzer michel.daen...@amd.com


  drivers/gpu/drm/radeon/atombios_encoders.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

 diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
 b/drivers/gpu/drm/radeon/atombios_encoders.c
 index ba498f8..010bae1 100644
 --- a/drivers/gpu/drm/radeon/atombios_encoders.c
 +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
 @@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder 
 *encoder, int mode)
   atombios_dig_transmitter_setup(encoder, 
 ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
   atombios_dig_transmitter_setup(encoder, 
 ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
   /* some early dce3.2 boards have a bug in their 
 transmitter control table */
 - if ((rdev-family != CHIP_RV710) || (rdev-family != 
 CHIP_RV730))
 + if ((rdev-family != CHIP_RV710)  (rdev-family != 
 CHIP_RV730))

 Ouch, the compiler didn't warn about this always evaluating to true?

Nope.  At least not on any of my machines.



 --
 Earthling Michel Dänzer   |   http://www.amd.com
 Libre software enthusiast |  Debian, X and DRI developer
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel