tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
drm/i915/sdvo: Handle unsupported GET_SUPPORTED_ENHANCEMENTS gracefully
drm/i915/sdvo: Cleanup connector on error path
drm/i915: Fix 945GM regression in e259befd

Linus Torvalds 381ba329 65097561

+7 -10
+1 -1
drivers/gpu/drm/i915/i915_gem.c
··· 2400 2400 I915_WRITE64(FENCE_REG_965_0 + (obj_priv->fence_reg * 8), 0); 2401 2401 break; 2402 2402 case 3: 2403 - if (obj_priv->fence_reg > 8) 2403 + if (obj_priv->fence_reg >= 8) 2404 2404 fence_reg = FENCE_REG_945_8 + (obj_priv->fence_reg - 8) * 4; 2405 2405 else 2406 2406 case 2:
+6 -9
drivers/gpu/drm/i915/intel_sdvo.c
··· 2170 2170 return true; 2171 2171 2172 2172 err: 2173 - intel_sdvo_destroy_enhance_property(connector); 2174 - kfree(intel_sdvo_connector); 2173 + intel_sdvo_destroy(connector); 2175 2174 return false; 2176 2175 } 2177 2176 ··· 2242 2243 return true; 2243 2244 2244 2245 err: 2245 - intel_sdvo_destroy_enhance_property(connector); 2246 - kfree(intel_sdvo_connector); 2246 + intel_sdvo_destroy(connector); 2247 2247 return false; 2248 2248 } 2249 2249 ··· 2520 2522 uint16_t response; 2521 2523 } enhancements; 2522 2524 2523 - if (!intel_sdvo_get_value(intel_sdvo, 2524 - SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS, 2525 - &enhancements, sizeof(enhancements))) 2526 - return false; 2527 - 2525 + enhancements.response = 0; 2526 + intel_sdvo_get_value(intel_sdvo, 2527 + SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS, 2528 + &enhancements, sizeof(enhancements)); 2528 2529 if (enhancements.response == 0) { 2529 2530 DRM_DEBUG_KMS("No enhancement is supported\n"); 2530 2531 return true;