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

Commit 012bbe28 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-01-30' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

Another round of -misc stuff:
- Noralf debugfs cleanup cleanup (not yet everything, some more driver
  patches awaiting acks).
- More doc work.
- edid/infoframe fixes from Ville.
- misc 1-patch fixes all over, as usual

Noralf needs this for his tinydrm pull request.

* tag 'drm-misc-next-2017-01-30' of git://anongit.freedesktop.org/git/drm-misc: (48 commits)
  drm/vc4: Remove vc4_debugfs_cleanup()
  dma/fence: Export enable-signaling tracepoint for emission by drivers
  drm/tilcdc: Remove tilcdc_debugfs_cleanup()
  drm/tegra: Remove tegra_debugfs_cleanup()
  drm/sti: Remove drm_debugfs_remove_files() calls
  drm/radeon: Remove drm_debugfs_remove_files() call
  drm/omap: Remove omap_debugfs_cleanup()
  drm/hdlcd: Remove hdlcd_debugfs_cleanup()
  drm/etnaviv: Remove etnaviv_debugfs_cleanup()
  drm/etnaviv: allow build with COMPILE_TEST
  drm/amd/amdgpu: Remove drm_debugfs_remove_files() call
  drm/prime: Clarify DMA-BUF/GEM Object lifetime
  drm/ttm: Make sure BOs being swapped out are cacheable
  drm/atomic: Remove drm_atomic_debugfs_cleanup()
  drm: drm_minor_register(): Clean up debugfs on failure
  drm: debugfs: Remove all files automatically on cleanup
  drm/fourcc: add vivante tiled layout format modifiers
  drm/edid: Set YQ bits in the AVI infoframe according to CEA-861-F
  drm/edid: Set AVI infoframe Q even when QS=0
  drm/edid: Introduce drm_hdmi_avi_infoframe_quant_range()
  ...
parents bb7e9833 55d66165

Documentation/gpu/drm-kms.rst

+7 −1
Original line number Diff line number Diff line
@@ -48,11 +48,17 @@ CRTC Abstraction 
================



.. kernel-doc:: drivers/gpu/drm/drm_crtc.c

   :export:

   :doc: overview



CRTC Functions Reference

--------------------------------



.. kernel-doc:: include/drm/drm_crtc.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_crtc.c

   :export:



Frame Buffer Abstraction

========================

drivers/dma-buf/dma-fence.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


EXPORT_TRACEPOINT_SYMBOL(dma_fence_annotate_wait_on);

EXPORT_TRACEPOINT_SYMBOL(dma_fence_emit);

EXPORT_TRACEPOINT_SYMBOL(dma_fence_enable_signal);



/*

 * fence context counter: each execution context should have its own

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,6 @@ int amdgpu_debugfs_fence_init(struct amdgpu_device *adev); 


#if defined(CONFIG_DEBUG_FS)

int amdgpu_debugfs_init(struct drm_minor *minor);

void amdgpu_debugfs_cleanup(struct drm_minor *minor);

#endif



int amdgpu_debugfs_firmware_init(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+0 −20
Original line number Diff line number Diff line
@@ -1852,8 +1852,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	return r;

}



static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev);



/**

 * amdgpu_device_fini - tear down the driver

 *
@@ -1893,7 +1891,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
	if (adev->asic_type >= CHIP_BONAIRE)

		amdgpu_doorbell_fini(adev);

	amdgpu_debugfs_regs_cleanup(adev);

	amdgpu_debugfs_remove_files(adev);

}
@@ -2507,19 +2504,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev, 
	return 0;

}



static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev)

{

#if defined(CONFIG_DEBUG_FS)

	unsigned i;



	for (i = 0; i < adev->debugfs_count; i++) {

		drm_debugfs_remove_files(adev->debugfs[i].files,

					 adev->debugfs[i].num_files,

					 adev->ddev->primary);

	}

#endif

}



#if defined(CONFIG_DEBUG_FS)



static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf,
@@ -3153,10 +3137,6 @@ int amdgpu_debugfs_init(struct drm_minor *minor) 
{

	return 0;

}



void amdgpu_debugfs_cleanup(struct drm_minor *minor)

{

}

#else

static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev)

{

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -686,7 +686,6 @@ static struct drm_driver kms_driver = { 
	    DRIVER_USE_AGP |

	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |

	    DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,

	.dev_priv_size = 0,

	.load = amdgpu_driver_load_kms,

	.open = amdgpu_driver_open_kms,

	.preclose = amdgpu_driver_preclose_kms,
@@ -701,7 +700,6 @@ static struct drm_driver kms_driver = { 
	.get_scanout_position = amdgpu_get_crtc_scanoutpos,

#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = amdgpu_debugfs_init,

	.debugfs_cleanup = amdgpu_debugfs_cleanup,

#endif

	.irq_preinstall = amdgpu_irq_preinstall,

	.irq_postinstall = amdgpu_irq_postinstall,