Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd080ee5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: fix bpc vs. bpp confusion in intel_crtc_compute_config 



Oops.

This regression has been introduced in

commit 5d2d38dd
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Wed Mar 27 00:45:01 2013 +0100

    drm/i915: clean up pipe bpp confusion

Reported-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3b117c8f

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -4003,9 +4003,9 @@ static bool intel_crtc_compute_config(struct drm_crtc *crtc, 
		adjusted_mode->hsync_start == adjusted_mode->hdisplay)

		return false;



	if ((IS_G4X(dev) || IS_VALLEYVIEW(dev)) && pipe_config->pipe_bpp > 10) {

	if ((IS_G4X(dev) || IS_VALLEYVIEW(dev)) && pipe_config->pipe_bpp > 10*3) {

		pipe_config->pipe_bpp = 10*3; /* 12bpc is gen5+ */

	} else if (INTEL_INFO(dev)->gen <= 4 && pipe_config->pipe_bpp > 8) {

	} else if (INTEL_INFO(dev)->gen <= 4 && pipe_config->pipe_bpp > 8*3) {

		/* only a 8bpc pipe, with 6bpc dither through the panel fitter

		 * for lvds. */

		pipe_config->pipe_bpp = 8*3;