Commit 8d3e375e authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: convert pointless error checks in set_config to BUGs

Because they all are, the ioctl command never calls us with any of
these violated. Also drop a equally pointless empty debug message (and
also in set_cursor, while we're at it).

With all these changes, intel_crtc_set_config is neatly condensed down
to it's essence, the actual modeset code (or fb update calling code)

v2: The fb helper code is actually stretching ->set_config semantics a bit,
it calls it with set->mode == NULL but set->fb != NULL.
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 835c5873
...@@ -5462,8 +5462,6 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc, ...@@ -5462,8 +5462,6 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
uint32_t addr; uint32_t addr;
int ret; int ret;
DRM_DEBUG_KMS("\n");
/* if we want to turn off the cursor ignore width and height */ /* if we want to turn off the cursor ignore width and height */
if (!handle) { if (!handle) {
DRM_DEBUG_KMS("cursor off\n"); DRM_DEBUG_KMS("cursor off\n");
...@@ -6920,16 +6918,9 @@ static int intel_crtc_set_config(struct drm_mode_set *set) ...@@ -6920,16 +6918,9 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
int ret; int ret;
int i; int i;
DRM_DEBUG_KMS("\n"); BUG_ON(!set);
BUG_ON(!set->crtc);
if (!set) BUG_ON(!set->crtc->helper_private);
return -EINVAL;
if (!set->crtc)
return -EINVAL;
if (!set->crtc->helper_private)
return -EINVAL;
if (!set->mode) if (!set->mode)
set->fb = NULL; set->fb = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment