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

Commit fb1ee451 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: silence vblank warnings
  drm: silence pointless vblank warning.
  drm: When adding probed modes, preserve duplicate mode types
parents 2e9b11af 6cb504c2

drivers/gpu/drm/drm_irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -566,7 +566,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, 




	ret = drm_vblank_get(dev, crtc);

	ret = drm_vblank_get(dev, crtc);

	if (ret) {

	if (ret) {

		DRM_ERROR("failed to acquire vblank counter, %d\n", ret);

		DRM_DEBUG("failed to acquire vblank counter, %d\n", ret);

		return ret;

		return ret;

	}

	}

	seq = drm_vblank_count(dev, crtc);

	seq = drm_vblank_count(dev, crtc);

drivers/gpu/drm/drm_modes.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -566,6 +566,8 @@ void drm_mode_connector_list_update(struct drm_connector *connector) 
				found_it = 1;

				found_it = 1;

				/* if equal delete the probed mode */

				/* if equal delete the probed mode */

				mode->status = pmode->status;

				mode->status = pmode->status;

				/* Merge type bits together */

				mode->type |= pmode->type;

				list_del(&pmode->head);

				list_del(&pmode->head);

				drm_mode_destroy(connector->dev, pmode);

				drm_mode_destroy(connector->dev, pmode);

				break;

				break;

drivers/gpu/drm/i915/i915_irq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -190,7 +190,7 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int pipe) 
	low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;

	low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;





	if (!i915_pipe_enabled(dev, pipe)) {

	if (!i915_pipe_enabled(dev, pipe)) {

		DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe);

		DRM_DEBUG("trying to get vblank count for disabled pipe %d\n", pipe);

		return 0;

		return 0;

	}

	}
@@ -219,7 +219,7 @@ u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe) 
	int reg = pipe ? PIPEB_FRMCOUNT_GM45 : PIPEA_FRMCOUNT_GM45;

	int reg = pipe ? PIPEB_FRMCOUNT_GM45 : PIPEA_FRMCOUNT_GM45;





	if (!i915_pipe_enabled(dev, pipe)) {

	if (!i915_pipe_enabled(dev, pipe)) {

		DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe);

		DRM_DEBUG("trying to get vblank count for disabled pipe %d\n", pipe);

		return 0;

		return 0;

	}

	}