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

Commit 2d4df13c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2015-09-25' of git://anongit.freedesktop.org/drm-intel into drm-next 

Another attempt at drm-misc for 4.4 ...
- better atomic helpers for runtime pm drivers
- atomic fbdev
- dp aux i2c STATUS_UPDATE handling (for short i2c replies from the sink)
- bunch of constify patches
- inital kerneldoc for vga switcheroo
- some vblank code cleanups from Ville and Thierry
- various polish all over

* tag 'topic/drm-misc-2015-09-25' of git://anongit.freedesktop.org/drm-intel: (57 commits)
  drm/irq: Add drm_crtc_vblank_count_and_time()
  drm/irq: Rename drm_crtc -> crtc
  drm: drm_atomic_crtc_get_property should be static
  drm/gma500: Remove DP_LINK_STATUS_SIZE redefinition
  vga_switcheroo: Set active attribute to false for audio clients
  drm/core: Preserve the fb id on close.
  drm/core: Preserve the framebuffer after removing it.
  drm: Use vblank timestamps to guesstimate how many vblanks were missed
  drm: store_vblank() is never called with NULL timestamp
  drm: Clean up drm_calc_vbltimestamp_from_scanoutpos() vbl_status
  drm: Limit the number of .get_vblank_counter() retries
  drm: Pass flags to drm_update_vblank_count()
  drm/i915: Fix vblank count variable types
  drm: Kill pixeldur_ns
  drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps
  drm: Move timestamping constants into drm_vblank_crtc
  drm/fbdev: Update legacy plane->fb refcounting for atomic restore
  drm: fix kernel-doc warnings in drm_crtc.h
  vga_switcheroo: Sort headers alphabetically
  drm: Spell vga_switcheroo consistently
  ...
parents 9ffecb10 cf648305

Documentation/DocBook/drm.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -3646,7 +3646,7 @@ void (*postclose) (struct drm_device *, struct drm_file *);</synopsis> 
	plane properties to default value, so that a subsequent open of the

	device will not inherit state from the previous user. It can also be

	used to execute delayed power switching state changes, e.g. in

	conjunction with the vga-switcheroo infrastructure. Beyond that KMS

	conjunction with the vga_switcheroo infrastructure. Beyond that KMS

	drivers should not do any further cleanup. Only legacy UMS drivers might

	need to clean up device state so that the vga console or an independent

	fbdev driver could take over.

Documentation/kernel-parameters.txt

+9 −6
Original line number Diff line number Diff line
@@ -929,11 +929,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			The filter can be disabled or changed to another

			driver later using sysfs.



	drm_kms_helper.edid_firmware=[<connector>:]<file>

			Broken monitors, graphic adapters and KVMs may

			send no or incorrect EDID data sets. This parameter

			allows to specify an EDID data set in the

			/lib/firmware directory that is used instead.

	drm_kms_helper.edid_firmware=[<connector>:]<file>[,[<connector>:]<file>]

			Broken monitors, graphic adapters, KVMs and EDIDless

			panels may send no or incorrect EDID data sets.

			This parameter allows to specify an EDID data sets

			in the /lib/firmware directory that are used instead.

			Generic built-in EDID data sets are used, if one of

			edid/1024x768.bin, edid/1280x1024.bin,

			edid/1680x1050.bin, or edid/1920x1080.bin is given
@@ -942,7 +942,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			available in Documentation/EDID/HOWTO.txt. An EDID

			data set will only be used for a particular connector,

			if its name and a colon are prepended to the EDID

			name.

			name. Each connector may use a unique EDID data

			set by separating the files with a comma.  An EDID

			data set with no connector name will be used for

			any connectors not explicitly specified.



	dscc4.setup=	[NET]

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

+6 −5
Original line number Diff line number Diff line
@@ -745,7 +745,8 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc, 
 *

 */

int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int flags,

			       int *vpos, int *hpos, ktime_t *stime, ktime_t *etime)

			       int *vpos, int *hpos, ktime_t *stime, ktime_t *etime,

			       const struct drm_display_mode *mode)

{

	u32 vbl = 0, position = 0;

	int vbl_start, vbl_end, vtotal, ret = 0;
@@ -781,7 +782,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl 
	}

	else {

		/* No: Fake something reasonable which gives at least ok results. */

		vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay;

		vbl_start = mode->crtc_vdisplay;

		vbl_end = 0;

	}
@@ -797,7 +798,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl 


	/* Inside "upper part" of vblank area? Apply corrective offset if so: */

	if (in_vbl && (*vpos >= vbl_start)) {

		vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal;

		vtotal = mode->crtc_vtotal;

		*vpos = *vpos - vtotal;

	}
@@ -819,8 +820,8 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl 
	 * We only do this if DRM_CALLED_FROM_VBLIRQ.

	 */

	if ((flags & DRM_CALLED_FROM_VBLIRQ) && !in_vbl) {

		vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay;

		vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal;

		vbl_start = mode->crtc_vdisplay;

		vtotal = mode->crtc_vtotal;



		if (vbl_start - *vpos < vtotal / 100) {

			*vpos -= vtotal;

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

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ int amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, int crtc, 
	/* Helper routine in DRM core does all the work: */

	return drm_calc_vbltimestamp_from_scanoutpos(dev, crtc, max_error,

						     vblank_time, flags,

						     drmcrtc, &drmcrtc->hwmode);

						     &drmcrtc->hwmode);

}



const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {

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

+2 −1
Original line number Diff line number Diff line
@@ -543,7 +543,8 @@ void amdgpu_encoder_set_active_device(struct drm_encoder *encoder); 
int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc,

				      unsigned int flags,

				      int *vpos, int *hpos, ktime_t *stime,

				      ktime_t *etime);

				      ktime_t *etime,

				      const struct drm_display_mode *mode);



int amdgpu_framebuffer_init(struct drm_device *dev,

			     struct amdgpu_framebuffer *rfb,