diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 09:31:49 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 15:01:53 +0300 |
| commit | 0b076ecdf343b029c4c2c3a94ffd0199d97aa46c (patch) | |
| tree | 38407c97a7f90cb46a9e8c487676a65ce2ed9209 /drivers/gpu/drm/i915/intel_csr.c | |
| parent | c82435bbe5aca62fc54615ff8ba78134bfa33866 (diff) | |
| parent | 9eb1e57f564d4e6e10991402726cc83fe0b9172f (diff) | |
| download | linux-0b076ecdf343b029c4c2c3a94ffd0199d97aa46c.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next because the conflict between Ander's atomic fixes
for 4.2 and Maartens future work are getting to unwielding to handle.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.h
Just always take ours, same as git merge -X ours, but done by hand
because I didn't trust git: It's confusing that it doesn't show any
conflicts in the merge diff at all.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_csr.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_csr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index 2cf25ee8a268..6d8a7bf06dfc 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -41,7 +41,7 @@ * be moved to FW_FAILED. */ -#define I915_CSR_SKL "i915/skl_dmc_ver4.bin" +#define I915_CSR_SKL "i915/skl_dmc_ver1.bin" MODULE_FIRMWARE(I915_CSR_SKL); |