aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sdvo.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c30
1 files changed, 8 insertions, 22 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 80fb5da421f8..724190ec496b 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2276,10 +2276,8 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
2276 intel_sdvo_connector->max_##name = data_value[0]; \ 2276 intel_sdvo_connector->max_##name = data_value[0]; \
2277 intel_sdvo_connector->cur_##name = response; \ 2277 intel_sdvo_connector->cur_##name = response; \
2278 intel_sdvo_connector->name = \ 2278 intel_sdvo_connector->name = \
2279 drm_property_create(dev, DRM_MODE_PROP_RANGE, #name, 2); \ 2279 drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
2280 if (!intel_sdvo_connector->name) return false; \ 2280 if (!intel_sdvo_connector->name) return false; \
2281 intel_sdvo_connector->name->values[0] = 0; \
2282 intel_sdvo_connector->name->values[1] = data_value[0]; \
2283 drm_connector_attach_property(connector, \ 2281 drm_connector_attach_property(connector, \
2284 intel_sdvo_connector->name, \ 2282 intel_sdvo_connector->name, \
2285 intel_sdvo_connector->cur_##name); \ 2283 intel_sdvo_connector->cur_##name); \
@@ -2313,25 +2311,19 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
2313 intel_sdvo_connector->left_margin = data_value[0] - response; 2311 intel_sdvo_connector->left_margin = data_value[0] - response;
2314 intel_sdvo_connector->right_margin = intel_sdvo_connector->left_margin; 2312 intel_sdvo_connector->right_margin = intel_sdvo_connector->left_margin;
2315 intel_sdvo_connector->left = 2313 intel_sdvo_connector->left =
2316 drm_property_create(dev, DRM_MODE_PROP_RANGE, 2314 drm_property_create_range(dev, 0, "left_margin", 0, data_value[0]);
2317 "left_margin", 2);
2318 if (!intel_sdvo_connector->left) 2315 if (!intel_sdvo_connector->left)
2319 return false; 2316 return false;
2320 2317
2321 intel_sdvo_connector->left->values[0] = 0;
2322 intel_sdvo_connector->left->values[1] = data_value[0];
2323 drm_connector_attach_property(connector, 2318 drm_connector_attach_property(connector,
2324 intel_sdvo_connector->left, 2319 intel_sdvo_connector->left,
2325 intel_sdvo_connector->left_margin); 2320 intel_sdvo_connector->left_margin);
2326 2321
2327 intel_sdvo_connector->right = 2322 intel_sdvo_connector->right =
2328 drm_property_create(dev, DRM_MODE_PROP_RANGE, 2323 drm_property_create_range(dev, 0, "right_margin", 0, data_value[0]);
2329 "right_margin", 2);
2330 if (!intel_sdvo_connector->right) 2324 if (!intel_sdvo_connector->right)
2331 return false; 2325 return false;
2332 2326
2333 intel_sdvo_connector->right->values[0] = 0;
2334 intel_sdvo_connector->right->values[1] = data_value[0];
2335 drm_connector_attach_property(connector, 2327 drm_connector_attach_property(connector,
2336 intel_sdvo_connector->right, 2328 intel_sdvo_connector->right,
2337 intel_sdvo_connector->right_margin); 2329 intel_sdvo_connector->right_margin);
@@ -2355,25 +2347,21 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
2355 intel_sdvo_connector->top_margin = data_value[0] - response; 2347 intel_sdvo_connector->top_margin = data_value[0] - response;
2356 intel_sdvo_connector->bottom_margin = intel_sdvo_connector->top_margin; 2348 intel_sdvo_connector->bottom_margin = intel_sdvo_connector->top_margin;
2357 intel_sdvo_connector->top = 2349 intel_sdvo_connector->top =
2358 drm_property_create(dev, DRM_MODE_PROP_RANGE, 2350 drm_property_create_range(dev, 0,
2359 "top_margin", 2); 2351 "top_margin", 0, data_value[0]);
2360 if (!intel_sdvo_connector->top) 2352 if (!intel_sdvo_connector->top)
2361 return false; 2353 return false;
2362 2354
2363 intel_sdvo_connector->top->values[0] = 0;
2364 intel_sdvo_connector->top->values[1] = data_value[0];
2365 drm_connector_attach_property(connector, 2355 drm_connector_attach_property(connector,
2366 intel_sdvo_connector->top, 2356 intel_sdvo_connector->top,
2367 intel_sdvo_connector->top_margin); 2357 intel_sdvo_connector->top_margin);
2368 2358
2369 intel_sdvo_connector->bottom = 2359 intel_sdvo_connector->bottom =
2370 drm_property_create(dev, DRM_MODE_PROP_RANGE, 2360 drm_property_create_range(dev, 0,
2371 "bottom_margin", 2); 2361 "bottom_margin", 0, data_value[0]);
2372 if (!intel_sdvo_connector->bottom) 2362 if (!intel_sdvo_connector->bottom)
2373 return false; 2363 return false;
2374 2364
2375 intel_sdvo_connector->bottom->values[0] = 0;
2376 intel_sdvo_connector->bottom->values[1] = data_value[0];
2377 drm_connector_attach_property(connector, 2365 drm_connector_attach_property(connector,
2378 intel_sdvo_connector->bottom, 2366 intel_sdvo_connector->bottom,
2379 intel_sdvo_connector->bottom_margin); 2367 intel_sdvo_connector->bottom_margin);
@@ -2402,12 +2390,10 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
2402 intel_sdvo_connector->max_dot_crawl = 1; 2390 intel_sdvo_connector->max_dot_crawl = 1;
2403 intel_sdvo_connector->cur_dot_crawl = response & 0x1; 2391 intel_sdvo_connector->cur_dot_crawl = response & 0x1;
2404 intel_sdvo_connector->dot_crawl = 2392 intel_sdvo_connector->dot_crawl =
2405 drm_property_create(dev, DRM_MODE_PROP_RANGE, "dot_crawl", 2); 2393 drm_property_create_range(dev, 0, "dot_crawl", 0, 1);
2406 if (!intel_sdvo_connector->dot_crawl) 2394 if (!intel_sdvo_connector->dot_crawl)
2407 return false; 2395 return false;
2408 2396
2409 intel_sdvo_connector->dot_crawl->values[0] = 0;
2410 intel_sdvo_connector->dot_crawl->values[1] = 1;
2411 drm_connector_attach_property(connector, 2397 drm_connector_attach_property(connector,
2412 intel_sdvo_connector->dot_crawl, 2398 intel_sdvo_connector->dot_crawl,
2413 intel_sdvo_connector->cur_dot_crawl); 2399 intel_sdvo_connector->cur_dot_crawl);