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

Commit 7547af91 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2015-02-14' of git://anongit.freedesktop.org/drm-intel into drm-next 

- use the atomic helpers for plane_upate/disable hooks (Matt Roper)
- refactor the initial plane config code (Damien)
- ppgtt prep patches for dynamic pagetable alloc (Ben Widawsky, reworked and
  rebased by a lot of other people)
- framebuffer modifier support from Tvrtko Ursulin, drm core code from Rob Clark
- piles of workaround patches for skl from Damien and Nick Hoath
- vGPU support for xengt on the client side (Yu Zhang)
- and the usual smaller things all over

* tag 'drm-intel-next-2015-02-14' of git://anongit.freedesktop.org/drm-intel: (88 commits)
  drm/i915: Update DRIVER_DATE to 20150214
  drm/i915: Remove references to previously removed UMS config option
  drm/i915/skl: Use a LRI for WaDisableDgMirrorFixInHalfSliceChicken5
  drm/i915/skl: Fix always true comparison in a revision id check
  drm/i915/skl: Implement WaEnableLbsSlaRetryTimerDecrement
  drm/i915/skl: Implement WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
  drm/i915: Add process identifier to requests
  drm/i915/skl: Implement WaBarrierPerformanceFixDisable
  drm/i915/skl: Implement WaCcsTlbPrefetchDisable:skl
  drm/i915/skl: Implement WaDisableChickenBitTSGBarrierAckForFFSliceCS
  drm/i915/skl: Implement WaDisableHDCInvalidation
  drm/i915/skl: Implement WaDisableLSQCROPERFforOCL
  drm/i915/skl: Implement WaDisablePartialResolveInVc
  drm/i915/skl: Introduce a SKL specific init_workarounds()
  drm/i915/skl: Document that we implement WaRsClearFWBitsAtReset
  drm/i915/skl: Implement WaSetGAPSunitClckGateDisable
  drm/i915/skl: Make the init clock gating function skylake specific
  drm/i915/skl: Provide a gen9 specific init_render_ring()
  drm/i915/skl: Document the WM read latency W/A with its name
  drm/i915/skl: Also detect eDRAM on SKL
  ...
parents 87dc8b6c d4495cba

Documentation/DocBook/drm.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -3979,6 +3979,11 @@ int num_ioctls;</synopsis> 
!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_disable_interrupts

!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_enable_interrupts

      </sect2>

      <sect2>

        <title>Intel GVT-g Guest Support(vGPU)</title>

!Pdrivers/gpu/drm/i915/i915_vgpu.c Intel GVT-g guest support

!Idrivers/gpu/drm/i915/i915_vgpu.c

      </sect2>

    </sect1>

    <sect1>

      <title>Display Hardware Handling</title>

drivers/gpu/drm/drm_crtc.c

+13 −1
Original line number Diff line number Diff line
@@ -3272,6 +3272,12 @@ static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) 
			DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);

			return -EINVAL;

		}



		if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) {

			DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n",

				      r->modifier[i], i);

			return -EINVAL;

		}

	}



	return 0;
@@ -3285,7 +3291,7 @@ static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev, 
	struct drm_framebuffer *fb;

	int ret;



	if (r->flags & ~DRM_MODE_FB_INTERLACED) {

	if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) {

		DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags);

		return ERR_PTR(-EINVAL);

	}
@@ -3301,6 +3307,12 @@ static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev, 
		return ERR_PTR(-EINVAL);

	}



	if (r->flags & DRM_MODE_FB_MODIFIERS &&

	    !dev->mode_config.allow_fb_modifiers) {

		DRM_DEBUG_KMS("driver does not support fb modifiers\n");

		return ERR_PTR(-EINVAL);

	}



	ret = framebuffer_check(r);

	if (ret)

		return ERR_PTR(ret);

drivers/gpu/drm/drm_crtc_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, 
	for (i = 0; i < 4; i++) {

		fb->pitches[i] = mode_cmd->pitches[i];

		fb->offsets[i] = mode_cmd->offsets[i];

		fb->modifier[i] = mode_cmd->modifier[i];

	}

	drm_fb_get_bpp_depth(mode_cmd->pixel_format, &fb->depth,

				    &fb->bits_per_pixel);

drivers/gpu/drm/drm_ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -321,6 +321,9 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ 
		else

			req->value = 64;

		break;

	case DRM_CAP_ADDFB2_MODIFIERS:

		req->value = dev->mode_config.allow_fb_modifiers;

		break;

	default:

		return -EINVAL;

	}

drivers/gpu/drm/i915/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ i915-y += dvo_ch7017.o \ 
	  intel_sdvo.o \

	  intel_tv.o



# virtual gpu code

i915-y += i915_vgpu.o



# legacy horrors

i915-y += i915_dma.o \

	  i915_ums.o