diff options
| author | Daniel Vetter | 2015-08-26 18:57:26 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-02 16:36:33 +0200 |
| commit | 62f0ace531b2ca69a1defe5a01a85539fd28353f (patch) | |
| tree | ce470175126229e49a2dd992c49e509002f58250 /drivers/gpu/drm/i915/intel_display.c | |
| parent | Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued (diff) | |
| download | kernel-qcow2-linux-62f0ace531b2ca69a1defe5a01a85539fd28353f.tar.gz kernel-qcow2-linux-62f0ace531b2ca69a1defe5a01a85539fd28353f.tar.xz kernel-qcow2-linux-62f0ace531b2ca69a1defe5a01a85539fd28353f.zip | |
drm/i915: Update comments around base bpp
Forgot to do that in
commit d328c9d78d64ca11e744fe227096990430a88477
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri Apr 10 16:22:37 2015 +0200
drm/i915: Select starting pipe bpp irrespective or the primary plane
and it's confusing. Fix it.
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index deba3330de71..ae485e717c57 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12102,10 +12102,6 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, (DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_NVSYNC))) pipe_config->base.adjusted_mode.flags |= DRM_MODE_FLAG_NVSYNC; - /* Compute a starting value for pipe_config->pipe_bpp taking the source - * plane pixel format and any sink constraints into account. Returns the - * source plane bpp so that dithering can be selected on mismatches - * after encoders and crtc also have had their say. */ base_bpp = compute_baseline_pipe_bpp(to_intel_crtc(crtc), pipe_config); if (base_bpp < 0) @@ -12174,7 +12170,7 @@ encoder_retry: /* Dithering seems to not pass-through bits correctly when it should, so * only enable it on 6bpc panels. */ pipe_config->dither = pipe_config->pipe_bpp == 6*3; - DRM_DEBUG_KMS("plane bpp: %i, pipe bpp: %i, dithering: %i\n", + DRM_DEBUG_KMS("hw max bpp: %i, pipe bpp: %i, dithering: %i\n", base_bpp, pipe_config->pipe_bpp, pipe_config->dither); fail: |