xf86-video-intel: 2 commits - src/sna/sna_display.c src/sna/sna_display_fake.c src/sna/sna_driver.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu May 30 05:14:36 PDT 2013
src/sna/sna_display.c | 89 ++++++++++++++++++++++-----------------------
src/sna/sna_display_fake.c | 15 +------
src/sna/sna_driver.c | 15 +------
3 files changed, 49 insertions(+), 70 deletions(-)
New commits:
commit a9acc8dbb436e1e523e7d7c0f3c41946a2d0f245
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu May 30 12:09:52 2013 +0100
sna: Cleanup up error reporting after failure to init KMS interface
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index cee0aea..6cade44 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2793,30 +2793,32 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
int i;
mode->kmode = drmModeGetResources(sna->kgem.fd);
- if (!mode->kmode)
- return sna_mode_fake_init(sna);
+ if (mode->kmode) {
+ xf86CrtcConfigInit(scrn, &sna_mode_funcs);
- xf86CrtcConfigInit(scrn, &sna_mode_funcs);
+ for (i = 0; i < mode->kmode->count_crtcs; i++)
+ if (!sna_crtc_init(scrn, mode, i))
+ return false;
- for (i = 0; i < mode->kmode->count_crtcs; i++)
- if (!sna_crtc_init(scrn, mode, i))
- return false;
-
- for (i = 0; i < mode->kmode->count_connectors; i++)
- if (!sna_output_init(scrn, mode, i))
- return false;
+ for (i = 0; i < mode->kmode->count_connectors; i++)
+ if (!sna_output_init(scrn, mode, i))
+ return false;
- if (!xf86IsEntityShared(scrn->entityList[0]))
- sna_mode_compute_possible_clones(scrn);
-
- set_size_range(sna);
+ if (!xf86IsEntityShared(scrn->entityList[0]))
+ sna_mode_compute_possible_clones(scrn);
#if HAS_PIXMAP_SHARING
xf86ProviderSetup(scrn, NULL, "Intel");
#endif
- xf86InitialConfiguration(scrn, TRUE);
+ } else {
+ if (!sna_mode_fake_init(sna))
+ return false;
+ }
- return true;
+ set_size_range(sna);
+
+ xf86InitialConfiguration(scrn, TRUE);
+ return scrn->modes != NULL;
}
void
diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c
index b8723a3..b4a5a94 100644
--- a/src/sna/sna_display_fake.c
+++ b/src/sna/sna_display_fake.c
@@ -304,17 +304,6 @@ static const xf86CrtcConfigFuncsRec sna_mode_funcs = {
bool sna_mode_fake_init(struct sna *sna)
{
- ScrnInfoPtr scrn = sna->scrn;
-
- xf86CrtcConfigInit(scrn, &sna_mode_funcs);
-
- if (!sna_crtc_fake(sna))
- return false;
-
- if (!sna_output_fake(sna))
- return false;
-
- xf86CrtcSetSizeRange(scrn, 320, 200, INT16_MAX, INT16_MAX);
- xf86InitialConfiguration(scrn, TRUE);
- return true;
+ xf86CrtcConfigInit(sna->scrn, &sna_mode_funcs);
+ return sna_crtc_fake(sna) && sna_output_fake(sna);
}
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index b69083e..b48ab30 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -636,23 +636,14 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
"Tiling disabled, expect poor performance and increased power consumption.\n");
if (!sna_mode_pre_init(scrn, sna)) {
- PreInitCleanup(scrn);
- return FALSE;
- }
-
- if (!xf86SetGamma(scrn, zeros)) {
- PreInitCleanup(scrn);
- return FALSE;
- }
-
- if (scrn->modes == NULL) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR, "No modes.\n");
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "No outputs and no modes.\n");
PreInitCleanup(scrn);
return FALSE;
}
scrn->currentMode = scrn->modes;
- /* Set display resolution */
+ xf86SetGamma(scrn, zeros);
xf86SetDpi(scrn, 0, 0);
sna->dri_available = false;
commit f4fcb0e7d24a104afb642dd8819e67ffcaafbfb1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu May 30 12:02:44 2013 +0100
sna: Report allocations failures during Screen initialisation
Just abort instead of trying to limp on if we fail to even allocate
memory during initialisation.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 302a93a..cee0aea 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -71,7 +71,6 @@ struct sna_crtc {
uint8_t id;
uint8_t pipe;
uint8_t plane;
- struct list link;
};
struct sna_property {
@@ -96,7 +95,6 @@ struct sna_output {
char *backlight_iface;
int backlight_active_level;
int backlight_max;
- struct list link;
};
static inline struct sna_output *to_sna_output(xf86OutputPtr output)
@@ -1560,12 +1558,13 @@ sna_crtc_destroy(xf86CrtcPtr crtc)
{
struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
+ if (sna_crtc == NULL)
+ return;
+
sna_crtc_hide_cursor(crtc);
gem_close(to_sna(crtc->scrn)->kgem.fd, sna_crtc->cursor);
- list_del(&sna_crtc->link);
free(sna_crtc);
-
crtc->driver_private = NULL;
}
@@ -1642,7 +1641,7 @@ sna_crtc_find_plane(struct sna *sna, int pipe)
#endif
}
-static void
+static bool
sna_crtc_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
{
struct sna *sna = to_sna(scrn);
@@ -1654,7 +1653,7 @@ sna_crtc_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
sna_crtc = calloc(sizeof(struct sna_crtc), 1);
if (sna_crtc == NULL)
- return;
+ return false;
sna_crtc->id = mode->kmode->crtcs[num];
sna_crtc->dpms_mode = DPMSModeOff;
@@ -1666,7 +1665,7 @@ sna_crtc_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
&get_pipe)) {
free(sna_crtc);
- return;
+ return false;
}
sna_crtc->pipe = get_pipe.pipe;
sna_crtc->plane = sna_crtc_find_plane(sna, sna_crtc->pipe);
@@ -1674,23 +1673,28 @@ sna_crtc_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
if (xf86IsEntityShared(scrn->entityList[0]) &&
scrn->confScreen->device->screen != sna_crtc->pipe) {
free(sna_crtc);
- return;
+ return true;
}
crtc = xf86CrtcCreate(scrn, &sna_crtc_funcs);
if (crtc == NULL) {
free(sna_crtc);
- return;
+ return false;
}
- crtc->driver_private = sna_crtc;
-
sna_crtc->cursor = gem_create(sna->kgem.fd, 64*64*4);
+ if (!sna_crtc->cursor) {
+ xf86CrtcDestroy(crtc);
+ return false;
+ }
DBG(("%s: created handle=%d for cursor on CRTC:%d\n",
__FUNCTION__, sna_crtc->cursor, sna_crtc->id));
+ crtc->driver_private = sna_crtc;
DBG(("%s: attached crtc[%d] id=%d, pipe=%d\n",
__FUNCTION__, num, sna_crtc->id, sna_crtc->pipe));
+
+ return true;
}
static bool
@@ -1927,6 +1931,9 @@ sna_output_destroy(xf86OutputPtr output)
struct sna_output *sna_output = output->driver_private;
int i;
+ if (sna_output == NULL)
+ return;
+
for (i = 0; i < sna_output->num_props; i++) {
drmModeFreeProperty(sna_output->props[i].mode_prop);
free(sna_output->props[i].atoms);
@@ -1938,9 +1945,7 @@ sna_output_destroy(xf86OutputPtr output)
free(sna_output->backlight_iface);
- list_del(&sna_output->link);
free(sna_output);
-
output->driver_private = NULL;
}
@@ -2352,7 +2357,7 @@ sna_zaphod_match(const char *s, const char *output)
return false;
}
-static void
+static bool
sna_output_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
{
struct sna *sna = to_sna(scrn);
@@ -2367,7 +2372,7 @@ sna_output_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
koutput = drmModeGetConnector(sna->kgem.fd,
mode->kmode->connectors[num]);
if (!koutput)
- return;
+ return false;
VG_CLEAR(enc);
enc.encoder_id = koutput->encoders[0];
@@ -2384,8 +2389,10 @@ sna_output_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
const char *str;
str = xf86GetOptValString(sna->Options, OPTION_ZAPHOD);
- if (str && !sna_zaphod_match(str, name))
- goto cleanup_connector;
+ if (str && !sna_zaphod_match(str, name)) {
+ drmModeFreeConnector(koutput);
+ return true;
+ }
if ((enc.possible_crtcs & (1 << scrn->confScreen->device->screen)) == 0) {
if (str) {
@@ -2435,12 +2442,13 @@ sna_output_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
__FUNCTION__, name, num, to_connector_id(output),
output->possible_crtcs, output->possible_clones));
- return;
+ return true;
cleanup_output:
xf86OutputDestroy(output);
cleanup_connector:
drmModeFreeConnector(koutput);
+ return false;
}
/* We need to map from kms encoder based possible_clones mask to X output based
@@ -2791,10 +2799,12 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
xf86CrtcConfigInit(scrn, &sna_mode_funcs);
for (i = 0; i < mode->kmode->count_crtcs; i++)
- sna_crtc_init(scrn, mode, i);
+ if (!sna_crtc_init(scrn, mode, i))
+ return false;
for (i = 0; i < mode->kmode->count_connectors; i++)
- sna_output_init(scrn, mode, i);
+ if (!sna_output_init(scrn, mode, i))
+ return false;
if (!xf86IsEntityShared(scrn->entityList[0]))
sna_mode_compute_possible_clones(scrn);
@@ -2829,19 +2839,6 @@ sna_mode_close(struct sna *sna)
void
sna_mode_fini(struct sna *sna)
{
-#if 0
- while (!list_is_empty(&mode->crtcs)) {
- xf86CrtcDestroy(list_first_entry(&mode->crtcs,
- struct sna_crtc,
- link)->crtc);
- }
-
- while (!list_is_empty(&mode->outputs)) {
- xf86OutputDestroy(list_first_entry(&mode->outputs,
- struct sna_output,
- link)->output);
- }
-#endif
}
static bool sna_box_intersect(BoxPtr r, const BoxRec *a, const BoxRec *b)
More information about the xorg-commit
mailing list