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

Commit ab3e67f4 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915: warn about invalid pfit modes 



We prevent invalid ones from getting here in the first place, but it
doesn't hurt to have an extra sanity check.

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

drivers/gpu/drm/i915/intel_panel.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc, 
			struct intel_crtc_config *pipe_config,

			struct intel_crtc_config *pipe_config,

			int fitting_mode)

			int fitting_mode)

{

{

	struct drm_i915_private *dev_priv = intel_crtc->base.dev->dev_private;

	struct drm_display_mode *mode, *adjusted_mode;

	struct drm_display_mode *mode, *adjusted_mode;

	int x, y, width, height;

	int x, y, width, height;
@@ -107,12 +106,15 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc, 
		}

		}

		break;

		break;





	default:

	case DRM_MODE_SCALE_FULLSCREEN:

	case DRM_MODE_SCALE_FULLSCREEN:

		x = y = 0;

		x = y = 0;

		width = adjusted_mode->hdisplay;

		width = adjusted_mode->hdisplay;

		height = adjusted_mode->vdisplay;

		height = adjusted_mode->vdisplay;

		break;

		break;



	default:

		WARN(1, "bad panel fit mode: %d\n", fitting_mode);

		return;

	}

	}





done:

done:
@@ -267,7 +269,6 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, 
			}

			}

		}

		}

		break;

		break;

	default:

	case DRM_MODE_SCALE_FULLSCREEN:

	case DRM_MODE_SCALE_FULLSCREEN:

		/*

		/*

		 * Full scaling, even if it changes the aspect ratio.

		 * Full scaling, even if it changes the aspect ratio.
@@ -285,6 +286,9 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, 
						 HORIZ_INTERP_BILINEAR);

						 HORIZ_INTERP_BILINEAR);

		}

		}

		break;

		break;

	default:

		WARN(1, "bad panel fit mode: %d\n", fitting_mode);

		return;

	}

	}





	/* 965+ wants fuzzy fitting */

	/* 965+ wants fuzzy fitting */