Re: [PATCH 2/9] drm/print: add drm_debug_enabled()
On Monday, 2019-09-16 16:23:13 +0300, Jani Nikula wrote:
> On Mon, 16 Sep 2019, Eric Engestrom wrote:
> > On Monday, 2019-09-16 11:53:24 +0300, Jani Nikula wrote:
> >> On Fri, 13 Sep 2019, Eric Engestrom wrote:
> >> > On Friday, 2019-09-13 14:51:39 +0300, Jani Nikula wrote:
> >> >> Add helper to check if a drm debug category is enabled. Convert drm core
> >> >> to use it. No functional changes.
> >> >>
> >> >> Signed-off-by: Jani Nikula
> >> >> ---
> >> >> drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
> >> >> drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
> >> >> drivers/gpu/drm/drm_edid.c| 2 +-
> >> >> drivers/gpu/drm/drm_edid_load.c | 2 +-
> >> >> drivers/gpu/drm/drm_mipi_dbi.c| 4 ++--
> >> >> drivers/gpu/drm/drm_print.c | 4 ++--
> >> >> drivers/gpu/drm/drm_vblank.c | 6 +++---
> >> >> include/drm/drm_print.h | 5 +
> >> >> 8 files changed, 18 insertions(+), 13 deletions(-)
> >> >>
> >> >> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
> >> >> b/drivers/gpu/drm/drm_atomic_uapi.c
> >> >> index 5a5b42db6f2a..6576cd997cbd 100644
> >> >> --- a/drivers/gpu/drm/drm_atomic_uapi.c
> >> >> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
> >> >> @@ -1406,7 +1406,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
> >> >> } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
> >> >> ret = drm_atomic_nonblocking_commit(state);
> >> >> } else {
> >> >> - if (unlikely(drm_debug & DRM_UT_STATE))
> >> >> + if (unlikely(drm_debug_enabled(DRM_UT_STATE)))
> >> >> drm_atomic_print_state(state);
> >> >>
> >> >> ret = drm_atomic_commit(state);
> >> >> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> >> >> b/drivers/gpu/drm/drm_dp_mst_topology.c
> >> >> index 97216099a718..f47c5b6b51f7 100644
> >> >> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> >> >> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> >> >> @@ -1180,7 +1180,7 @@ static int drm_dp_mst_wait_tx_reply(struct
> >> >> drm_dp_mst_branch *mstb,
> >> >> }
> >> >> }
> >> >> out:
> >> >> - if (unlikely(ret == -EIO && drm_debug & DRM_UT_DP)) {
> >> >> + if (unlikely(ret == -EIO && drm_debug_enabled(DRM_UT_DP))) {
> >> >> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> >> >>
> >> >> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
> >> >> @@ -2321,7 +2321,7 @@ static int process_single_tx_qlock(struct
> >> >> drm_dp_mst_topology_mgr *mgr,
> >> >> idx += tosend + 1;
> >> >>
> >> >> ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
> >> >> - if (unlikely(ret && drm_debug & DRM_UT_DP)) {
> >> >> + if (unlikely(ret && drm_debug_enabled(DRM_UT_DP))) {
> >> >> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> >> >>
> >> >> drm_printf(, "sideband msg failed to send\n");
> >> >> @@ -2388,7 +2388,7 @@ static void drm_dp_queue_down_tx(struct
> >> >> drm_dp_mst_topology_mgr *mgr,
> >> >> mutex_lock(>qlock);
> >> >> list_add_tail(>next, >tx_msg_downq);
> >> >>
> >> >> - if (unlikely(drm_debug & DRM_UT_DP)) {
> >> >> + if (unlikely(drm_debug_enabled(DRM_UT_DP))) {
> >> >> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> >> >>
> >> >> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
> >> >> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> >> >> index 12c783f4d956..58dad4d24cd4 100644
> >> >> --- a/drivers/gpu/drm/drm_edid.c
> >> >> +++ b/drivers/gpu/drm/drm_edid.c
> >> >> @@ -1551,7 +1551,7 @@ static void connector_bad_edid(struct
> >> >> drm_connector *connector,
> >> >> {
> >> >> int i;
> >> >>
> >> >> - if (connector->bad_edid_counter++ && !(drm_debug & DRM_UT_KMS))
> >> >> + if (connector->bad_edid_counter++ &&
> >> >> !drm_debug_enabled(DRM_UT_KMS))
> >> >> return;
> >> >>
> >> >> dev_warn(connector->dev->dev,
> >> >> diff --git a/drivers/gpu/drm/drm_edid_load.c
> >> >> b/drivers/gpu/drm/drm_edid_load.c
> >> >> index d38b3b255926..37d8ba3ddb46 100644
> >> >> --- a/drivers/gpu/drm/drm_edid_load.c
> >> >> +++ b/drivers/gpu/drm/drm_edid_load.c
> >> >> @@ -175,7 +175,7 @@ static void *edid_load(struct drm_connector
> >> >> *connector, const char *name,
> >> >> u8 *edid;
> >> >> int fwsize, builtin;
> >> >> int i, valid_extensions = 0;
> >> >> - bool print_bad_edid = !connector->bad_edid_counter ||
> >> >> (drm_debug & DRM_UT_KMS);
> >> >> + bool print_bad_edid = !connector->bad_edid_counter ||
> >> >> drm_debug_enabled(DRM_UT_KMS);
> >> >>
> >> >> builtin = match_string(generic_edid_name, GENERIC_EDIDS, name);
> >> >> if (builtin >= 0) {
> >> >> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c
> >> >> b/drivers/gpu/drm/drm_mipi_dbi.c
> >> >> index f8154316a3b0..ccfb5b33c5e3 100644
>
Re: [PATCH 2/9] drm/print: add drm_debug_enabled()
On Mon, 16 Sep 2019, Eric Engestrom wrote:
> On Monday, 2019-09-16 11:53:24 +0300, Jani Nikula wrote:
>> On Fri, 13 Sep 2019, Eric Engestrom wrote:
>> > On Friday, 2019-09-13 14:51:39 +0300, Jani Nikula wrote:
>> >> Add helper to check if a drm debug category is enabled. Convert drm core
>> >> to use it. No functional changes.
>> >>
>> >> Signed-off-by: Jani Nikula
>> >> ---
>> >> drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
>> >> drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
>> >> drivers/gpu/drm/drm_edid.c| 2 +-
>> >> drivers/gpu/drm/drm_edid_load.c | 2 +-
>> >> drivers/gpu/drm/drm_mipi_dbi.c| 4 ++--
>> >> drivers/gpu/drm/drm_print.c | 4 ++--
>> >> drivers/gpu/drm/drm_vblank.c | 6 +++---
>> >> include/drm/drm_print.h | 5 +
>> >> 8 files changed, 18 insertions(+), 13 deletions(-)
>> >>
>> >> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
>> >> b/drivers/gpu/drm/drm_atomic_uapi.c
>> >> index 5a5b42db6f2a..6576cd997cbd 100644
>> >> --- a/drivers/gpu/drm/drm_atomic_uapi.c
>> >> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
>> >> @@ -1406,7 +1406,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
>> >> } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
>> >> ret = drm_atomic_nonblocking_commit(state);
>> >> } else {
>> >> - if (unlikely(drm_debug & DRM_UT_STATE))
>> >> + if (unlikely(drm_debug_enabled(DRM_UT_STATE)))
>> >> drm_atomic_print_state(state);
>> >>
>> >> ret = drm_atomic_commit(state);
>> >> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
>> >> b/drivers/gpu/drm/drm_dp_mst_topology.c
>> >> index 97216099a718..f47c5b6b51f7 100644
>> >> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
>> >> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
>> >> @@ -1180,7 +1180,7 @@ static int drm_dp_mst_wait_tx_reply(struct
>> >> drm_dp_mst_branch *mstb,
>> >> }
>> >> }
>> >> out:
>> >> - if (unlikely(ret == -EIO && drm_debug & DRM_UT_DP)) {
>> >> + if (unlikely(ret == -EIO && drm_debug_enabled(DRM_UT_DP))) {
>> >> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>> >>
>> >> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
>> >> @@ -2321,7 +2321,7 @@ static int process_single_tx_qlock(struct
>> >> drm_dp_mst_topology_mgr *mgr,
>> >> idx += tosend + 1;
>> >>
>> >> ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
>> >> - if (unlikely(ret && drm_debug & DRM_UT_DP)) {
>> >> + if (unlikely(ret && drm_debug_enabled(DRM_UT_DP))) {
>> >> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>> >>
>> >> drm_printf(, "sideband msg failed to send\n");
>> >> @@ -2388,7 +2388,7 @@ static void drm_dp_queue_down_tx(struct
>> >> drm_dp_mst_topology_mgr *mgr,
>> >> mutex_lock(>qlock);
>> >> list_add_tail(>next, >tx_msg_downq);
>> >>
>> >> - if (unlikely(drm_debug & DRM_UT_DP)) {
>> >> + if (unlikely(drm_debug_enabled(DRM_UT_DP))) {
>> >> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>> >>
>> >> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
>> >> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>> >> index 12c783f4d956..58dad4d24cd4 100644
>> >> --- a/drivers/gpu/drm/drm_edid.c
>> >> +++ b/drivers/gpu/drm/drm_edid.c
>> >> @@ -1551,7 +1551,7 @@ static void connector_bad_edid(struct drm_connector
>> >> *connector,
>> >> {
>> >> int i;
>> >>
>> >> - if (connector->bad_edid_counter++ && !(drm_debug & DRM_UT_KMS))
>> >> + if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))
>> >> return;
>> >>
>> >> dev_warn(connector->dev->dev,
>> >> diff --git a/drivers/gpu/drm/drm_edid_load.c
>> >> b/drivers/gpu/drm/drm_edid_load.c
>> >> index d38b3b255926..37d8ba3ddb46 100644
>> >> --- a/drivers/gpu/drm/drm_edid_load.c
>> >> +++ b/drivers/gpu/drm/drm_edid_load.c
>> >> @@ -175,7 +175,7 @@ static void *edid_load(struct drm_connector
>> >> *connector, const char *name,
>> >> u8 *edid;
>> >> int fwsize, builtin;
>> >> int i, valid_extensions = 0;
>> >> - bool print_bad_edid = !connector->bad_edid_counter || (drm_debug &
>> >> DRM_UT_KMS);
>> >> + bool print_bad_edid = !connector->bad_edid_counter ||
>> >> drm_debug_enabled(DRM_UT_KMS);
>> >>
>> >> builtin = match_string(generic_edid_name, GENERIC_EDIDS, name);
>> >> if (builtin >= 0) {
>> >> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c
>> >> b/drivers/gpu/drm/drm_mipi_dbi.c
>> >> index f8154316a3b0..ccfb5b33c5e3 100644
>> >> --- a/drivers/gpu/drm/drm_mipi_dbi.c
>> >> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
>> >> @@ -783,7 +783,7 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi
>> >> *dbi, int dc,
>> >> int i, ret;
>> >> u8 *dst;
>> >>
>> >> - if (drm_debug & DRM_UT_DRIVER)
>> >> + if (drm_debug_enabled(DRM_UT_DRIVER))
>> >> pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
>> >>__func__, dc, max_chunk);
>> >>
>> >> @@ -907,7 +907,7 @@ static int
Re: [PATCH 2/9] drm/print: add drm_debug_enabled()
On Monday, 2019-09-16 11:53:24 +0300, Jani Nikula wrote:
> On Fri, 13 Sep 2019, Eric Engestrom wrote:
> > On Friday, 2019-09-13 14:51:39 +0300, Jani Nikula wrote:
> >> Add helper to check if a drm debug category is enabled. Convert drm core
> >> to use it. No functional changes.
> >>
> >> Signed-off-by: Jani Nikula
> >> ---
> >> drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
> >> drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
> >> drivers/gpu/drm/drm_edid.c| 2 +-
> >> drivers/gpu/drm/drm_edid_load.c | 2 +-
> >> drivers/gpu/drm/drm_mipi_dbi.c| 4 ++--
> >> drivers/gpu/drm/drm_print.c | 4 ++--
> >> drivers/gpu/drm/drm_vblank.c | 6 +++---
> >> include/drm/drm_print.h | 5 +
> >> 8 files changed, 18 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
> >> b/drivers/gpu/drm/drm_atomic_uapi.c
> >> index 5a5b42db6f2a..6576cd997cbd 100644
> >> --- a/drivers/gpu/drm/drm_atomic_uapi.c
> >> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
> >> @@ -1406,7 +1406,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
> >>} else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
> >>ret = drm_atomic_nonblocking_commit(state);
> >>} else {
> >> - if (unlikely(drm_debug & DRM_UT_STATE))
> >> + if (unlikely(drm_debug_enabled(DRM_UT_STATE)))
> >>drm_atomic_print_state(state);
> >>
> >>ret = drm_atomic_commit(state);
> >> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> >> b/drivers/gpu/drm/drm_dp_mst_topology.c
> >> index 97216099a718..f47c5b6b51f7 100644
> >> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> >> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> >> @@ -1180,7 +1180,7 @@ static int drm_dp_mst_wait_tx_reply(struct
> >> drm_dp_mst_branch *mstb,
> >>}
> >>}
> >> out:
> >> - if (unlikely(ret == -EIO && drm_debug & DRM_UT_DP)) {
> >> + if (unlikely(ret == -EIO && drm_debug_enabled(DRM_UT_DP))) {
> >>struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> >>
> >>drm_dp_mst_dump_sideband_msg_tx(, txmsg);
> >> @@ -2321,7 +2321,7 @@ static int process_single_tx_qlock(struct
> >> drm_dp_mst_topology_mgr *mgr,
> >>idx += tosend + 1;
> >>
> >>ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
> >> - if (unlikely(ret && drm_debug & DRM_UT_DP)) {
> >> + if (unlikely(ret && drm_debug_enabled(DRM_UT_DP))) {
> >>struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> >>
> >>drm_printf(, "sideband msg failed to send\n");
> >> @@ -2388,7 +2388,7 @@ static void drm_dp_queue_down_tx(struct
> >> drm_dp_mst_topology_mgr *mgr,
> >>mutex_lock(>qlock);
> >>list_add_tail(>next, >tx_msg_downq);
> >>
> >> - if (unlikely(drm_debug & DRM_UT_DP)) {
> >> + if (unlikely(drm_debug_enabled(DRM_UT_DP))) {
> >>struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> >>
> >>drm_dp_mst_dump_sideband_msg_tx(, txmsg);
> >> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> >> index 12c783f4d956..58dad4d24cd4 100644
> >> --- a/drivers/gpu/drm/drm_edid.c
> >> +++ b/drivers/gpu/drm/drm_edid.c
> >> @@ -1551,7 +1551,7 @@ static void connector_bad_edid(struct drm_connector
> >> *connector,
> >> {
> >>int i;
> >>
> >> - if (connector->bad_edid_counter++ && !(drm_debug & DRM_UT_KMS))
> >> + if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))
> >>return;
> >>
> >>dev_warn(connector->dev->dev,
> >> diff --git a/drivers/gpu/drm/drm_edid_load.c
> >> b/drivers/gpu/drm/drm_edid_load.c
> >> index d38b3b255926..37d8ba3ddb46 100644
> >> --- a/drivers/gpu/drm/drm_edid_load.c
> >> +++ b/drivers/gpu/drm/drm_edid_load.c
> >> @@ -175,7 +175,7 @@ static void *edid_load(struct drm_connector
> >> *connector, const char *name,
> >>u8 *edid;
> >>int fwsize, builtin;
> >>int i, valid_extensions = 0;
> >> - bool print_bad_edid = !connector->bad_edid_counter || (drm_debug &
> >> DRM_UT_KMS);
> >> + bool print_bad_edid = !connector->bad_edid_counter ||
> >> drm_debug_enabled(DRM_UT_KMS);
> >>
> >>builtin = match_string(generic_edid_name, GENERIC_EDIDS, name);
> >>if (builtin >= 0) {
> >> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c
> >> b/drivers/gpu/drm/drm_mipi_dbi.c
> >> index f8154316a3b0..ccfb5b33c5e3 100644
> >> --- a/drivers/gpu/drm/drm_mipi_dbi.c
> >> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
> >> @@ -783,7 +783,7 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi
> >> *dbi, int dc,
> >>int i, ret;
> >>u8 *dst;
> >>
> >> - if (drm_debug & DRM_UT_DRIVER)
> >> + if (drm_debug_enabled(DRM_UT_DRIVER))
> >>pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
> >> __func__, dc, max_chunk);
> >>
> >> @@ -907,7 +907,7 @@ static int mipi_dbi_spi1_transfer(struct mipi_dbi
> >> *dbi, int dc,
> >>max_chunk = dbi->tx_buf9_len;
> >>dst16 = dbi->tx_buf9;
>
Re: [PATCH 2/9] drm/print: add drm_debug_enabled()
On Fri, 13 Sep 2019, Eric Engestrom wrote:
> On Friday, 2019-09-13 14:51:39 +0300, Jani Nikula wrote:
>> Add helper to check if a drm debug category is enabled. Convert drm core
>> to use it. No functional changes.
>>
>> Signed-off-by: Jani Nikula
>> ---
>> drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
>> drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
>> drivers/gpu/drm/drm_edid.c| 2 +-
>> drivers/gpu/drm/drm_edid_load.c | 2 +-
>> drivers/gpu/drm/drm_mipi_dbi.c| 4 ++--
>> drivers/gpu/drm/drm_print.c | 4 ++--
>> drivers/gpu/drm/drm_vblank.c | 6 +++---
>> include/drm/drm_print.h | 5 +
>> 8 files changed, 18 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
>> b/drivers/gpu/drm/drm_atomic_uapi.c
>> index 5a5b42db6f2a..6576cd997cbd 100644
>> --- a/drivers/gpu/drm/drm_atomic_uapi.c
>> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
>> @@ -1406,7 +1406,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
>> } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
>> ret = drm_atomic_nonblocking_commit(state);
>> } else {
>> -if (unlikely(drm_debug & DRM_UT_STATE))
>> +if (unlikely(drm_debug_enabled(DRM_UT_STATE)))
>> drm_atomic_print_state(state);
>>
>> ret = drm_atomic_commit(state);
>> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
>> b/drivers/gpu/drm/drm_dp_mst_topology.c
>> index 97216099a718..f47c5b6b51f7 100644
>> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
>> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
>> @@ -1180,7 +1180,7 @@ static int drm_dp_mst_wait_tx_reply(struct
>> drm_dp_mst_branch *mstb,
>> }
>> }
>> out:
>> -if (unlikely(ret == -EIO && drm_debug & DRM_UT_DP)) {
>> +if (unlikely(ret == -EIO && drm_debug_enabled(DRM_UT_DP))) {
>> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>>
>> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
>> @@ -2321,7 +2321,7 @@ static int process_single_tx_qlock(struct
>> drm_dp_mst_topology_mgr *mgr,
>> idx += tosend + 1;
>>
>> ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
>> -if (unlikely(ret && drm_debug & DRM_UT_DP)) {
>> +if (unlikely(ret && drm_debug_enabled(DRM_UT_DP))) {
>> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>>
>> drm_printf(, "sideband msg failed to send\n");
>> @@ -2388,7 +2388,7 @@ static void drm_dp_queue_down_tx(struct
>> drm_dp_mst_topology_mgr *mgr,
>> mutex_lock(>qlock);
>> list_add_tail(>next, >tx_msg_downq);
>>
>> -if (unlikely(drm_debug & DRM_UT_DP)) {
>> +if (unlikely(drm_debug_enabled(DRM_UT_DP))) {
>> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>>
>> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
>> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>> index 12c783f4d956..58dad4d24cd4 100644
>> --- a/drivers/gpu/drm/drm_edid.c
>> +++ b/drivers/gpu/drm/drm_edid.c
>> @@ -1551,7 +1551,7 @@ static void connector_bad_edid(struct drm_connector
>> *connector,
>> {
>> int i;
>>
>> -if (connector->bad_edid_counter++ && !(drm_debug & DRM_UT_KMS))
>> +if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))
>> return;
>>
>> dev_warn(connector->dev->dev,
>> diff --git a/drivers/gpu/drm/drm_edid_load.c
>> b/drivers/gpu/drm/drm_edid_load.c
>> index d38b3b255926..37d8ba3ddb46 100644
>> --- a/drivers/gpu/drm/drm_edid_load.c
>> +++ b/drivers/gpu/drm/drm_edid_load.c
>> @@ -175,7 +175,7 @@ static void *edid_load(struct drm_connector *connector,
>> const char *name,
>> u8 *edid;
>> int fwsize, builtin;
>> int i, valid_extensions = 0;
>> -bool print_bad_edid = !connector->bad_edid_counter || (drm_debug &
>> DRM_UT_KMS);
>> +bool print_bad_edid = !connector->bad_edid_counter ||
>> drm_debug_enabled(DRM_UT_KMS);
>>
>> builtin = match_string(generic_edid_name, GENERIC_EDIDS, name);
>> if (builtin >= 0) {
>> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
>> index f8154316a3b0..ccfb5b33c5e3 100644
>> --- a/drivers/gpu/drm/drm_mipi_dbi.c
>> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
>> @@ -783,7 +783,7 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi *dbi,
>> int dc,
>> int i, ret;
>> u8 *dst;
>>
>> -if (drm_debug & DRM_UT_DRIVER)
>> +if (drm_debug_enabled(DRM_UT_DRIVER))
>> pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
>> __func__, dc, max_chunk);
>>
>> @@ -907,7 +907,7 @@ static int mipi_dbi_spi1_transfer(struct mipi_dbi *dbi,
>> int dc,
>> max_chunk = dbi->tx_buf9_len;
>> dst16 = dbi->tx_buf9;
>>
>> -if (drm_debug & DRM_UT_DRIVER)
>> +if (drm_debug_enabled(DRM_UT_DRIVER))
>> pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
>> __func__, dc,
Re: [PATCH 2/9] drm/print: add drm_debug_enabled()
On Friday, 2019-09-13 14:51:39 +0300, Jani Nikula wrote:
> Add helper to check if a drm debug category is enabled. Convert drm core
> to use it. No functional changes.
>
> Signed-off-by: Jani Nikula
> ---
> drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
> drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
> drivers/gpu/drm/drm_edid.c| 2 +-
> drivers/gpu/drm/drm_edid_load.c | 2 +-
> drivers/gpu/drm/drm_mipi_dbi.c| 4 ++--
> drivers/gpu/drm/drm_print.c | 4 ++--
> drivers/gpu/drm/drm_vblank.c | 6 +++---
> include/drm/drm_print.h | 5 +
> 8 files changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
> b/drivers/gpu/drm/drm_atomic_uapi.c
> index 5a5b42db6f2a..6576cd997cbd 100644
> --- a/drivers/gpu/drm/drm_atomic_uapi.c
> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
> @@ -1406,7 +1406,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
> } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
> ret = drm_atomic_nonblocking_commit(state);
> } else {
> - if (unlikely(drm_debug & DRM_UT_STATE))
> + if (unlikely(drm_debug_enabled(DRM_UT_STATE)))
> drm_atomic_print_state(state);
>
> ret = drm_atomic_commit(state);
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 97216099a718..f47c5b6b51f7 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -1180,7 +1180,7 @@ static int drm_dp_mst_wait_tx_reply(struct
> drm_dp_mst_branch *mstb,
> }
> }
> out:
> - if (unlikely(ret == -EIO && drm_debug & DRM_UT_DP)) {
> + if (unlikely(ret == -EIO && drm_debug_enabled(DRM_UT_DP))) {
> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>
> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
> @@ -2321,7 +2321,7 @@ static int process_single_tx_qlock(struct
> drm_dp_mst_topology_mgr *mgr,
> idx += tosend + 1;
>
> ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
> - if (unlikely(ret && drm_debug & DRM_UT_DP)) {
> + if (unlikely(ret && drm_debug_enabled(DRM_UT_DP))) {
> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>
> drm_printf(, "sideband msg failed to send\n");
> @@ -2388,7 +2388,7 @@ static void drm_dp_queue_down_tx(struct
> drm_dp_mst_topology_mgr *mgr,
> mutex_lock(>qlock);
> list_add_tail(>next, >tx_msg_downq);
>
> - if (unlikely(drm_debug & DRM_UT_DP)) {
> + if (unlikely(drm_debug_enabled(DRM_UT_DP))) {
> struct drm_printer p = drm_debug_printer(DBG_PREFIX);
>
> drm_dp_mst_dump_sideband_msg_tx(, txmsg);
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 12c783f4d956..58dad4d24cd4 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -1551,7 +1551,7 @@ static void connector_bad_edid(struct drm_connector
> *connector,
> {
> int i;
>
> - if (connector->bad_edid_counter++ && !(drm_debug & DRM_UT_KMS))
> + if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))
> return;
>
> dev_warn(connector->dev->dev,
> diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
> index d38b3b255926..37d8ba3ddb46 100644
> --- a/drivers/gpu/drm/drm_edid_load.c
> +++ b/drivers/gpu/drm/drm_edid_load.c
> @@ -175,7 +175,7 @@ static void *edid_load(struct drm_connector *connector,
> const char *name,
> u8 *edid;
> int fwsize, builtin;
> int i, valid_extensions = 0;
> - bool print_bad_edid = !connector->bad_edid_counter || (drm_debug &
> DRM_UT_KMS);
> + bool print_bad_edid = !connector->bad_edid_counter ||
> drm_debug_enabled(DRM_UT_KMS);
>
> builtin = match_string(generic_edid_name, GENERIC_EDIDS, name);
> if (builtin >= 0) {
> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
> index f8154316a3b0..ccfb5b33c5e3 100644
> --- a/drivers/gpu/drm/drm_mipi_dbi.c
> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
> @@ -783,7 +783,7 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi *dbi,
> int dc,
> int i, ret;
> u8 *dst;
>
> - if (drm_debug & DRM_UT_DRIVER)
> + if (drm_debug_enabled(DRM_UT_DRIVER))
> pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
>__func__, dc, max_chunk);
>
> @@ -907,7 +907,7 @@ static int mipi_dbi_spi1_transfer(struct mipi_dbi *dbi,
> int dc,
> max_chunk = dbi->tx_buf9_len;
> dst16 = dbi->tx_buf9;
>
> - if (drm_debug & DRM_UT_DRIVER)
> + if (drm_debug_enabled(DRM_UT_DRIVER))
> pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
>__func__, dc, max_chunk);
>
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index
