Merge "drm/fb-helper: Move out modeset config code" (08eb85d0) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/drm_auth.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -334,3 +334,23 @@ void drm_master_put(struct drm_master **master)
		*master = NULL;
		}
		EXPORT_SYMBOL(drm_master_put);

		/* Used by drm_client and drm_fb_helper */
		bool drm_master_internal_acquire(struct drm_device *dev)
		{
		mutex_lock(&dev->master_mutex);
		if (dev->master) {
		mutex_unlock(&dev->master_mutex);
		return false;
		}

		return true;
		}
		EXPORT_SYMBOL(drm_master_internal_acquire);

		/* Used by drm_client and drm_fb_helper */
		void drm_master_internal_release(struct drm_device *dev)
		{
		mutex_unlock(&dev->master_mutex);
		}
		EXPORT_SYMBOL(drm_master_internal_release);

drivers/gpu/drm/drm_client_modeset.c

+916 −6

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/drm_internal.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,8 @@ int drm_dropmaster_ioctl(struct drm_device dev, void data,
		struct drm_file *file_priv);
		int drm_master_open(struct drm_file *file_priv);
		void drm_master_release(struct drm_file *file_priv);

		bool drm_master_internal_acquire(struct drm_device *dev);
		void drm_master_internal_release(struct drm_device *dev);
		/* drm_sysfs.c */
		extern struct class *drm_class;

drivers/gpu/drm/drm_modes.c

+104 −28

Original line number	Diff line number	Diff line
		@@ -922,17 +922,69 @@ struct drm_display_mode drm_mode_duplicate(struct drm_device dev,
		}
		EXPORT_SYMBOL(drm_mode_duplicate);

		static bool drm_mode_match_timings(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		return mode1->hdisplay == mode2->hdisplay &&
		mode1->hsync_start == mode2->hsync_start &&
		mode1->hsync_end == mode2->hsync_end &&
		mode1->htotal == mode2->htotal &&
		mode1->hskew == mode2->hskew &&
		mode1->vdisplay == mode2->vdisplay &&
		mode1->vsync_start == mode2->vsync_start &&
		mode1->vsync_end == mode2->vsync_end &&
		mode1->vtotal == mode2->vtotal &&
		mode1->vscan == mode2->vscan;
		}

		static bool drm_mode_match_clock(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		/*
		* do clock check convert to PICOS
		* so fb modes get matched the same
		*/
		if (mode1->clock && mode2->clock)
		return KHZ2PICOS(mode1->clock) == KHZ2PICOS(mode2->clock);
		else
		return mode1->clock == mode2->clock;
		}

		static bool drm_mode_match_flags(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		return (mode1->flags & ~DRM_MODE_FLAG_3D_MASK) ==
		(mode2->flags & ~DRM_MODE_FLAG_3D_MASK);
		}

		static bool drm_mode_match_3d_flags(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		return (mode1->flags & DRM_MODE_FLAG_3D_MASK) ==
		(mode2->flags & DRM_MODE_FLAG_3D_MASK);
		}

		static bool drm_mode_match_aspect_ratio(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		return mode1->picture_aspect_ratio == mode2->picture_aspect_ratio;
		}

		/**
		* drm_mode_equal - test modes for equality
		* drm_mode_match - test modes for (partial) equality
		* @mode1: first mode
		* @mode2: second mode
		* @match_flags: which parts need to match (DRM_MODE_MATCH_*)
		*
		* Check to see if @mode1 and @mode2 are equivalent.
		*
		* Returns:
		* True if the modes are equal, false otherwise.
		* True if the modes are (partially) equal, false otherwise.
		*/
		bool drm_mode_equal(const struct drm_display_mode mode1, const struct drm_display_mode mode2)
		bool drm_mode_match(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2,
		unsigned int match_flags)

		{
		if (!mode1 && !mode2)
		return true;
		@@ -940,15 +992,48 @@ bool drm_mode_equal(const struct drm_display_mode *mode1, const struct drm_displ
		if (!mode1 \|\| !mode2)
		return false;

		/* do clock check convert to PICOS so fb modes get matched
		* the same */
		if (mode1->clock && mode2->clock) {
		if (KHZ2PICOS(mode1->clock) != KHZ2PICOS(mode2->clock))
		if (match_flags & DRM_MODE_MATCH_TIMINGS &&
		!drm_mode_match_timings(mode1, mode2))
		return false;
		} else if (mode1->clock != mode2->clock)

		if (match_flags & DRM_MODE_MATCH_CLOCK &&
		!drm_mode_match_clock(mode1, mode2))
		return false;

		if (match_flags & DRM_MODE_MATCH_FLAGS &&
		!drm_mode_match_flags(mode1, mode2))
		return false;

		if (match_flags & DRM_MODE_MATCH_3D_FLAGS &&
		!drm_mode_match_3d_flags(mode1, mode2))
		return false;

		return drm_mode_equal_no_clocks(mode1, mode2);
		if (match_flags & DRM_MODE_MATCH_ASPECT_RATIO &&
		!drm_mode_match_aspect_ratio(mode1, mode2))
		return false;

		return true;
		}
		EXPORT_SYMBOL(drm_mode_match);

		/**
		* drm_mode_equal - test modes for equality
		* @mode1: first mode
		* @mode2: second mode
		*
		* Check to see if @mode1 and @mode2 are equivalent.
		*
		* Returns:
		* True if the modes are equal, false otherwise.
		*/
		bool drm_mode_equal(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		return drm_mode_match(mode1, mode2,
		DRM_MODE_MATCH_TIMINGS \|
		DRM_MODE_MATCH_CLOCK \|
		DRM_MODE_MATCH_FLAGS \|
		DRM_MODE_MATCH_3D_FLAGS);
		}
		EXPORT_SYMBOL(drm_mode_equal);

		@@ -963,13 +1048,17 @@ EXPORT_SYMBOL(drm_mode_equal);
		* Returns:
		* True if the modes are equal, false otherwise.
		*/
		bool drm_mode_equal_no_clocks(const struct drm_display_mode mode1, const struct drm_display_mode mode2)
		bool drm_mode_equal_no_clocks(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		if ((mode1->flags & DRM_MODE_FLAG_3D_MASK) !=
		(mode2->flags & DRM_MODE_FLAG_3D_MASK))
		return false;

		return drm_mode_equal_no_clocks_no_stereo(mode1, mode2);
		return drm_mode_match(mode1, mode2,
		DRM_MODE_MATCH_TIMINGS \|
		DRM_MODE_MATCH_FLAGS \|
		DRM_MODE_MATCH_3D_FLAGS);
		}
		EXPORT_SYMBOL(drm_mode_equal_no_clocks);

		@@ -987,22 +1076,9 @@ EXPORT_SYMBOL(drm_mode_equal_no_clocks);
		bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1,
		const struct drm_display_mode *mode2)
		{
		if (mode1->hdisplay == mode2->hdisplay &&
		mode1->hsync_start == mode2->hsync_start &&
		mode1->hsync_end == mode2->hsync_end &&
		mode1->htotal == mode2->htotal &&
		mode1->hskew == mode2->hskew &&
		mode1->vdisplay == mode2->vdisplay &&
		mode1->vsync_start == mode2->vsync_start &&
		mode1->vsync_end == mode2->vsync_end &&
		mode1->vtotal == mode2->vtotal &&
		mode1->vscan == mode2->vscan &&
		mode1->picture_aspect_ratio == mode2->picture_aspect_ratio &&
		(mode1->flags & ~DRM_MODE_FLAG_3D_MASK) ==
		(mode2->flags & ~DRM_MODE_FLAG_3D_MASK))
		return true;

		return false;
		return drm_mode_match(mode1, mode2,
		DRM_MODE_MATCH_TIMINGS \|
		DRM_MODE_MATCH_FLAGS);
		}
		EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo);

include/drm/drmP.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -922,12 +922,36 @@ struct drm_device {
		#define DRM_SWITCH_POWER_CHANGING 2
		#define DRM_SWITCH_POWER_DYNAMIC_OFF 3

		/**
		* drm_core_check_feature - check driver feature flags
		* @dev: DRM device to check
		* @feature: feature flag
		*
		* This checks @dev for driver features, see &drm_driver.driver_features and the
		* various DRIVER_\* flags.
		*
		* Returns true if the @feature is supported, false otherwise.
		*/
		static __inline__ int drm_core_check_feature(struct drm_device *dev,
		int feature)
		{
		return ((dev->driver->driver_features & feature) ? 1 : 0);
		}

		/**
		* drm_drv_uses_atomic_modeset - check if the driver implements
		* atomic_commit()
		* @dev: DRM device
		*
		* This check is useful if drivers do not have DRIVER_ATOMIC set but
		* have atomic modesetting internally implemented.
		*/
		static __inline__ int drm_drv_uses_atomic_modeset(struct drm_device *dev)
		{
		return drm_core_check_feature(dev, DRIVER_ATOMIC) \|\|
		dev->mode_config.funcs->atomic_commit != NULL;
		}

		static inline void drm_device_set_unplugged(struct drm_device *dev)
		{
		smp_wmb();