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

Commit 2b2d323a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm radeon and nouveau fixes from Dave Airlie:
 "Fixes for the other big two.

  The radeon VCE one is large but it fixes some userspace triggerable
  issues, otherwise its blackscreens and oopses.

  Nouveau fixes a bleeding laptop panel issue when displayport is used
  sometimes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/pm: don't allow debugfs/sysfs access when PX card is off (v2)
  drm/radeon: avoid segfault on device open when accel is not working.
  drm/radeon: fix typo in finding PLL params
  drm/radeon: fix register typo on si
  drm/radeon: fix buffer placement under memory pressure v2
  drm/radeon: fix page directory update size estimation
  drm/radeon: handle non-VGA class pci devices with ATRM
  drm/radeon: fix DCE83 check for mullins
  drm/radeon: check VCE relocation buffer range v3
  drm/radeon: also try GART for CPU accessed buffers
  drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
  drm/nvd9/therm: handle another kind of PWM fan
parents fc3ac5c7 77c01bef

drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

+1 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, 
	}



	if (outp == 8)

		return false;

		return conf;



	data = exec_lookup(priv, head, outp, ctrl, dcb, &ver, &hdr, &cnt, &len, &info1);

	if (data == 0x0000)

drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ pwm_info(struct nouveau_therm *therm, int line) 
		case 0x00: return 2;

		case 0x19: return 1;

		case 0x1c: return 0;

		case 0x1e: return 2;

		default:

			break;

		}

drivers/gpu/drm/radeon/radeon.h

+4 −2
Original line number Diff line number Diff line
@@ -1642,6 +1642,7 @@ struct radeon_vce { 
	unsigned		fb_version;

	atomic_t		handles[RADEON_MAX_VCE_HANDLES];

	struct drm_file		*filp[RADEON_MAX_VCE_HANDLES];

	unsigned		img_size[RADEON_MAX_VCE_HANDLES];

	struct delayed_work	idle_work;

};
@@ -1655,7 +1656,7 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rdev, int ring, 
			       uint32_t handle, struct radeon_fence **fence);

void radeon_vce_free_handles(struct radeon_device *rdev, struct drm_file *filp);

void radeon_vce_note_usage(struct radeon_device *rdev);

int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int lo, int hi);

int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int lo, int hi, unsigned size);

int radeon_vce_cs_parse(struct radeon_cs_parser *p);

bool radeon_vce_semaphore_emit(struct radeon_device *rdev,

			       struct radeon_ring *ring,
@@ -2640,7 +2641,8 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); 
#define ASIC_IS_DCE8(rdev) ((rdev->family >= CHIP_BONAIRE))

#define ASIC_IS_DCE81(rdev) ((rdev->family == CHIP_KAVERI))

#define ASIC_IS_DCE82(rdev) ((rdev->family == CHIP_BONAIRE))

#define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI))

#define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI) || \

			     (rdev->family == CHIP_MULLINS))



#define ASIC_IS_LOMBOK(rdev) ((rdev->ddev->pdev->device == 0x6849) || \

			      (rdev->ddev->pdev->device == 0x6850) || \

drivers/gpu/drm/radeon/radeon_bios.c

+14 −0
Original line number Diff line number Diff line
@@ -196,6 +196,20 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) 
		}

	}



	if (!found) {

		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {

			dhandle = ACPI_HANDLE(&pdev->dev);

			if (!dhandle)

				continue;



			status = acpi_get_handle(dhandle, "ATRM", &atrm_handle);

			if (!ACPI_FAILURE(status)) {

				found = true;

				break;

			}

		}

	}



	if (!found)

		return false;

drivers/gpu/drm/radeon/radeon_display.c

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, 


	/* avoid high jitter with small fractional dividers */

	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV && (fb_div % 10)) {

		fb_div_min = max(fb_div_min, (9 - (fb_div % 10)) * 20 + 60);

		fb_div_min = max(fb_div_min, (9 - (fb_div % 10)) * 20 + 50);

		if (fb_div < fb_div_min) {

			unsigned tmp = DIV_ROUND_UP(fb_div_min, fb_div);

			fb_div *= tmp;