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

Commit 5afda9e9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes 

* 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next:
  drm/nouveau: drop drm_global_mutex before sleeping in submission path
  drm: export drm_global_mutex for drivers to use
  drm/nv20: Don't use pushbuf calls on the original nv20.
  drm/nouveau: Fix TMDS on some DCB1.5 boards.
  drm/nouveau: Fix backlight control on PPC machines with an internal TMDS panel.
  drm/nv30: Apply modesetting to the correct slave encoder
  drm/nouveau: Use a helper function to match PCI device/subsystem IDs.
  drm/nv50: add dcb type 14 to enum to prevent compiler complaint
parents d0333038 ab699ec6

drivers/gpu/drm/drm_fops.c

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


/* from BKL pushdown: note that nothing else serializes idr_find() */

DEFINE_MUTEX(drm_global_mutex);

EXPORT_SYMBOL(drm_global_mutex);



static int drm_open_helper(struct inode *inode, struct file *filp,

			   struct drm_device * dev);

drivers/gpu/drm/nouveau/nouveau_bios.c

+15 −49
Original line number Diff line number Diff line
@@ -3869,27 +3869,10 @@ static int call_lvds_manufacturer_script(struct drm_device *dev, struct dcb_entr 
	}

#ifdef __powerpc__

	/* Powerbook specific quirks */

	if ((dev->pci_device & 0xffff) == 0x0179 ||

	    (dev->pci_device & 0xffff) == 0x0189 ||

	    (dev->pci_device & 0xffff) == 0x0329) {

		if (script == LVDS_RESET) {

	if (script == LVDS_RESET &&

	    (dev->pci_device == 0x0179 || dev->pci_device == 0x0189 ||

	     dev->pci_device == 0x0329))

		nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);



		} else if (script == LVDS_PANEL_ON) {

			bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL,

				  bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL)

				  | (1 << 31));

			bios_wr32(bios, NV_PCRTC_GPIO_EXT,

				  bios_rd32(bios, NV_PCRTC_GPIO_EXT) | 1);



		} else if (script == LVDS_PANEL_OFF) {

			bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL,

				  bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL)

				  & ~(1 << 31));

			bios_wr32(bios, NV_PCRTC_GPIO_EXT,

				  bios_rd32(bios, NV_PCRTC_GPIO_EXT) & ~3);

		}

	}

#endif



	return 0;
@@ -4381,11 +4364,8 @@ int nouveau_bios_parse_lvds_table(struct drm_device *dev, int pxclk, bool *dl, b 
	 *

	 * For the moment, a quirk will do :)

	 */

	if ((dev->pdev->device == 0x01d7) &&

	    (dev->pdev->subsystem_vendor == 0x1028) &&

	    (dev->pdev->subsystem_device == 0x01c2)) {

	if (nv_match_device(dev, 0x01d7, 0x1028, 0x01c2))

		bios->fp.duallink_transition_clk = 80000;

	}



	/* set dual_link flag for EDID case */

	if (pxclk && (chip_version < 0x25 || chip_version > 0x28))
@@ -5814,9 +5794,7 @@ parse_dcb_gpio_table(struct nvbios *bios) 
		 */



		/* Apple iMac G4 NV18 */

		if (dev->pdev->device == 0x0189 &&

		    dev->pdev->subsystem_vendor == 0x10de &&

		    dev->pdev->subsystem_device == 0x0010) {

		if (nv_match_device(dev, 0x0189, 0x10de, 0x0010)) {

			struct dcb_gpio_entry *gpio = new_gpio_entry(bios);



			gpio->tag = DCB_GPIO_TVDAC0;
@@ -5898,9 +5876,7 @@ apply_dcb_connector_quirks(struct nvbios *bios, int idx) 
	struct drm_device *dev = bios->dev;



	/* Gigabyte NX85T */

	if ((dev->pdev->device == 0x0421) &&

	    (dev->pdev->subsystem_vendor == 0x1458) &&

	    (dev->pdev->subsystem_device == 0x344c)) {

	if (nv_match_device(dev, 0x0421, 0x1458, 0x344c)) {

		if (cte->type == DCB_CONNECTOR_HDMI_1)

			cte->type = DCB_CONNECTOR_DVI_I;

	}
@@ -6153,7 +6129,7 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb, 
			entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4;



		break;

	case 0xe:

	case OUTPUT_EOL:

		/* weird g80 mobile type that "nv" treats as a terminator */

		dcb->entries--;

		return false;
@@ -6190,23 +6166,15 @@ parse_dcb15_entry(struct drm_device *dev, struct dcb_table *dcb, 
		entry->type = OUTPUT_TV;

		break;

	case 2:

	case 3:

		entry->type = OUTPUT_LVDS;

		break;

	case 4:

		switch ((conn & 0x000000f0) >> 4) {

		case 0:

		if (conn & 0x10)

			entry->type = OUTPUT_LVDS;

		else

			entry->type = OUTPUT_TMDS;

		break;

		case 1:

	case 3:

		entry->type = OUTPUT_LVDS;

		break;

		default:

			NV_ERROR(dev, "Unknown DCB subtype 4/%d\n",

				 (conn & 0x000000f0) >> 4);

			return false;

		}

		break;

	default:

		NV_ERROR(dev, "Unknown DCB type %d\n", conn & 0x0000000f);

		return false;
@@ -6321,9 +6289,7 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf) 
	 * nasty problems until this is sorted (assuming it's not a

	 * VBIOS bug).

	 */

	if ((dev->pdev->device == 0x040d) &&

	    (dev->pdev->subsystem_vendor == 0x1028) &&

	    (dev->pdev->subsystem_device == 0x019b)) {

	if (nv_match_device(dev, 0x040d, 0x1028, 0x019b)) {

		if (*conn == 0x02026312 && *conf == 0x00000020)

			return false;

	}

drivers/gpu/drm/nouveau/nouveau_bios.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ enum dcb_type { 
	OUTPUT_TMDS = 2,

	OUTPUT_LVDS = 3,

	OUTPUT_DP = 6,

	OUTPUT_EOL = 14, /* DCB 4.0+, appears to be end-of-list */

	OUTPUT_ANY = -1

};

drivers/gpu/drm/nouveau/nouveau_drv.h

+9 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,15 @@ nv_two_reg_pll(struct drm_device *dev) 
	return false;

}



static inline bool

nv_match_device(struct drm_device *dev, unsigned device,

		unsigned sub_vendor, unsigned sub_device)

{

	return dev->pdev->device == device &&

		dev->pdev->subsystem_vendor == sub_vendor &&

		dev->pdev->subsystem_device == sub_device;

}



#define NV_SW                                                        0x0000506e

#define NV_SW_DMA_SEMAPHORE                                          0x00000060

#define NV_SW_SEMAPHORE_OFFSET                                       0x00000064

drivers/gpu/drm/nouveau/nouveau_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -337,7 +337,9 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, 
				return -EINVAL;

			}



			mutex_unlock(&drm_global_mutex);

			ret = ttm_bo_wait_cpu(&nvbo->bo, false);

			mutex_lock(&drm_global_mutex);

			if (ret) {

				NV_ERROR(dev, "fail wait_cpu\n");

				return ret;
@@ -663,7 +665,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
				      push[i].length);

		}

	} else

	if (dev_priv->card_type >= NV_20) {

	if (dev_priv->chipset >= 0x25) {

		ret = RING_SPACE(chan, req->nr_push * 2);

		if (ret) {

			NV_ERROR(dev, "cal_space: %d\n", ret);
@@ -738,7 +740,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
		req->suffix0 = 0x00000000;

		req->suffix1 = 0x00000000;

	} else

	if (dev_priv->card_type >= NV_20) {

	if (dev_priv->chipset >= 0x25) {

		req->suffix0 = 0x00020000;

		req->suffix1 = 0x00000000;

	} else {