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

Commit cc19528b 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:
 "Just driver fixes, nothing major, except maybe the Ironlake rc6
  disable:

   - intel:
     * revert ironlake rc6 - we still have one ilk regression, but this
       gets rid of one big one
     * turn off cloning
     * a directed fix for Apple edp
   - radeon: one modesetting fix
   - exynos: minor fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
  Revert "drm/i915: enable rc6 on ilk again"
  drm/i915: do not default to 18 bpp for eDP if missing from VBT
  drm/exynos: Fix potential NULL pointer dereference in exynos_drm_encoder.c
  drm/exynos: Make exynos4/5_fimd_driver_data static
  drm/exynos: fix overlay updating issue
  drm/exynos: remove unnecessary code.
  drm/exynos: fix linux framebuffer address setting.
  drm/i915: disable cloning on sdvo
parents 50a53bbe e548a83c

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+7 −1
Original line number Diff line number Diff line
@@ -226,6 +226,12 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder) 
	 * already updated or not by exynos_drm_encoder_dpms function.

	 */

	exynos_encoder->updated = true;



	/*

	 * In case of setcrtc, there is no way to update encoder's dpms

	 * so update it here.

	 */

	exynos_encoder->dpms = DRM_MODE_DPMS_ON;

}



static void exynos_drm_encoder_disable(struct drm_encoder *encoder)
@@ -507,6 +513,6 @@ void exynos_drm_encoder_plane_disable(struct drm_encoder *encoder, void *data) 
	 * because the setting for disabling the overlay will be updated

	 * at vsync.

	 */

	if (overlay_ops->wait_for_vblank)

	if (overlay_ops && overlay_ops->wait_for_vblank)

		overlay_ops->wait_for_vblank(manager->dev);

}

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, 


	dev->mode_config.fb_base = (resource_size_t)buffer->dma_addr;

	fbi->screen_base = buffer->kvaddr + offset;

	fbi->fix.smem_start = (unsigned long)(buffer->dma_addr + offset);

	fbi->fix.smem_start = (unsigned long)(page_to_phys(buffer->pages[0]) +

				offset);

	fbi->screen_size = size;

	fbi->fix.smem_len = size;

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+2 −2
Original line number Diff line number Diff line
@@ -61,11 +61,11 @@ struct fimd_driver_data { 
	unsigned int timing_base;

};



struct fimd_driver_data exynos4_fimd_driver_data = {

static struct fimd_driver_data exynos4_fimd_driver_data = {

	.timing_base = 0x0,

};



struct fimd_driver_data exynos5_fimd_driver_data = {

static struct fimd_driver_data exynos5_fimd_driver_data = {

	.timing_base = 0x20000,

};

drivers/gpu/drm/exynos/exynos_drm_plane.c

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
		return ret;



	plane->crtc = crtc;

	plane->fb = crtc->fb;



	exynos_plane_commit(plane);

	exynos_plane_dpms(plane, DRM_MODE_DPMS_ON);

drivers/gpu/drm/i915/intel_bios.c

+2 −9
Original line number Diff line number Diff line
@@ -499,12 +499,8 @@ parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb) 


	edp = find_section(bdb, BDB_EDP);

	if (!edp) {

		if (SUPPORTS_EDP(dev_priv->dev) && dev_priv->edp.support) {

			DRM_DEBUG_KMS("No eDP BDB found but eDP panel "

				      "supported, assume %dbpp panel color "

				      "depth.\n",

				      dev_priv->edp.bpp);

		}

		if (SUPPORTS_EDP(dev_priv->dev) && dev_priv->edp.support)

			DRM_DEBUG_KMS("No eDP BDB found but eDP panel supported.\n");

		return;

	}
@@ -657,9 +653,6 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) 
	dev_priv->lvds_use_ssc = 1;

	dev_priv->lvds_ssc_freq = intel_bios_ssc_frequency(dev, 1);

	DRM_DEBUG_KMS("Set default to SSC at %dMHz\n", dev_priv->lvds_ssc_freq);



	/* eDP data */

	dev_priv->edp.bpp = 18;

}



static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id)