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

Commit 3c169e56 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

A few more fixes for 3.16.  The pageflipping fixes I dropped last week
have finally shaped up so this is mostly fixes for fallout from the
pageflipping code changes.  Also fix a memory leak and a black screen
when restoring the backlight on console unblanking.

* 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Make classic pageflip completion path less racy.
  drm/radeon: Add missing vblank_put in pageflip ioctl error path.
  drm/radeon: Remove redundant fence unref in pageflip path.
  drm/radeon: Complete page flip even if waiting on the BO fence fails
  drm/radeon: Move pinning the BO back to radeon_crtc_page_flip()
  drm/radeon: Prevent too early kms-pageflips triggered by vblank.
  drm/radeon: set default bl level to something reasonable
  drm/radeon: avoid leaking edid data
parents fbb60fe3 5f87e090

drivers/gpu/drm/radeon/atombios_crtc.c

+4 −4
Original line number Diff line number Diff line
@@ -1414,8 +1414,8 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, 
	tmp &= ~EVERGREEN_GRPH_SURFACE_UPDATE_H_RETRACE_EN;

	WREG32(EVERGREEN_GRPH_FLIP_CONTROL + radeon_crtc->crtc_offset, tmp);



	/* set pageflip to happen anywhere in vblank interval */

	WREG32(EVERGREEN_MASTER_UPDATE_MODE + radeon_crtc->crtc_offset, 0);

	/* set pageflip to happen only at start of vblank interval (front porch) */

	WREG32(EVERGREEN_MASTER_UPDATE_MODE + radeon_crtc->crtc_offset, 3);



	if (!atomic && fb && fb != crtc->primary->fb) {

		radeon_fb = to_radeon_framebuffer(fb);
@@ -1614,8 +1614,8 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc, 
	tmp &= ~AVIVO_D1GRPH_SURFACE_UPDATE_H_RETRACE_EN;

	WREG32(AVIVO_D1GRPH_FLIP_CONTROL + radeon_crtc->crtc_offset, tmp);



	/* set pageflip to happen anywhere in vblank interval */

	WREG32(AVIVO_D1MODE_MASTER_UPDATE_MODE + radeon_crtc->crtc_offset, 0);

	/* set pageflip to happen only at start of vblank interval (front porch) */

	WREG32(AVIVO_D1MODE_MASTER_UPDATE_MODE + radeon_crtc->crtc_offset, 3);



	if (!atomic && fb && fb != crtc->primary->fb) {

		radeon_fb = to_radeon_framebuffer(fb);

drivers/gpu/drm/radeon/atombios_encoders.c

+7 −3
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, 
	struct backlight_properties props;

	struct radeon_backlight_privdata *pdata;

	struct radeon_encoder_atom_dig *dig;

	u8 backlight_level;

	char bl_name[16];



	/* Mac laptops with multiple GPUs use the gmux driver for backlight
@@ -222,12 +221,17 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, 


	pdata->encoder = radeon_encoder;



	backlight_level = radeon_atom_get_backlight_level_from_reg(rdev);



	dig = radeon_encoder->enc_priv;

	dig->bl_dev = bd;



	bd->props.brightness = radeon_atom_backlight_get_brightness(bd);

	/* Set a reasonable default here if the level is 0 otherwise

	 * fbdev will attempt to turn the backlight on after console

	 * unblanking and it will try and restore 0 which turns the backlight

	 * off again.

	 */

	if (bd->props.brightness == 0)

		bd->props.brightness = RADEON_MAX_BL_LEVEL;

	bd->props.power = FB_BLANK_UNBLANK;

	backlight_update_status(bd);

drivers/gpu/drm/radeon/evergreen.c

+3 −2
Original line number Diff line number Diff line
@@ -2642,8 +2642,9 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s 
	for (i = 0; i < rdev->num_crtc; i++) {

		if (save->crtc_enabled[i]) {

			tmp = RREG32(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i]);

			if ((tmp & 0x3) != 0) {

				tmp &= ~0x3;

			if ((tmp & 0x7) != 3) {

				tmp &= ~0x7;

				tmp |= 0x3;

				WREG32(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i], tmp);

			}

			tmp = RREG32(EVERGREEN_GRPH_UPDATE + crtc_offsets[i]);

drivers/gpu/drm/radeon/evergreen_reg.h

+0 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ 
#       define EVERGREEN_CRTC_V_BLANK                   (1 << 0)

#define EVERGREEN_CRTC_STATUS_POSITION                  0x6e90

#define EVERGREEN_CRTC_STATUS_HV_COUNT                  0x6ea0

#define EVERGREEN_MASTER_UPDATE_MODE                    0x6ef8

#define EVERGREEN_CRTC_UPDATE_LOCK                      0x6ed4

#define EVERGREEN_MASTER_UPDATE_LOCK                    0x6ef4

#define EVERGREEN_MASTER_UPDATE_MODE                    0x6ef8

drivers/gpu/drm/radeon/radeon.h

+1 −2
Original line number Diff line number Diff line
@@ -684,10 +684,9 @@ struct radeon_flip_work { 
	struct work_struct		unpin_work;

	struct radeon_device		*rdev;

	int				crtc_id;

	struct drm_framebuffer		*fb;

	uint64_t			base;

	struct drm_pending_vblank_event *event;

	struct radeon_bo		*old_rbo;

	struct radeon_bo		*new_rbo;

	struct radeon_fence		*fence;

};