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

Commit 03d8f540 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm intel and exynos fixes from Dave Airlie:
 "A bunch of fixes for Intel and exynos, nothing too major, a new intel
  PCI ID, and a fix for CRT detection."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler
  char/agp: add another Ironlake host bridge
  drm/i915: fix up ivb plane 3 pageflips
  drm/exynos: fixed blending for hdmi graphic layer
  drm/exynos: Remove dummy encoder get_crtc operation implementation
  drm/exynos: Keep a reference to frame buffer GEM objects
  drm/exynos: Don't cast GEM object to Exynos GEM object when not needed
  drm/exynos: DRIVER_BUS_PLATFORM is not a driver feature
  drm/exynos: fixed size type.
  drm/exynos: Use DRM_FORMAT_{NV12, YUV420} instead of DRM_FORMAT_{NV12M, YUV420M}
  drm/i915: hold forcewake around ring hw init
  drm/i915: Mark the ringbuffers as being in the GTT domain
  drm/i915/crt: Do not rely upon the HPD presence pin
  drm/i915: Reset last_retired_head when resetting ring
parents b1e25f41 2d5c7cd3

drivers/char/agp/intel-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -898,6 +898,7 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_B43_HB),

	ID(PCI_DEVICE_ID_INTEL_B43_1_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D2_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB),

drivers/char/agp/intel-agp.h

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ 
#define PCI_DEVICE_ID_INTEL_G41_HB          0x2E30

#define PCI_DEVICE_ID_INTEL_G41_IG          0x2E32

#define PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB	    0x0040

#define PCI_DEVICE_ID_INTEL_IRONLAKE_D2_HB	    0x0069

#define PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG	    0x0042

#define PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB	    0x0044

#define PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB	    0x0062

drivers/gpu/drm/exynos/exynos_drm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -244,8 +244,8 @@ static const struct file_operations exynos_drm_driver_fops = { 
};



static struct drm_driver exynos_drm_driver = {

	.driver_features	= DRIVER_HAVE_IRQ | DRIVER_BUS_PLATFORM |

				  DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,

	.driver_features	= DRIVER_HAVE_IRQ | DRIVER_MODESET |

					DRIVER_GEM | DRIVER_PRIME,

	.load			= exynos_drm_load,

	.unload			= exynos_drm_unload,

	.open			= exynos_drm_open,

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+0 −7
Original line number Diff line number Diff line
@@ -172,19 +172,12 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder) 
		manager_ops->commit(manager->dev);

}



static struct drm_crtc *

exynos_drm_encoder_get_crtc(struct drm_encoder *encoder)

{

	return encoder->crtc;

}



static struct drm_encoder_helper_funcs exynos_encoder_helper_funcs = {

	.dpms		= exynos_drm_encoder_dpms,

	.mode_fixup	= exynos_drm_encoder_mode_fixup,

	.mode_set	= exynos_drm_encoder_mode_set,

	.prepare	= exynos_drm_encoder_prepare,

	.commit		= exynos_drm_encoder_commit,

	.get_crtc	= exynos_drm_encoder_get_crtc,

};



static void exynos_drm_encoder_destroy(struct drm_encoder *encoder)

drivers/gpu/drm/exynos/exynos_drm_fb.c

+14 −5
Original line number Diff line number Diff line
@@ -51,11 +51,22 @@ struct exynos_drm_fb { 
static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)

{

	struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);

	unsigned int i;



	DRM_DEBUG_KMS("%s\n", __FILE__);



	drm_framebuffer_cleanup(fb);



	for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {

		struct drm_gem_object *obj;



		if (exynos_fb->exynos_gem_obj[i] == NULL)

			continue;



		obj = &exynos_fb->exynos_gem_obj[i]->base;

		drm_gem_object_unreference_unlocked(obj);

	}



	kfree(exynos_fb);

	exynos_fb = NULL;

}
@@ -134,11 +145,11 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
		return ERR_PTR(-ENOENT);

	}



	drm_gem_object_unreference_unlocked(obj);



	fb = exynos_drm_framebuffer_init(dev, mode_cmd, obj);

	if (IS_ERR(fb))

	if (IS_ERR(fb)) {

		drm_gem_object_unreference_unlocked(obj);

		return fb;

	}



	exynos_fb = to_exynos_fb(fb);

	nr = exynos_drm_format_num_buffers(fb->pixel_format);
@@ -152,8 +163,6 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
			return ERR_PTR(-ENOENT);

		}



		drm_gem_object_unreference_unlocked(obj);



		exynos_fb->exynos_gem_obj[i] = to_exynos_gem_obj(obj);

	}