From 13b678062f7ad962f24a22f1c0f81008d341775c Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 4 Jan 2013 19:10:37 +0000 Subject: [PATCH] --- yaml --- r: 358153 b: refs/heads/master c: f8acf6f4c8fe1fd4de1f669ac6a3c71e89f13523 h: refs/heads/master i: 358151: 9e982bbe419a2b3fb1f5cebaed30acffab828d6e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5e3842d443a7..61b57187f654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fe0423eac2c0781a3ece8779b086acd3e76f2c8 +refs/heads/master: f8acf6f4c8fe1fd4de1f669ac6a3c71e89f13523 diff --git a/trunk/drivers/gpu/drm/drm_pci.c b/trunk/drivers/gpu/drm/drm_pci.c index 11c8adde40b0..50e26f2d198e 100644 --- a/trunk/drivers/gpu/drm/drm_pci.c +++ b/trunk/drivers/gpu/drm/drm_pci.c @@ -507,7 +507,7 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask) if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB) *mask |= DRM_PCIE_SPEED_25; if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB) - *mask |= DRM_PCIE_SPEED_50; + *mask |= (DRM_PCIE_SPEED_25 | DRM_PCIE_SPEED_50); } DRM_INFO("probing gen 2 caps for device %x:%x = %x/%x\n", root->vendor, root->device, lnkcap, lnkcap2);