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

Commit 3e70292c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/modes: drop maxPitch from drm_mode_validate_size 



Totally unused and actually redundant with maxX for display mode
validation. The fb helper otoh needs to check pitch limits,
but that is delegated into drivers instead.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ba0c2422

drivers/gpu/drm/drm_crtc_helper.c

+1 −2
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
	drm_mode_connector_list_update(connector);



	if (maxX && maxY)

		drm_mode_validate_size(dev, &connector->modes, maxX,

				       maxY, 0);

		drm_mode_validate_size(dev, &connector->modes, maxX, maxY);



	if (connector->interlace_allowed)

		mode_flags |= DRM_MODE_FLAG_INTERLACE;

drivers/gpu/drm/drm_modes.c

+1 −5
Original line number Diff line number Diff line
@@ -889,7 +889,6 @@ EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo); 
 * @mode_list: list of modes to check

 * @maxX: maximum width

 * @maxY: maximum height

 * @maxPitch: max pitch

 *

 * The DRM device (@dev) has size and pitch limits.  Here we validate the

 * modes we probed for @dev against those limits and set their status as
@@ -897,14 +896,11 @@ EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo); 
 */

void drm_mode_validate_size(struct drm_device *dev,

			    struct list_head *mode_list,

			    int maxX, int maxY, int maxPitch)

			    int maxX, int maxY)

{

	struct drm_display_mode *mode;



	list_for_each_entry(mode, mode_list, head) {

		if (maxPitch > 0 && mode->hdisplay > maxPitch)

			mode->status = MODE_BAD_WIDTH;



		if (maxX > 0 && mode->hdisplay > maxX)

			mode->status = MODE_VIRTUAL_X;

include/drm/drm_modes.h

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1, 
/* for use by the crtc helper probe functions */

void drm_mode_validate_size(struct drm_device *dev,

			    struct list_head *mode_list,

			    int maxX, int maxY, int maxPitch);

			    int maxX, int maxY);

void drm_mode_prune_invalid(struct drm_device *dev,

			    struct list_head *mode_list, bool verbose);

void drm_mode_sort(struct list_head *mode_list);