summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux-core/nv50_display.c6
-rw-r--r--linux-core/nv50_i2c.c30
-rw-r--r--linux-core/nv50_kms_wrapper.c16
-rw-r--r--shared-core/nouveau_mem.c2
4 files changed, 27 insertions, 27 deletions
diff --git a/linux-core/nv50_display.c b/linux-core/nv50_display.c
index 2d12fb4f..b68c4e28 100644
--- a/linux-core/nv50_display.c
+++ b/linux-core/nv50_display.c
@@ -79,7 +79,7 @@ static int nv50_display_pre_init(struct nv50_display *display)
NV_WRITE(NV50_PDISPLAY_UNK_388, 0x150000);
NV_WRITE(NV50_PDISPLAY_UNK_38C, 0);
- display->preinit_done = TRUE;
+ display->preinit_done = true;
return 0;
}
@@ -125,7 +125,7 @@ static int nv50_display_init(struct nv50_display *display)
/* enable clock change interrupts. */
NV_WRITE(NV50_PDISPLAY_SUPERVISOR_INTR, NV_READ(NV50_PDISPLAY_SUPERVISOR_INTR) | 0x70);
- display->init_done = TRUE;
+ display->init_done = true;
return 0;
}
@@ -140,7 +140,7 @@ static int nv50_display_disable(struct nv50_display *display)
NV50_DEBUG("\n");
list_for_each_entry(crtc, &display->crtcs, item) {
- crtc->blank(crtc, TRUE);
+ crtc->blank(crtc, true);
}
display->update(display);
diff --git a/linux-core/nv50_i2c.c b/linux-core/nv50_i2c.c
index e90a4cee..30e317c5 100644
--- a/linux-core/nv50_i2c.c
+++ b/linux-core/nv50_i2c.c
@@ -106,19 +106,19 @@ static bool nv50_i2c_raise_clock(struct nv50_i2c_channel *chan, int data)
for (i = 2200; i > 0; i -= 2) {
nv50_i2c_get_bits(chan, &clock, &data);
if (clock)
- return TRUE;
+ return true;
udelay(2);
}
printk("a timeout occured in nv50_i2c_raise_clock\n");
- return FALSE;
+ return false;
}
static bool nv50_i2c_start(struct nv50_i2c_channel *chan)
{
if (!nv50_i2c_raise_clock(chan, 1))
- return FALSE;
+ return false;
nv50_i2c_set_bits(chan, 1, 0);
udelay(5);
@@ -126,7 +126,7 @@ static bool nv50_i2c_start(struct nv50_i2c_channel *chan)
nv50_i2c_set_bits(chan, 0, 0);
udelay(5);
- return TRUE;
+ return true;
}
static void nv50_i2c_stop(struct nv50_i2c_channel *chan)
@@ -181,7 +181,7 @@ static bool nv50_i2c_write_byte(struct nv50_i2c_channel *chan, uint8_t byte)
for (i = 7; i >= 0; i--)
if (!nv50_i2c_write_bit(chan, (byte >> i) & 1))
- return FALSE;
+ return false;
nv50_i2c_set_bits(chan, 0, 1);
udelay(5);
@@ -198,7 +198,7 @@ static bool nv50_i2c_write_byte(struct nv50_i2c_channel *chan, uint8_t byte)
if (i <= 0) {
printk("a timeout occured in nv50_i2c_write_byte\n");
- rval = FALSE;
+ rval = false;
}
}
@@ -222,14 +222,14 @@ static bool nv50_i2c_read_byte(struct nv50_i2c_channel *chan, uint8_t *byte, boo
if (bit)
*byte |= (1 << i);
} else {
- return FALSE;
+ return false;
}
}
if (!nv50_i2c_write_bit(chan, last ? 1 : 0))
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
/* only 7 bits addresses. */
@@ -241,13 +241,13 @@ static bool nv50_i2c_address(struct nv50_i2c_channel *chan, uint8_t address, boo
real_addr |= 1;
if (nv50_i2c_write_byte(chan, real_addr))
- return TRUE;
+ return true;
/* failure, so issue stop */
nv50_i2c_stop(chan);
}
- return FALSE;
+ return false;
}
static bool nv50_i2c_read(struct nv50_i2c_channel *chan, uint8_t address, uint8_t *buffer, uint32_t length)
@@ -257,9 +257,9 @@ static bool nv50_i2c_read(struct nv50_i2c_channel *chan, uint8_t address, uint8_
/* retries */
for (i = 0; i < 4; i++) {
- rval = nv50_i2c_address(chan, address, FALSE);
+ rval = nv50_i2c_address(chan, address, false);
if (!rval)
- return FALSE;
+ return false;
for (j = 0; j < length; j++) {
last = false;
@@ -292,9 +292,9 @@ static bool nv50_i2c_write(struct nv50_i2c_channel *chan, uint8_t address, uint8
/* retries */
for (i = 0; i < 4; i++) {
- rval = nv50_i2c_address(chan, address, TRUE);
+ rval = nv50_i2c_address(chan, address, true);
if (!rval)
- return FALSE;
+ return false;
for (j = 0; j < length; j++) {
rval = nv50_i2c_write_byte(chan, buffer[j]);
diff --git a/linux-core/nv50_kms_wrapper.c b/linux-core/nv50_kms_wrapper.c
index 46edfb34..f1f5b69f 100644
--- a/linux-core/nv50_kms_wrapper.c
+++ b/linux-core/nv50_kms_wrapper.c
@@ -529,7 +529,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
if (blank) {
crtc = to_nv50_crtc(set->crtc);
- rval = crtc->blank(crtc, TRUE);
+ rval = crtc->blank(crtc, true);
if (rval != 0) {
DRM_ERROR("blanking failed\n");
goto out;
@@ -540,7 +540,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
if (drm_encoder->crtc == set->crtc) {
output = to_nv50_output(drm_encoder);
- rval = output->execute_mode(output, TRUE);
+ rval = output->execute_mode(output, true);
if (rval != 0) {
DRM_ERROR("detaching output failed\n");
goto out;
@@ -556,7 +556,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
if (switch_fb && !modeset && !blank) {
crtc = to_nv50_crtc(set->crtc);
- rval = crtc->blank(crtc, TRUE);
+ rval = crtc->blank(crtc, true);
if (rval != 0) {
DRM_ERROR("blanking failed\n");
goto out;
@@ -569,7 +569,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
}
/* this also sets the fb offset */
- rval = crtc->blank(crtc, FALSE);
+ rval = crtc->blank(crtc, false);
if (rval != 0) {
DRM_ERROR("unblanking failed\n");
goto out;
@@ -588,7 +588,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
if (output->crtc) {
crtc_mask |= 1 << output->crtc->index;
} else {
- rval = output->execute_mode(output, TRUE);
+ rval = output->execute_mode(output, true);
if (rval != 0) {
DRM_ERROR("detaching output failed\n");
goto out;
@@ -599,7 +599,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
/* blank any unused crtcs */
list_for_each_entry(crtc, &display->crtcs, item) {
if (!(crtc_mask & (1 << crtc->index)))
- crtc->blank(crtc, TRUE);
+ crtc->blank(crtc, true);
}
crtc = to_nv50_crtc(set->crtc);
@@ -642,7 +642,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
if (output->crtc != crtc)
continue;
- rval = output->execute_mode(output, FALSE);
+ rval = output->execute_mode(output, false);
if (rval != 0) {
DRM_ERROR("output execute mode failed\n");
goto out;
@@ -933,7 +933,7 @@ static void nv50_kms_connector_fill_modes(struct drm_connector *drm_connector, u
}
}
- drm_mode_prune_invalid(drm_connector->dev, &drm_connector->modes, TRUE);
+ drm_mode_prune_invalid(drm_connector->dev, &drm_connector->modes, true);
if (list_empty(&drm_connector->modes)) {
struct drm_display_mode *stdmode;
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c
index 425cebe2..861d699f 100644
--- a/shared-core/nouveau_mem.c
+++ b/shared-core/nouveau_mem.c
@@ -743,7 +743,7 @@ void nouveau_mem_free(struct drm_device* dev, struct mem_block* block)
crtc->fb->block = NULL;
if (!crtc->blanked)
- crtc->blank(crtc, TRUE);
+ crtc->blank(crtc, true);
}
if (crtc->cursor->block == block) {