diff mbox

[Bug,198123] Console is the wrong color at boot with radeon 6670

Message ID 20180110121522.GL13066@phenom.ffwll.local (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter Jan. 10, 2018, 12:15 p.m. UTC
On Sun, Jan 07, 2018 at 07:14:41PM +0000, Deposite Pirate wrote:
> December 22, 2017 4:35 PM, "Michel Dänzer" <michel@daenzer.net> wrote:
> 
> > "Deposite Pirate", do the attached (only compile tested) patches work?
> 
> Hi,
> 
> Sorry for the delay. I was not at home for a while. So, I've compiled and booted a kernel with both
> of these patches and
> the issue is still present.

Below a revised version of Michel's first patch. This one should work I
hope.
-Daniel

Comments

Daniel Vetter Jan. 11, 2018, 8:57 a.m. UTC | #1
On Wed, Jan 10, 2018 at 01:15:22PM +0100, Daniel Vetter wrote:
> On Sun, Jan 07, 2018 at 07:14:41PM +0000, Deposite Pirate wrote:
> > December 22, 2017 4:35 PM, "Michel Dänzer" <michel@daenzer.net> wrote:
> > 
> > > "Deposite Pirate", do the attached (only compile tested) patches work?
> > 
> > Hi,
> > 
> > Sorry for the delay. I was not at home for a while. So, I've compiled and booted a kernel with both
> > of these patches and
> > the issue is still present.
> 
> Below a revised version of Michel's first patch. This one should work I

Hi Deposite Pirate, can you pls test this version of Michel's first patch?

Thanks, Daniel

> hope.
> -Daniel
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
> index d22f4b6a8828..dc0abdf8be00 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -213,9 +213,6 @@ void radeon_crtc_load_lut(struct drm_crtc *crtc)
>  	struct drm_device *dev = crtc->dev;
>  	struct radeon_device *rdev = dev->dev_private;
>  
> -	if (!crtc->enabled)
> -		return;
> -
>  	if (ASIC_IS_DCE5(rdev))
>  		dce5_crtc_load_lut(crtc);
>  	else if (ASIC_IS_DCE4(rdev))
> @@ -702,6 +699,8 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
>  		radeon_atombios_init_crtc(dev, radeon_crtc);
>  	else
>  		radeon_legacy_init_crtc(dev, radeon_crtc);
> +
> +	radeon_crtc_load_lut(&radeon_crtc->base);
>  }
>  
>  static const char *encoder_names[38] = {
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
Michel Dänzer Jan. 11, 2018, 9:09 a.m. UTC | #2
On 2018-01-10 01:15 PM, Daniel Vetter wrote:
> On Sun, Jan 07, 2018 at 07:14:41PM +0000, Deposite Pirate wrote:
>> December 22, 2017 4:35 PM, "Michel Dänzer" <michel@daenzer.net> wrote:
>>
>>> "Deposite Pirate", do the attached (only compile tested) patches work?
>>
>> Hi,
>>
>> Sorry for the delay. I was not at home for a while. So, I've compiled and booted a kernel with both
>> of these patches and
>> the issue is still present.
> 
> Below a revised version of Michel's first patch. This one should work I
> hope.
> -Daniel
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
> index d22f4b6a8828..dc0abdf8be00 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -213,9 +213,6 @@ void radeon_crtc_load_lut(struct drm_crtc *crtc)
>  	struct drm_device *dev = crtc->dev;
>  	struct radeon_device *rdev = dev->dev_private;
>  
> -	if (!crtc->enabled)
> -		return;
> -
>  	if (ASIC_IS_DCE5(rdev))
>  		dce5_crtc_load_lut(crtc);
>  	else if (ASIC_IS_DCE4(rdev))

Good catch, thanks Daniel. FWIW though, I'd prefer this to be a separate
patch, in case it causes any regressions. But let's wait for test
results first.
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index d22f4b6a8828..dc0abdf8be00 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -213,9 +213,6 @@  void radeon_crtc_load_lut(struct drm_crtc *crtc)
 	struct drm_device *dev = crtc->dev;
 	struct radeon_device *rdev = dev->dev_private;
 
-	if (!crtc->enabled)
-		return;
-
 	if (ASIC_IS_DCE5(rdev))
 		dce5_crtc_load_lut(crtc);
 	else if (ASIC_IS_DCE4(rdev))
@@ -702,6 +699,8 @@  static void radeon_crtc_init(struct drm_device *dev, int index)
 		radeon_atombios_init_crtc(dev, radeon_crtc);
 	else
 		radeon_legacy_init_crtc(dev, radeon_crtc);
+
+	radeon_crtc_load_lut(&radeon_crtc->base);
 }
 
 static const char *encoder_names[38] = {