| Message ID | 1440683046-27110-2-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/27/2015 06:44 AM, Maarten Lankhorst wrote: > This might not have been set during boot, and when we preserve > the initial mode this can result in a black screen. > > Cc: Daniel Stone <daniels@collabora.com> > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 364104dee32f..7b5dfe2f7b2d 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3314,6 +3314,9 @@ static void intel_update_pipe_size(struct intel_crtc *crtc) > if (!i915.fastboot) > return; > > + if (HAS_DDI(dev)) > + intel_set_pipe_csc(&crtc->base); > + > /* > * Update pipe size and adjust fitter if needed: the reason for this is > * that in compute_mode_changes we check the native mode (not the pfit > Maybe there's a better place to put this later? Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
On 09/10/2015 12:25 PM, Jesse Barnes wrote: > On 08/27/2015 06:44 AM, Maarten Lankhorst wrote: >> This might not have been set during boot, and when we preserve >> the initial mode this can result in a black screen. >> >> Cc: Daniel Stone <daniels@collabora.com> >> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >> --- >> drivers/gpu/drm/i915/intel_display.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> index 364104dee32f..7b5dfe2f7b2d 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -3314,6 +3314,9 @@ static void intel_update_pipe_size(struct intel_crtc *crtc) >> if (!i915.fastboot) >> return; >> >> + if (HAS_DDI(dev)) >> + intel_set_pipe_csc(&crtc->base); >> + >> /* >> * Update pipe size and adjust fitter if needed: the reason for this is >> * that in compute_mode_changes we check the native mode (not the pfit >> > > Maybe there's a better place to put this later? Nevermind, I see the function gets renamed later; much clearer. Jesse
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 364104dee32f..7b5dfe2f7b2d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3314,6 +3314,9 @@ static void intel_update_pipe_size(struct intel_crtc *crtc) if (!i915.fastboot) return; + if (HAS_DDI(dev)) + intel_set_pipe_csc(&crtc->base); + /* * Update pipe size and adjust fitter if needed: the reason for this is * that in compute_mode_changes we check the native mode (not the pfit
This might not have been set during boot, and when we preserve the initial mode this can result in a black screen. Cc: Daniel Stone <daniels@collabora.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 3 +++ 1 file changed, 3 insertions(+)