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

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

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "It's like a grab bag of one liners:

  - core: fix page flip error path, reorder object teardown.
  - usb: fix the drm_usb module license.
  - i915: VT switch on SNB with non-native modes fix, and a regression
    fix from 3.3.
  - radeon: missing unreserve on SI, AGP/VRAM setup fix (fixes radeon on
    IA64, but its a generic bug), an rn50 regression from 3.3, turn off
    MSIs on rv515 (it loses rearms every so often)."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  nouveau: Set special lane map for the right chipset
  drm/radeon: fix load detect on rn50 with hardcoded EDIDs.
  drm: Releasing FBs before releasing GEM objects during drm_release
  drm/nouveau/pm: don't read/write beyond end of stack buffer
  drivers: gpu: drm: gma500: mdfld_dsi_output.h: Remove not unneeded include of version.h
  radeon: fix r600/agp when vram is after AGP (v3)
  drm: fix page_flip error handling
  drm/radeon/kms: fix the regression of DVI connector check
  drm/usb: fix module license on drm/usb layer.
  drm/i915: Do not set "Enable Panel Fitter" on SNB pageflips
  drm/i915: Hold mode_config lock whilst changing mode for lastclose()
  drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() v2
  drm/radeon: disable MSI on RV515
  drm/i915: don't clobber the special upscaling lvds timings
parents 9e01297e 273a50fb

drivers/gpu/drm/drm_crtc.c

+6 −4
Original line number Diff line number Diff line
@@ -3335,11 +3335,13 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 


	ret = crtc->funcs->page_flip(crtc, fb, e);

	if (ret) {

		if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) {

			spin_lock_irqsave(&dev->event_lock, flags);

			file_priv->event_space += sizeof e->event;

			spin_unlock_irqrestore(&dev->event_lock, flags);

			kfree(e);

		}

	}



out:

	mutex_unlock(&dev->mode_config.mutex);

drivers/gpu/drm/drm_fops.c

+3 −3
Original line number Diff line number Diff line
@@ -507,12 +507,12 @@ int drm_release(struct inode *inode, struct file *filp) 


	drm_events_release(file_priv);



	if (dev->driver->driver_features & DRIVER_GEM)

		drm_gem_release(dev, file_priv);



	if (dev->driver->driver_features & DRIVER_MODESET)

		drm_fb_release(file_priv);



	if (dev->driver->driver_features & DRIVER_GEM)

		drm_gem_release(dev, file_priv);



	mutex_lock(&dev->ctxlist_mutex);

	if (!list_empty(&dev->ctxlist)) {

		struct drm_ctx_list *pos, *n;

drivers/gpu/drm/drm_usb.c

+5 −1
Original line number Diff line number Diff line 
#include "drmP.h"

#include <linux/usb.h>

#include <linux/export.h>

#include <linux/module.h>



int drm_get_usb_dev(struct usb_interface *interface,

		    const struct usb_device_id *id,
@@ -114,3 +114,7 @@ void drm_usb_exit(struct drm_driver *driver, 
	usb_deregister(udriver);

}

EXPORT_SYMBOL(drm_usb_exit);



MODULE_AUTHOR("David Airlie");

MODULE_DESCRIPTION("USB DRM support");

MODULE_LICENSE("GPL and additional rights");

drivers/gpu/drm/gma500/mdfld_dsi_output.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#define __MDFLD_DSI_OUTPUT_H__



#include <linux/backlight.h>

#include <linux/version.h>

#include <drm/drmP.h>

#include <drm/drm.h>

#include <drm/drm_crtc.h>

drivers/gpu/drm/i915/intel_display.c

+12 −3
Original line number Diff line number Diff line
@@ -3478,7 +3478,10 @@ static bool intel_crtc_mode_fixup(struct drm_crtc *crtc, 
			return false;

	}



	/* All interlaced capable intel hw wants timings in frames. */

	/* All interlaced capable intel hw wants timings in frames. Note though

	 * that intel_lvds_mode_fixup does some funny tricks with the crtc

	 * timings, so we need to be careful not to clobber these.*/

	if (!(adjusted_mode->private_flags & INTEL_MODE_CRTC_TIMINGS_SET))

		drm_mode_set_crtcinfo(adjusted_mode, 0);



	return true;
@@ -7465,7 +7468,13 @@ static int intel_gen6_queue_flip(struct drm_device *dev, 
	OUT_RING(fb->pitches[0] | obj->tiling_mode);

	OUT_RING(obj->gtt_offset);



	pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;

	/* Contrary to the suggestions in the documentation,

	 * "Enable Panel Fitter" does not seem to be required when page

	 * flipping with a non-native mode, and worse causes a normal

	 * modeset to fail.

	 * pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;

	 */

	pf = 0;

	pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;

	OUT_RING(pf | pipesrc);

	ADVANCE_LP_RING();