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

Commit 5aa7d52a authored by Chris Wilson's avatar Chris Wilson
Browse files

Merge branch 'drm-intel-fixes' into drm-intel-next 

Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	include/drm/i915_drm.h
parents 382ab78c bbf0c6b3

drivers/char/agp/intel-gtt.c

+4 −2
Original line number Diff line number Diff line
@@ -721,8 +721,10 @@ static int intel_fake_agp_fetch_size(void) 


static void i830_cleanup(void)

{

	kunmap(intel_private.i8xx_page);

	if (intel_private.i8xx_flush_page) {

		kunmap(intel_private.i8xx_flush_page);

		intel_private.i8xx_flush_page = NULL;

	}



	__free_page(intel_private.i8xx_page);

	intel_private.i8xx_page = NULL;

drivers/gpu/drm/i915/i915_dma.c

+3 −0
Original line number Diff line number Diff line
@@ -775,6 +775,9 @@ static int i915_getparam(struct drm_device *dev, void *data, 
	case I915_PARAM_HAS_RELAXED_FENCING:

		value = 1;

		break;

	case I915_PARAM_HAS_COHERENT_RINGS:

		value = 1;

		break;

	default:

		DRM_DEBUG_DRIVER("Unknown parameter %d\n",

				 param->param);

include/drm/i915_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ typedef struct drm_i915_irq_wait { 
#define I915_PARAM_HAS_BSD		 10

#define I915_PARAM_HAS_BLT		 11

#define I915_PARAM_HAS_RELAXED_FENCING	 12

#define I915_PARAM_HAS_COHERENT_RINGS	 13



typedef struct drm_i915_getparam {

	int param;